From eca3b2b155c13a16cfeda2b10ce4f55eb1876975 Mon Sep 17 00:00:00 2001 From: 杜洪波 <1074825718@qq.com> Date: 星期五, 23 八月 2024 17:29:55 +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 | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java index 91af889..e0d9787 100644 --- a/src/main/java/com/product/file/controller/DocumentController.java +++ b/src/main/java/com/product/file/controller/DocumentController.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.product.core.config.CoreConst; import com.product.core.controller.support.AbstractBaseController; -import com.product.core.dao.BaseDao; import com.product.core.entity.DataTableEntity; import com.product.core.entity.FieldSetEntity; import com.product.core.entity.RequestParameterEntity; @@ -25,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.*; -import java.util.function.DoubleConsumer; + /** * Copyright LX-BASE @@ -371,7 +370,7 @@ return this.error(DocumentCode.DOCUMENT_LOG_FAIL.getValue(), DocumentCode.DOCUMENT_LOG_FAIL.getText()); } } - + /** * 鏂囨。鏀惰棌 * @param request @@ -517,7 +516,7 @@ @RequestMapping(value = "/getApplayFileSort/{version}", method = RequestMethod.POST) @ApiVersion(1) public String getApplayFileSort(){ - DataTableEntity applayFileSort = documentService.getApplayFileSort(); + DataTableEntity applayFileSort = documentService.getApplyFileSort(); return OK_List(applayFileSort); } @@ -529,7 +528,7 @@ @RequestMapping(value = "/getApplayUserSort/{version}", method = RequestMethod.POST) @ApiVersion(1) public String getApplayUserSort(){ - DataTableEntity applayFileSort = documentService.getApplayUserSort(); + DataTableEntity applayFileSort = documentService.getApplyUserSort(); return OK_List(applayFileSort); } @@ -554,7 +553,7 @@ .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); + FieldSetEntity applayInfo = documentService.getApplyInfo(fse); return OK_List(applayInfo); } -- Gitblit v1.9.2