From bfb5b0c14bec340af93779d6de1f9e6e8fe03c37 Mon Sep 17 00:00:00 2001 From: zhouxiantao <1026371446@qq.com> Date: Sun, 22 Sep 2024 17:41:41 +0800 Subject: [PATCH] 首页弹窗 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 419 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 317 insertions(+), 102 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..34da7a8 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 @@ -8,15 +8,13 @@ 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.po.CaseAppear; -import cn.huge.module.cases.domain.po.CaseReturn; -import cn.huge.module.cases.domain.po.CaseTask; -import cn.huge.module.cases.domain.po.CaseWindupApply; +import cn.huge.module.cases.domain.po.*; import cn.huge.module.cases.service.*; import cn.huge.module.client.api.SysClient; 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; @@ -24,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.*; @@ -84,6 +83,22 @@ } /** + * web端-不予受理 + * @url {ctx}/api/web/caseTask/dismiss + * @param caseDismiss 不予受理表单 + * @return Object + */ + @PostMapping("/dismiss") + public Object dismiss(@RequestBody CaseDismiss caseDismiss, @CurrentUser String userId) { + try { + service.webDismiss(caseDismiss, userId); + return ReturnSucUtils.getRepInfo(); + } catch (Exception e) { + return ReturnFailUtils.getRepInfo(); + } + } + + /** * web端-交办 * @url {ctx}/api/web/caseTask/assign * @param assignTaskDTO 交办表单 @@ -108,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) { @@ -204,12 +255,14 @@ public Object getReturnApplyInfo(@RequestParam(value = "caseTaskId") String caseTaskId, @CurrentUser String userId) { try { CaseReturn caseReturn = caseReturnService.getByCaseTaskId(caseTaskId); - Map<String, Object> term = new HashMap<>(); - term.put("mainId", caseReturn.getCaseId()); - term.put("ownerIds", caseReturn.getId()); - List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term); - if(CollectionUtils.isNotEmpty(fileInfoList)){ - caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList()); + if (ObjectUtils.isNotEmpty(caseReturn)) { + Map<String, Object> term = new HashMap<>(); + term.put("mainId", caseReturn.getCaseId()); + term.put("ownerIds", caseReturn.getId()); + List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term); + if (CollectionUtils.isNotEmpty(fileInfoList)) { + caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList()); + } } return ReturnSucUtils.getRepInfo(caseReturn); } catch (Exception e) { @@ -324,6 +377,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 +398,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 +431,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 +452,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 +473,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 +506,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 +527,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 +567,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 +612,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 +664,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 +672,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 +738,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(); } @@ -733,53 +809,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 @@ -825,10 +930,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(); } @@ -847,4 +959,107 @@ return ReturnFailUtils.getRepInfo(); } } + + /** + * web端-工作台-已办事项 + * @url {ctx}/api/web/caseTask/pageMyTaskYb + * @param page 页码 + * @param size 每页数量 + * sortColmn 排序字段(1:办理时间;2:事项等级;3:督办次数) + * sortType 排序方式(1:正序;2:倒序) + * @return + */ + @GetMapping("/pageMyTaskYb") + public Object pageMyTaskYb(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, + @CurrentUser String userId) { + try { + // 条件 + Map<String, Object> terms = Maps.newHashMap(); + // 受理时间 + String createTimeStart = request.getParameter("createTimeStart"); + String createTimeEnd = request.getParameter("createTimeEnd"); + if(StringUtils.isNotBlank(createTimeStart) && StringUtils.isNotBlank(createTimeEnd)) { + terms.put("createTimeStart", createTimeStart); + terms.put("createTimeEnd", createTimeEnd); + } + // 办结时间 + String handleTimeStart = request.getParameter("handleTimeStart"); + String handleTimeEnd = request.getParameter("handleTimeEnd"); + if(StringUtils.isNotBlank(handleTimeStart) && StringUtils.isNotBlank(handleTimeEnd)) { + terms.put("handleTimeStart", handleTimeStart); + terms.put("handleTimeEnd", handleTimeEnd); + } + // 经办人 + String mediator = request.getParameter("mediator"); + if (StringUtils.isNotBlank(mediator)){ + terms.put("mediator", mediator); + } + // 事项来源 + String canal = request.getParameter("canal"); + if (StringUtils.isNotBlank(canal)){ + terms.put("canal", canal); + } + // 化解结果 + String mediResult = request.getParameter("mediResult"); + if (StringUtils.isNotBlank(mediResult)){ + terms.put("mediResult", mediResult); + } + // 事项等级 + String caseLevel = request.getParameter("caseLevel"); + if (StringUtils.isNotBlank(caseLevel)){ + terms.put("caseLevel", caseLevel); + } + // 纠纷类型 + String caseType = request.getParameter("caseType"); + if (StringUtils.isNotBlank(caseType)){ + terms.put("caseType", caseType); + } + // 事项状态 + String status = request.getParameter("status"); + if (StringUtils.isNotBlank(status)){ + terms.put("status", status); + } + CtUserDTO loginUser = custClient.clientGetUserAll(userId); + terms.put("handleUnitId", loginUser.getUnitId()); + // 排序 + Sort sort = null; + String sortName = null; + String sortColmnStr = request.getParameter("sortColmn"); + String sortTypeStr = request.getParameter("sortType"); + int sortColmn = 1; + int sortType = 1; + if(StringUtils.isNotBlank(sortColmnStr)){ + sortColmn = Integer.valueOf(sortColmnStr); + } + if(StringUtils.isNotBlank(sortTypeStr)){ + sortType = Integer.valueOf(sortTypeStr); + } + switch (sortColmn){ + case 1: + sortName = "t1.handle_time"; + break; + case 2: + sortName = "t2.case_level"; + break; + case 3: + sortName = "superviseCount"; + 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); + return ReturnSucUtils.getRepInfo(service.pageMyTaskYb(pageRequest, terms)); + } catch (Exception e) { + return ReturnFailUtils.getRepInfo(); + } + } } -- Gitblit v1.8.0