From b512f03e1ea30e22209ec5a889d568c45f3e03c9 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 13 Sep 2024 10:41:03 +0800
Subject: [PATCH] 1、删除经办人 2、规范代码
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 3acafae..c769b23 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -91,7 +91,7 @@
@Autowired
private CaseWindupApplyService caseWindupApplyService;
@Autowired
- private CaseAssistApplyService assistApplyService;
+ private CaseAssistApplyService caseAssistApplyService;
@Autowired
private CaseAppearService caseAppearService;
@Autowired
@@ -555,10 +555,10 @@
FrontPageCountDTO frontPageCountDTO = mapper.countTaskList(terms);
long supervise = superviseService.countCaseSuperviseList(0,loginUser.getUnitId());
frontPageCountDTO.setSupervise(supervise);
- long countApplyReview = caseWindupApplyMapper.countApplyReview(loginUser.getUnitId());
- long countReturnReview = caseReturnMapper.countReturnReview(loginUser.getUnitId());
- long countAppearReview = caseAppearMapper.countAppearReview(loginUser.getUnitId());
- long countAssistReview = caseAssistApplyMapper.countAssistReview(loginUser.getUnitId());
+ long countApplyReview = caseWindupApplyService.countApplyReview(loginUser.getUnitId());
+ long countReturnReview = caseReturnService.countReturnReview(loginUser.getUnitId());
+ long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
+ long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
return frontPageCountDTO;
}catch (Exception e) {
@@ -646,7 +646,7 @@
for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
@@ -668,8 +668,8 @@
*/
public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
try {
- long total = caseWindupApplyMapper.countMySubmitApplyReview(terms);
- List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyMapper.pageMySubmitApplyReview(page, terms);
+ long total = caseWindupApplyService.countMySubmitApplyReview(terms);
+ List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);
List<String> caseIdList = new ArrayList<>();
caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
@@ -680,7 +680,7 @@
for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
@@ -704,17 +704,17 @@
long total = 0;
List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
if(1 == type){
- total = caseReturnMapper.countMyTaskReturnReview(terms);
- frontPageListDTOList = caseReturnMapper.pageMyTaskReturnReview(page,terms);
+ total = caseReturnService.countMyTaskReturnReview(terms);
+ frontPageListDTOList = caseReturnService.pageMyTaskReturnReview(page,terms);
}else if(2 == type){
- total = caseAppearMapper.countMyTaskAppearReview(terms);
- frontPageListDTOList = caseAppearMapper.pageMyTaskAppearReview(page, terms);
+ total = caseAppearService.countMyTaskAppearReview(terms);
+ frontPageListDTOList = caseAppearService.pageMyTaskAppearReview(page, terms);
}else if(3 == type){
- total = caseWindupApplyMapper.countMyTaskApplyReview(terms);
- frontPageListDTOList = caseWindupApplyMapper.pageMyTaskApplyReview(page, terms);
+ total = caseWindupApplyService.countMyTaskApplyReview(terms);
+ frontPageListDTOList = caseWindupApplyService.listMyTaskApplyReview(page, terms);
}else if(4 == type){
- total = caseAssistApplyMapper.countMyTaskAssistReview(terms);
- frontPageListDTOList = caseAssistApplyMapper.pageMyTaskAssistReview(page, terms);
+ total = caseAssistApplyService.countMyTaskAssistReview(terms);
+ frontPageListDTOList = caseAssistApplyService.pageMyTaskAssistReview(page, terms);
}
return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
@@ -1114,27 +1114,28 @@
/**
* web端任务处理-签收
- * @param signTaskDTO 签收任务表单
+ * @param signTaskDTOList 签收任务表单
* @param userId 当前登录用户
*/
- public void webSign(SignTaskDTO signTaskDTO, String userId){
+ public void webSign(List<SignTaskDTO> signTaskDTOList, String userId){
try{
Date nowDate = DateUtils.getNowDate();
// 获取当前登录用户
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ List<String> taskIdList = new ArrayList<>();
+ List<String> caseIdList = new ArrayList<>();
+
// 更新纠纷任务信息
CaseTask caseTaskPO = new CaseTask();
- caseTaskPO.setId(signTaskDTO.getCaseTaskId());
caseTaskPO.setSignStatus(CaseTaskConsts.SIGN_STATUS_2);
caseTaskPO.setSignTime(nowDate);
caseTaskPO.setSignUserId(loginUser.getId());
caseTaskPO.setSignUserName(loginUser.getTrueName());
caseTaskPO.setHandleIllust("已签收");
caseTaskPO.setUpdateTime(nowDate);
- mapper.updateCaseTask(caseTaskPO);
+
// 更新纠纷信息
CaseInfo caseInfoPO = new CaseInfo();
- caseInfoPO.setId(signTaskDTO.getCaseId());
caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
@@ -1142,7 +1143,13 @@
caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoPO.setUpdateTime(nowDate);
- caseInfoService.updateCaseInfo(caseInfoPO);
+
+ for(SignTaskDTO signTaskDTO: signTaskDTOList){
+ taskIdList.add(signTaskDTO.getCaseTaskId());
+ caseIdList.add(signTaskDTO.getCaseId());
+ }
+ mapper.updateCaseTaskList(caseTaskPO, taskIdList);
+ caseInfoService.updateCaseInfoList(caseInfoPO, caseIdList);
}catch (Exception e){
log.error("[CaseTaskService.webSign]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webSign", e);
--
Gitblit v1.8.0