From cdd90bc849a859d20f4e4b5e4a09f12906fc4be5 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sun, 15 Sep 2024 00:56:20 +0800
Subject: [PATCH] 1、流程进度展示bug修复3
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 063f8d0..ff9c671 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();
}
@@ -185,6 +184,7 @@
@PostMapping("/returnApply")
public Object returnApply(@RequestBody CaseReturn caseReturn, @CurrentUser String userId) {
try {
+ service.webReturnApply(caseReturn, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -223,6 +223,7 @@
@PostMapping("/returnAudit")
public Object returnAudit(@RequestBody CaseReturn caseReturn, @CurrentUser String userId) {
try {
+ service.webReturnAudit(caseReturn, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -238,6 +239,7 @@
@PostMapping("/appearApply")
public Object appearApply(@RequestBody CaseAppear caseAppear, @CurrentUser String userId) {
try {
+ service.webAppearApply(caseAppear, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -268,6 +270,7 @@
@PostMapping("/appearAudit")
public Object appearAudit(@RequestBody CaseAppear caseAppear, @CurrentUser String userId) {
try {
+ service.webAppearAudit(caseAppear, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -555,7 +558,7 @@
* @url {ctx}/api/web/caseTask/pageMyTaskBl
* @param page 页码
* @param size 每页数量
- * @param status 状态，1：结案申请，2：已结案
+ * @param status 状态，0：结案申请，1：已结案
* @param sortType 排序方式（1：正序；2：倒序）
* @param sortColmn 排序字段（1：结案申请时间；2：事项等级）
* @return
@@ -614,7 +617,7 @@
* @url {ctx}/api/web/caseTask/pageMyTaskSh
* @param page 页码
* @param size 每页数量
- * @param status 状态，1：待审核，2：已审核
+ * @param status 状态，0：待审核，1：已审核
* @param type 审核类型，1：回退审核，2：上报审核，3：结案审核，4：联合处置审核
* @param sortType 排序方式（1：正序；2：倒序）
* @return
@@ -733,4 +736,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