From 2d93efd310612e24b99c8a487102638cfa3fbadf Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 23 八月 2024 16:29:24 +0800
Subject: [PATCH] 文档借阅功能8.23
---
src/main/java/com/product/file/controller/DocumentController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..56caa13 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
@@ -472,7 +471,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);
}
@@ -484,10 +483,35 @@
@RequestMapping(value = "/getApplayUserSort/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String getApplayUserSort(){
- DataTableEntity applayFileSort = documentService.getApplayUserSort();
+ DataTableEntity applayFileSort = documentService.getApplyUserSort();
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.getApplyInfo(fse);
+ return OK_List(applayInfo);
+ }
+
}
--
Gitblit v1.9.2