From b497b0d4935e5a04680909ad4f14e08d3295e59f Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 23 Sep 2024 20:51:21 +0800
Subject: [PATCH] 首页登记记录接口

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java
index 7f00824..9e43ec4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseSuperviseWebController.java
@@ -74,6 +74,16 @@
         if (StringUtils.isNotBlank(supTime)){
             terms.put("supTime", supTime);
         }
+        // 被督办组织编号
+        String quiltUnitId = request.getParameter("quiltUnitId");
+        if (StringUtils.isNotBlank(quiltUnitId)){
+            terms.put("quiltUnitId", quiltUnitId);
+        }
+        // 被督办组织名称
+        String quiltUnitName = request.getParameter("quiltUnitName");
+        if (StringUtils.isNotBlank(quiltUnitName)){
+            terms.put("quiltUnitName", quiltUnitName);
+        }
         // 督办状态,0:未回复,1:已回复
         String supStatus = request.getParameter("supStatus");
         if (StringUtils.isNotBlank(supStatus)){
@@ -167,7 +177,7 @@
     }
 
     /**
-    * 根据编号查询单个
+    * 根据督办编号查询督办信息
     * @url {ctx}/api/web/caseSupervise/getById
     * @param id 主键编号
     * @return Object
@@ -230,7 +240,7 @@
     }
 
     /**
-     * 添加督办
+     * 回复督办
      * @url {ctx}/api/web/caseSupervise/replyCaseSupervise
      * @param caseSupervise 实体对象
      * @return Object
@@ -246,15 +256,27 @@
     }
 
     /**
-     * 督办信息查询
-     * @url {ctx}/api/web/caseSupervise/listCaseSupervise
+     * 督办信息分页查询
+     * @url {ctx}/api/web/caseSupervise/pageCaseSupervise
+     * @param page 页码
+     * @param size 每页数量
      * @param caseId 主键编号
+     * @param type 查询类型 0:与案件相关信息 ,1:与案件和组织相关信息
      * @return Object
      */
-    @GetMapping("/listCaseSupervise")
-    public Object listCaseSupervise(@RequestParam(value = "caseId") String caseId) {
+    @GetMapping("/pageCaseSupervise")
+    public Object pageCaseSupervise(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
+                                    @RequestParam(value = "caseId") String caseId,
+                                    @RequestParam(value = "type") int type, @CurrentUser String userId) {
         try {
-            return ReturnSucUtils.getRepInfo(service.listCaseSupervise(caseId));
+            // 督办状态,0:未回复,1:已回复
+            Integer supStatus = 0;
+            if(StringUtils.isNotBlank(request.getParameter("supStatus"))){
+                supStatus = Integer.valueOf(request.getParameter("supStatus"));
+            }
+            Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
+            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+            return ReturnSucUtils.getRepInfo(service.pageCaseSupervise(caseId, pageRequest, supStatus, userId, type));
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
         }

--
Gitblit v1.8.0