From 031c3f247dc71727f74f26cf835e065fad500e08 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 10 Sep 2024 11:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 18 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 03e7c25..53aeb99 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
@@ -1,9 +1,12 @@
 package cn.huge.module.cases.controller.web;
 
+import cn.huge.base.common.utils.ObjectUtils;
 import cn.huge.base.common.utils.ReturnFailUtils;
 import cn.huge.base.common.utils.ReturnSucUtils;
 import cn.huge.base.config.CurrentUser;
+import cn.huge.module.cases.domain.dto.AcceptTaskDTO;
 import cn.huge.module.cases.domain.dto.AssignTaskDTO;
+import cn.huge.module.cases.domain.dto.SignTaskDTO;
 import cn.huge.module.cases.domain.po.CaseAppear;
 import cn.huge.module.cases.domain.po.CaseReturn;
 import cn.huge.module.cases.domain.po.CaseTask;
@@ -75,6 +78,54 @@
     }
 
     /**
+     * web端-交办
+     * @url {ctx}/api/web/caseTask/assign
+     * @param assignTaskDTO 交办表单
+     * @return Object
+     */
+    @PostMapping("/assign")
+    public Object assign(@RequestBody AssignTaskDTO assignTaskDTO, @CurrentUser String userId) {
+        try {
+            service.webAssign(assignTaskDTO, userId);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
+    /**
+     * web端-签收
+     * @url {ctx}/api/web/caseTask/sign
+     * @param signTaskDTO 签收表单
+     * @return Object
+     */
+    @PostMapping("/sign")
+    public Object sign(@RequestBody SignTaskDTO signTaskDTO, @CurrentUser String userId) {
+        try {
+            service.webSign(signTaskDTO, userId);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
+    /**
+     * web端-受理
+     * @url {ctx}/api/web/caseTask/accept
+     * @param acceptTaskDTO 受理表单
+     * @return Object
+     */
+    @PostMapping("/accept")
+    public Object accept(@RequestBody AcceptTaskDTO acceptTaskDTO, @CurrentUser String userId) {
+        try {
+            service.webAccept(acceptTaskDTO, userId);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
+    /**
      * web端-结案申请
      * @url {ctx}/api/web/caseTask/windupApply
      * @param caseWindupApply 结案申请表单
@@ -83,6 +134,7 @@
     @PostMapping("/windupApply")
     public Object windupApply(@RequestBody CaseWindupApply caseWindupApply, @CurrentUser String userId) {
         try {
+            service.webWindupApply(caseWindupApply, userId);
             return ReturnSucUtils.getRepInfo();
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
@@ -98,7 +150,8 @@
     @GetMapping("/getWindupApplyInfo")
     public Object getWindupApplyInfo(@RequestParam(value = "caseTaskId") String caseTaskId, @CurrentUser String userId) {
         try {
-            return ReturnSucUtils.getRepInfo(caseWindupApplyService.getByCaseTaskId(caseTaskId));
+            CaseWindupApply caseWindupApply = caseWindupApplyService.getByCaseTaskId(caseTaskId);
+            return ReturnSucUtils.getRepInfo(caseWindupApply);
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
         }
@@ -113,6 +166,7 @@
     @PostMapping("/windupAudit")
     public Object windupAudit(@RequestBody CaseWindupApply caseWindupApply, @CurrentUser String userId) {
         try {
+            service.webWindupAudit(caseWindupApply, userId);
             return ReturnSucUtils.getRepInfo();
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
@@ -210,21 +264,6 @@
      */
     @PostMapping("/appearAudit")
     public Object appearAudit(@RequestBody CaseAppear caseAppear, @CurrentUser String userId) {
-        try {
-            return ReturnSucUtils.getRepInfo();
-        } catch (Exception e) {
-            return ReturnFailUtils.getRepInfo();
-        }
-    }
-
-    /**
-     * web端-交办
-     * @url {ctx}/api/web/caseTask/assign
-     * @param assignTaskDTO 交办表单
-     * @return Object
-     */
-    @PostMapping("/assign")
-    public Object assign(@RequestBody AssignTaskDTO assignTaskDTO, @CurrentUser String userId) {
         try {
             return ReturnSucUtils.getRepInfo();
         } catch (Exception e) {
@@ -394,8 +433,8 @@
      * @param type 审核类型，1：回退审核，2：上报审核，3：结案审核，4：联合处置审核
      * @return
      */
-    @GetMapping("/pageMyTaskBl")
-    public Object pageMyTaskBl(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
+    @GetMapping("/pageMyTaskSh")
+    public Object pageMyTaskSh(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                                @RequestParam(value = "status") int status, @RequestParam(value = "type") int type,
                                @CurrentUser String userId) {
         try {

--
Gitblit v1.8.0