From 278d046e8060a37439ee9f442503eaeb0e8a379e Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sat, 21 Sep 2024 18:37:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 118 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 47 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 cb69bf0..2e464ae 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
@@ -17,6 +17,7 @@
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
@@ -324,6 +325,7 @@
@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");
@@ -344,6 +346,10 @@
if (StringUtils.isNotBlank(partyName)){
terms.put("partyName", partyName);
}
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("candeUnitId",loginUser.getUnitId());
+ terms.put("status", status);
+ // 排序
Sort sort = null;
String sortName = null;
switch (sortColmn){
@@ -373,9 +379,6 @@
sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("candeUnitId",loginUser.getUnitId());
- terms.put("status", status);
return ReturnSucUtils.getRepInfo(service.pageMyTaskFp(pageRequest, terms));
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -397,6 +400,7 @@
@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");
@@ -417,6 +421,10 @@
if (StringUtils.isNotBlank(partyName)){
terms.put("partyName", partyName);
}
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("candeUnitId",loginUser.getUnitId());
+ terms.put("signStatus", status);
+ // 排序
Sort sort = null;
String sortName = null;
switch (sortColmn){
@@ -446,9 +454,6 @@
sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("candeUnitId",loginUser.getUnitId());
- terms.put("signStatus", status);
return ReturnSucUtils.getRepInfo(service.pageMyTaskQs(pageRequest, terms));
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -470,30 +475,7 @@
@RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
@RequestParam(value = "status") int status, @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)) {
- // 待受理，查询流转时间
- if (status == 1){
- terms.put("createTimeStart", timeStart);
- terms.put("createTimeEnd", timeEnd);
- }else if (status == 2){
- // 已受理，查询受理时间
- terms.put("handleTimeStart", timeStart);
- terms.put("handleTimeEnd", timeEnd);
- }else {
- // 不予受理，查询不予受理时间
- terms.put("disTimeStart", timeStart);
- terms.put("disTimeEnd", timeEnd);
- }
- }
- // 查询申请方/被申请方关键词
- String partyName = request.getParameter("partyName");
- if (StringUtils.isNotBlank(partyName)){
- terms.put("partyName", partyName);
- }
+ // 排序
Sort sort = null;
String sortName = null;
switch (sortColmn){
@@ -533,6 +515,31 @@
sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
+ // 条件
+ Map<String, Object> terms = Maps.newHashMap();
+ // 流程/受理时间区间
+ String timeStart = request.getParameter("timeStart");
+ String timeEnd = request.getParameter("timeEnd");
+ if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
+ // 待受理，查询流转时间
+ if (status == 1){
+ terms.put("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
+ }else if (status == 2){
+ // 已受理，查询受理时间
+ terms.put("handleTimeStart", timeStart);
+ terms.put("handleTimeEnd", timeEnd);
+ }else {
+ // 不予受理，查询不予受理时间
+ terms.put("disTimeStart", timeStart);
+ terms.put("disTimeEnd", timeEnd);
+ }
+ }
+ // 查询申请方/被申请方关键词
+ String partyName = request.getParameter("partyName");
+ if (StringUtils.isNotBlank(partyName)){
+ terms.put("partyName", partyName);
+ }
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
// 不予受理，查询case_dismiss表
if (status == 3){
@@ -553,28 +560,34 @@
* @url {ctx}/api/web/caseTask/pageMyTaskBlz
* @param page 页码
* @param size 每页数量
+ * @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
* @param sortType 排序方式（1：正序；2：倒序）
* @param sortColmn 排序字段（1：流转时间/已办天数；2：分派时限；3：事项等级）
* @return
*/
@GetMapping("/pageMyTaskBlz")
public Object pageMyTaskBlz(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
- @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
- @CurrentUser String userId) {
+ @RequestParam(value = "caseTaskType") int caseTaskType, @RequestParam(value = "sortType") int sortType,
+ @RequestParam(value = "sortColmn") int sortColmn, @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("timeStart", timeStart);
- terms.put("timeEnd", timeEnd);
+ terms.put("createTimeStart", timeStart);
+ terms.put("createTimeEnd", timeEnd);
}
// 查询申请方/被申请方关键词
String partyName = request.getParameter("partyName");
if (StringUtils.isNotBlank(partyName)){
terms.put("partyName", partyName);
}
+ terms.put("caseTaskType", caseTaskType);
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("candeUnitId", loginUser.getUnitId());
+ // 排序
Sort sort = null;
String sortName = null;
switch (sortColmn){
@@ -599,10 +612,7 @@
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("candeUnitId",loginUser.getUnitId());
return ReturnSucUtils.getRepInfo(service.pageMyTaskBlz(pageRequest, terms));
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -610,38 +620,55 @@
}
/**
- * web端-工作台-查询待办任务-办理任务
+ * web端-工作台-查询待办任务-已办理任务
* @url {ctx}/api/web/caseTask/pageMyTaskBl
* @param page 页码
* @param size 每页数量
* @param status 状态，0：结案申请，1：已结案
+ * @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
* @param sortType 排序方式（1：正序；2：倒序）
* @param sortColmn 排序字段（1：结案申请时间；2：事项等级）
* @return
*/
@GetMapping("/pageMyTaskBl")
public Object pageMyTaskBl(@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) {
+ @RequestParam(value = "status") int status, @RequestParam(value = "caseTaskType") int caseTaskType,
+ @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
+ @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("timeStart", timeStart);
- terms.put("timeEnd", timeEnd);
+ terms.put("applyTimeStart", timeStart);
+ terms.put("applyTimeStart", timeEnd);
}
// 查询申请方/被申请方关键词
String partyName = request.getParameter("partyName");
if (StringUtils.isNotBlank(partyName)){
terms.put("partyName", partyName);
}
+ terms.put("applyStatus", status);
+ if (status == 1){
+ terms.put("auditResult", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
+ }
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ if (caseTaskType == 1){
+ terms.put("applyUnitId", loginUser.getUnitId());
+ }else {
+ terms.put("assistUnitId", loginUser.getUnitId());
+ }
+ // 排序
Sort sort = null;
String sortName = null;
switch (sortColmn){
case 1:
- sortName = "t1.apply_time";
+ if (status == 0) {
+ sortName = "t1.apply_time";
+ }else {
+ sortName = "t1.audit_time";
+ }
break;
case 2:
sortName = "t1.case_level";
@@ -659,10 +686,7 @@
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());
- terms.put("applyStatus", status);
- return ReturnSucUtils.getRepInfo(service.pageMyTaskBl(pageRequest, terms));
+ return ReturnSucUtils.getRepInfo(service.pageMyTaskJa(pageRequest, terms));
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
--
Gitblit v1.8.0