From db376dbba9af1ce92d4f8e697a2fe90d7c79d566 Mon Sep 17 00:00:00 2001 From: 18756 <1875631620@qq.com> Date: 星期五, 23 八月 2024 16:15:04 +0800 Subject: [PATCH] 文档借阅功能8.23 --- src/main/java/com/product/file/service/ide/IDocumentService.java | 9 +++++++++ src/main/java/com/product/file/service/DocumentService.java | 19 ++++++++++++++++--- src/main/java/com/product/file/controller/DocumentConstoller.java | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/product/file/controller/DocumentConstoller.java b/src/main/java/com/product/file/controller/DocumentConstoller.java index 81c1537..f63df52 100644 --- a/src/main/java/com/product/file/controller/DocumentConstoller.java +++ b/src/main/java/com/product/file/controller/DocumentConstoller.java @@ -455,6 +455,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 3d72614..f5aa082 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -473,9 +473,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; } @@ -564,4 +570,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 2d2e3a8..ac3ca02 100644 --- a/src/main/java/com/product/file/service/ide/IDocumentService.java +++ b/src/main/java/com/product/file/service/ide/IDocumentService.java @@ -144,4 +144,13 @@ * @throws BaseException */ DataTableEntity getApplayUserSort() throws BaseException; + + /** + * 鑾峰彇鍊熼槄璇︽儏淇℃伅 + * @param fes + * @return + * @throws BaseException + */ + FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException; + } -- Gitblit v1.9.2