From fd3d6d30afb9041c2cc3099833b7683e12c7daff Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 22 Sep 2024 10:00:36 +0800
Subject: [PATCH] 督办信息兼容新需求 查询待办任务-督办 首页-督办-我发起的 功能兼容 添加督办逻辑修改 新增全部签收接口 首页-待审核-我申请的 新增接口 办理反馈新增承办/配合部门判断 新增查询督办详情接口 查询时限接口bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 163 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 118 insertions(+), 45 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 fd3767b..e3dca49 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
@@ -22,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,42 @@
@PostMapping("/sign")
public Object sign(@RequestBody List<SignTaskDTO> signTaskDTOList, @CurrentUser String userId) {
try {
+ service.webSign(signTaskDTOList, userId);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * web端-全部签收
+ * @url {ctx}/api/web/caseTask/allSign
+ * @param
+ * @return Object
+ */
+ @PostMapping("/allSign")
+ public Object allSign(@CurrentUser String userId) {
+ 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("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
+ }
+ // 查询申请方/被申请方关键词
+ String partyName = request.getParameter("partyName");
+ if (StringUtils.isNotBlank(partyName)){
+ terms.put("partyName", partyName);
+ }
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("candeUnitId",loginUser.getUnitId());
+ terms.put("signStatus", 1);
+
+ List<SignTaskDTO>signTaskDTOList = service.listIdByTerms(terms);
service.webSign(signTaskDTOList, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
@@ -770,53 +807,82 @@
}
}
-// /**
-// * 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/pageMyTaskShWSQD
+ * @param page 页码
+ * @param size 每页数量
+ * @param sortType 排序方式（1：正序；2：倒序）
+ * @param sortColmn 排序字段（1：申请时间；2：审核时间；3：事项等级）
+ * @return
+ */
+ @GetMapping("/pageMyTaskShWSQD")
+ public Object pageMyTaskShWSQD(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
+ @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);
+ }
+ // 申请类型
+ String applyType = request.getParameter("applyType");
+ if (StringUtils.isNotBlank(applyType)){
+ terms.put("applyType", applyType);
+ }
+ // 审核结果
+ String auditResult = request.getParameter("auditResult");
+ if (StringUtils.isNotBlank(auditResult)){
+ terms.put("auditResult", auditResult);
+ }
+ Sort sort = null;
+ String sortName = null;
+ switch (sortColmn){
+ case 1:
+ sortName = "t1.turnaroundTime";
+ break;
+ case 2:
+ sortName = "t1.auditTime";
+ break;
+ case 3:
+ sortName = "t2.caseGrade";
+ break;
+ }
+ switch (sortType){
+ case 1:
+ sort = Sort.by(Sort.Direction.ASC, sortName);
+ break;
+ case 2:
+ sort = Sort.by(Sort.Direction.DESC, sortName);
+ break;
+ }
+ 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("applyUnitId",loginUser.getUnitId());
+ return ReturnSucUtils.getRepInfo(service.pageMyTaskShWSQD(pageRequest, terms));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
/**
* web端-工作台-查询待办任务-督办
* @url {ctx}/api/web/caseTask/pageMyTaskDb
* @param page 页码
* @param size 每页数量
- * @param status 状态，0：未回复，1：已回复
+ * @param status 状态，0：未回复，1：已回复, 3:我发起的
* @param sortType 排序方式（1：正序；2：倒序）
* @param sortColmn 排序字段（1：督办时间/回复时限；2：事项等级）
* @return
@@ -862,10 +928,17 @@
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("quiltUnitId",loginUser.getUnitId());
- terms.put("supStatus", status);
-
- return ReturnSucUtils.getRepInfo(superviseService.pageMyTaskDb(pageRequest, terms));
+ Page<CaseSupervise> caseSupervisePage = null;
+ if(StringUtils.isNotBlank(loginUser.getUnitId())){
+ if(3 != status){
+ terms.put("quiltUnitId",loginUser.getUnitId());
+ terms.put("supStatus", status);
+ }else{
+ terms.put("supUnitId",loginUser.getUnitId());
+ }
+ caseSupervisePage = superviseService.pageMyTaskDb(pageRequest, terms);
+ }
+ return ReturnSucUtils.getRepInfo(caseSupervisePage);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
--
Gitblit v1.8.0