diff --git a/pom.xml b/pom.xml
index 48c519d..365f87d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,22 @@
4.4.0
+
+ cn.afterturn
+ easypoi-base
+ 4.0.0
+
+
+ cn.afterturn
+ easypoi-web
+ 4.0.0
+
+
+ cn.afterturn
+ easypoi-annotation
+ 4.0.0
+
+
diff --git a/src/main/java/com/api/bokang/xiao/porsche_review/controller/YearReviewController.java b/src/main/java/com/api/bokang/xiao/porsche_review/controller/YearReviewController.java
index d8d61f6..cb7c47a 100644
--- a/src/main/java/com/api/bokang/xiao/porsche_review/controller/YearReviewController.java
+++ b/src/main/java/com/api/bokang/xiao/porsche_review/controller/YearReviewController.java
@@ -20,7 +20,6 @@ import javax.ws.rs.core.MediaType;
import java.util.List;
import java.util.Map;
-
/**
* @ClassName YearReviewController
* @Author 肖博亢
@@ -36,8 +35,11 @@ public class YearReviewController {
/** 需要排除的流程id */
private final String workflowIds = new ToolUtil().getSystemParamValue("workflowIds");
- /** 建模表表名及字段 */
- private final String modelTables = new ToolUtil().getSystemParamValue("modelTables");
+ /** 合同表名及条件信息 */
+ private final String contractTable = new ToolUtil().getSystemParamValue("contractTable");
+
+ /** 用印表名及条件信息 */
+ private final String sealTable = new ToolUtil().getSystemParamValue("sealTable");
/**
*
获取创建或处理流程的总数
@@ -63,6 +65,7 @@ public class YearReviewController {
}
}
+
/**
* 获取流程的总数
* @param request 请求体
@@ -86,20 +89,21 @@ public class YearReviewController {
}
/**
- * 获取电子章的总数
+ * 获取电子章及合同总数的总数还有比例
* @param request 请求体
* @param response 响应体
* @param param 请求参数
* @return 请求结果
*/
- @Path("/getElectronicSealCount")
+ @Path("/getContractAndSealCount")
@POST
@Produces(MediaType.APPLICATION_JSON)
public String getElectronicSealCount(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map param) {
try{
- param.put("modelTables",modelTables);
- int count = reviewService.getElectronicSealCount(param);
- return ApiResult.success(count);
+ param.put("contractTable",contractTable);
+ param.put("sealTable",sealTable);
+ Map electronicSealCount = reviewService.getElectronicSealCount(param);
+ return ApiResult.success(electronicSealCount);
}catch (Exception e){
log.error("获取电子章总数异常 ==> "+Util.getErrString(e));
return ApiResult.error(e.getMessage());
@@ -113,14 +117,17 @@ public class YearReviewController {
* @param param 请求参数
* @return 请求结果
*/
- @Path("/getWorkflowTop5")
+ @Path("/getWorkflowTop")
@POST
@Produces(MediaType.APPLICATION_JSON)
- public String getWorkflowTop5(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map param) {
+ public String getWorkflowTop(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map param) {
try{
- log.info("into getWorkflowTop5 success params ==> "+param);
+ log.info("into getWorkflowTop success params ==> "+param);
User loginUser = HrmUserVarify.getUser(request, response);
param.put("workflowIds",workflowIds);
+ if(!param.containsKey("limit")){
+ param.put("limit",3);
+ }
String type = Util.null2String(param.get("type"));
List