From 8e8b26ea3b7306fca701fac934e26300b9043fd1 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 23 八月 2024 16:01:45 +0800
Subject: [PATCH] 文档列表优化8.23
---
src/main/java/com/product/file/service/ide/IDocumentService.java | 2 +-
src/main/java/com/product/file/service/DocumentService.java | 6 ++++--
src/main/java/com/product/file/controller/DocumentConstoller.java | 16 +++++++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentConstoller.java b/src/main/java/com/product/file/controller/DocumentConstoller.java
index 123edb9..81c1537 100644
--- a/src/main/java/com/product/file/controller/DocumentConstoller.java
+++ b/src/main/java/com/product/file/controller/DocumentConstoller.java
@@ -387,7 +387,21 @@
@RequestMapping(value = "/getApplyDocument/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String getApplyDocument(HttpServletRequest request){
- DataTableEntity applyDocument = documentService.getApplyDocument();
+
+ //鑾峰彇鍙傛暟
+ 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());
+ }
+ DataTableEntity applyDocument = documentService.getApplyDocument(fse);
return OK_List(applyDocument);
}
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 03257d8..3d72614 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -471,9 +471,11 @@
}
@Override
- public DataTableEntity getApplyDocument() throws BaseException {
+ public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {
- DataTableEntity product_oa_document = baseDao.listTable("product_oa_document");
+ String document_name = fse.getString("document_name");
+ String filter="file_name like '%"+document_name+"'%";
+ DataTableEntity product_oa_document = baseDao.listTable("product_oa_document",filter);
return product_oa_document;
}
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 58709f1..2d2e3a8 100644
--- a/src/main/java/com/product/file/service/ide/IDocumentService.java
+++ b/src/main/java/com/product/file/service/ide/IDocumentService.java
@@ -122,7 +122,7 @@
* @return
* @throws BaseException
*/
- DataTableEntity getApplyDocument() throws BaseException;
+ DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException;
/**
* 鏇存柊娣诲姞鍊熼槄鐢宠
--
Gitblit v1.9.2