From 0638eafaa8eaaad126d39becae52f48813c24844 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 20 Sep 2024 10:14:19 +0800
Subject: [PATCH] 督办功能开发

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index 003a6b4..69aaa23 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -99,13 +99,13 @@
     /**
      * web端-签收
      * @url {ctx}/api/web/caseTask/sign
-     * @param signTaskDTO 签收表单
+     * @param signTaskDTOList 签收表单数组
      * @return Object
      */
     @PostMapping("/sign")
-    public Object sign(@RequestBody SignTaskDTO signTaskDTO, @CurrentUser String userId) {
+    public Object sign(@RequestBody List<SignTaskDTO> signTaskDTOList, @CurrentUser String userId) {
         try {
-            service.webSign(signTaskDTO, userId);
+            service.webSign(signTaskDTOList, userId);
             return ReturnSucUtils.getRepInfo();
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
@@ -121,8 +121,7 @@
     @PostMapping("/accept")
     public Object accept(@RequestBody AcceptTaskDTO acceptTaskDTO, @CurrentUser String userId) {
         try {
-            service.webAccept(acceptTaskDTO, userId);
-            return ReturnSucUtils.getRepInfo();
+            return ReturnSucUtils.getRepInfo(service.webAccept(acceptTaskDTO, userId));
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
         }
@@ -678,6 +677,47 @@
         }
     }
 
+//    /**
+//     * web端-工作台-查询待办任务-审核任务
+//     * @url {ctx}/api/web/caseTask/pageMyTaskShWSQD
+//     * @param page 页码
+//     * @param size 每页数量
+//     * @param status 状态,0:待审核,1:已审核
+//     * @param sortType 排序方式(1:正序;2:倒序)
+//     * @param sortColmn 排序字段(1:结案申请时间;2:事项等级)
+//     * @return
+//     */
+//    @GetMapping("/pageMyTaskShWSQD")
+//    public Object pageMyTaskShWSQD(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
+//                               @RequestParam(value = "status") int status, @CurrentUser String userId,
+//                                   @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
+//        try {
+//            Map<String, Object> terms = Maps.newHashMap();
+//            // 回退/上报/结案申请/联合处置申请/审核时间区间
+//            String timeStart = request.getParameter("timeStart");
+//            String timeEnd = request.getParameter("timeEnd");
+//            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
+//                terms.put("timeStart", timeStart);
+//                terms.put("timeEnd", timeEnd);
+//            }
+//            // 查询申请方/被申请方关键词
+//            String partyName = request.getParameter("partyName");
+//            if (StringUtils.isNotBlank(partyName)){
+//                terms.put("partyName", partyName);
+//            }
+//            if(ObjectUtils.isEmpty(sort)){
+//                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
+//            }
+//            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+//            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+//            terms.put("auditUnitId",loginUser.getUnitId());
+//            terms.put("applyStatus", status);
+//            return ReturnSucUtils.getRepInfo(service.pageMyTaskShWSQD(pageRequest, type, terms));
+//        } catch (Exception e) {
+//            return ReturnFailUtils.getRepInfo();
+//        }
+//    }
+
     /**
      * web端-工作台-查询待办任务-督办
      * @url {ctx}/api/web/caseTask/pageMyTaskDb
@@ -737,4 +777,18 @@
             return ReturnFailUtils.getRepInfo();
         }
     }
+
+    /**
+     * web端-申请记录
+     * @url {ctx}/api/web/caseTask/listMyApplyRecord
+     * @return
+     */
+    @GetMapping("/listMyApplyRecord")
+    public Object listMyApplyRecord(@RequestParam(value = "caseId") String caseId) {
+        try {
+            return ReturnSucUtils.getRepInfo(service.listMyApplyRecord(caseId));
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
 }

--
Gitblit v1.8.0