From 9a6140574003ec25e95e0248785843c3598168c4 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
src/main/java/com/product/file/controller/DocumentController.java | 25 +++++++++++++++++++++++++
src/main/java/com/product/file/service/ide/IDocumentService.java | 9 +++++++++
src/main/java/com/product/file/service/DocumentService.java | 19 ++++++++++++++++---
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java
index b91da85..905f65c 100644
--- a/src/main/java/com/product/file/controller/DocumentController.java
+++ b/src/main/java/com/product/file/controller/DocumentController.java
@@ -488,6 +488,31 @@
return OK_List(applayFileSort);
}
+ /**
+ * 鑾峰彇鍊熼槄璇︽儏淇℃伅
+ * @param request
+ */
+
+ @RequestMapping(value = "/getApplayInfo/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String getApplayInfo(HttpServletRequest request){
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = null;
+ Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if (bean != null) {
+ RequestParameterEntity reqp = (RequestParameterEntity) bean;
+ fse = reqp.getFormData();
+ }
+ //鍒ゆ柇鍙傛暟鏄惁涓虹┖
+ if (fse == null) {
+ SpringMVCContextHolder
+ .getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
+ return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
+ }
+ FieldSetEntity applayInfo = documentService.getApplayInfo(fse);
+ return OK_List(applayInfo);
+ }
+
}
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 284ed77..8effcfd 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -504,9 +504,15 @@
@Override
public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {
- String document_name = fse.getString("document_name");
- String filter="file_name like '%"+document_name+"'%";
- DataTableEntity product_oa_document = baseDao.listTable("product_oa_document",filter);
+ DataTableEntity product_oa_document;
+ if(ObjectUtil.isNotEmpty(fse.getString("document_name"))){
+ String document_name = fse.getString("document_name");
+ String filter="file_name like '%"+document_name+"'%";
+ product_oa_document = baseDao.listTable("product_oa_document",filter);
+ }else {
+ product_oa_document = baseDao.listTable("product_oa_document");
+ }
+
return product_oa_document;
}
@@ -595,4 +601,11 @@
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString());
return dataTableEntity;
}
+
+ @Override
+ public FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException {
+ String uuid = fes.getString("uuid");
+ FieldSetEntity product_oa_document_borrow = baseDao.getFieldSetEntity("product_oa_document_borrow", uuid, false);
+ return product_oa_document_borrow;
+ }
}
diff --git a/src/main/java/com/product/file/service/ide/IDocumentService.java b/src/main/java/com/product/file/service/ide/IDocumentService.java
index 0a3203c..2e06cfb 100644
--- a/src/main/java/com/product/file/service/ide/IDocumentService.java
+++ b/src/main/java/com/product/file/service/ide/IDocumentService.java
@@ -143,4 +143,13 @@
* @throws BaseException
*/
DataTableEntity getApplayUserSort() throws BaseException;
+
+ /**
+ * 鑾峰彇鍊熼槄璇︽儏淇℃伅
+ * @param fes
+ * @return
+ * @throws BaseException
+ */
+ FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException;
+
}
--
Gitblit v1.9.2