From 00e04baf00ac8f35ca4483791bf17526b050ff44 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 24 Sep 2024 19:48:30 +0800
Subject: [PATCH] 督办添加审核时间字段、排序
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 106 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 38 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 ac47c5e..7badcb5 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
@@ -4,10 +4,7 @@
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.FrontPageListSLDTO;
-import cn.huge.module.cases.domain.dto.SignTaskDTO;
+import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.*;
import cn.huge.module.cases.service.*;
import cn.huge.module.client.api.SysClient;
@@ -137,22 +134,21 @@
* @return Object
*/
@PostMapping("/allSign")
- public Object allSign(@CurrentUser String userId) {
+ public Object allSign(@CurrentUser String userId, @RequestBody AllSignDTO allSignDTO) {
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);
+ if(ObjectUtils.isNotEmpty(allSignDTO)){
+ // 流程/签收时间区间
+ if(StringUtils.isNotBlank(allSignDTO.getTimeStart()) && StringUtils.isNotBlank(allSignDTO.getTimeEnd())) {
+ // 待签收，查询流转时间
+ terms.put("createTimeStart", allSignDTO.getTimeStart());
+ terms.put("createTimeEnd", allSignDTO.getTimeEnd());
+ }
+ // 查询申请方/被申请方关键词
+ if (StringUtils.isNotBlank(allSignDTO.getPartyName())){
+ terms.put("partyName", allSignDTO.getPartyName());
+ }
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
terms.put("candeUnitId",loginUser.getUnitId());
@@ -437,7 +433,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -525,7 +521,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -600,7 +596,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -711,7 +707,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -776,7 +772,7 @@
}
break;
case 2:
- sortName = "t1.case_level";
+ sortName = "t2.case_level";
break;
case 3:
sortName = "superviseCount";
@@ -797,7 +793,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -823,7 +819,8 @@
@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, @RequestParam(value = "sortType") int sortType) {
+ @CurrentUser String userId, @RequestParam(value = "sortType") int sortType,
+ @RequestParam(value = "sortColmn") int sortColmn) {
try {
Map<String, Object> terms = Maps.newHashMap();
// 回退/上报/结案申请/联合处置申请/审核时间区间
@@ -842,19 +839,43 @@
String sortName = null;
switch (type){
case 1:
- sortName = "t1.return_time";
+ if(1 == sortColmn){
+ sortName = "t1.return_time";
+ }else if(2 == sortColmn){
+ sortName = "t2.case_level";
+ }else if(3 == sortColmn){
+ sortName = "t1.audit_time";
+ }
break;
case 2:
- sortName = "t1.appear_time";
+ if(1 == sortColmn) {
+ sortName = "t1.appear_time";
+ }else if(2 == sortColmn){
+ sortName = "t2.case_level";
+ }else if(3 == sortColmn){
+ sortName = "t1.audit_time";
+ }
break;
case 3:
- sortName = "t1.apply_time";
+ if(1 == sortColmn) {
+ sortName = "t1.apply_time";
+ }else if(2 == sortColmn){
+ sortName = "t2.case_level";
+ }else if(3 == sortColmn){
+ sortName = "t1.audit_time";
+ }
break;
case 4:
- sortName = "t1.apply_time";
+ if(1 == sortColmn) {
+ sortName = "t1.apply_time";
+ }else if(2 == sortColmn){
+ sortName = "t2.case_level";
+ }else if(3 == sortColmn){
+ sortName = "t1.audit_time";
+ }
break;
default:
- sortName = "t1.return_time";
+ sortName = "t1.create_time";
break;
}
switch (sortType){
@@ -865,7 +886,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -928,7 +949,7 @@
sortName = "t1.auditTime";
break;
case 3:
- sortName = "t2.caseGrade";
+ sortName = "caseGrade";
break;
default:
sortName = "t1.turnaroundTime";
@@ -942,7 +963,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -992,7 +1013,16 @@
sortName = "t1.sup_time";
break;
case 2:
- sortName = "t1.case_level";
+ sortName = "timeLimit";
+ break;
+ case 3:
+ sortName = "t2.case_level";
+ break;
+ case 4:
+ sortName = "t1.sup_status";
+ break;
+ case 5:
+ sortName = "t1.reply_time";
break;
default:
sortName = "t1.sup_time";
@@ -1006,7 +1036,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
@@ -1014,7 +1044,7 @@
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- Page<CaseSupervise> caseSupervisePage = null;
+ Page<FrontPageListDTO> frontPageListDTOPage = null;
if(StringUtils.isNotBlank(loginUser.getUnitId())){
terms.put("type", status);
if(3 != status){
@@ -1023,9 +1053,9 @@
}else{
terms.put("supUnitId",loginUser.getUnitId());
}
- caseSupervisePage = superviseService.pageMyTaskDb(pageRequest, terms);
+ frontPageListDTOPage = superviseService.pageMyTaskDb(pageRequest, terms);
}
- return ReturnSucUtils.getRepInfo(caseSupervisePage);
+ return ReturnSucUtils.getRepInfo(frontPageListDTOPage);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
@@ -1141,7 +1171,7 @@
sort = Sort.by(Sort.Direction.DESC, sortName);
break;
default:
- sort = Sort.by(Sort.Direction.DESC, sortName);
+ sort = Sort.by(Sort.Direction.ASC, sortName);
break;
}
if(ObjectUtils.isEmpty(sort)){
--
Gitblit v1.8.0