From f0ee71145111bc6ef12c1990fd44d02e688ca31f Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 10 Sep 2024 22:54:20 +0800
Subject: [PATCH] 办理部门和申请部门查询修改 查询人、组织接口修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 4937f75..413fce8 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
@@ -557,14 +557,14 @@
caseIdList.add(frontPageListDTO.getCaseId());
}
if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
- assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
- .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
- List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
- for(CaseAssistApply caseAssistApply: caseAssistApplyList){
+ QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
+ unfoldQueryWrapper.in("id", caseIdList);
+ List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
+ for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){
- frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
+ if(frontPageListDTO.getCaseId().equals(unfold.getId())){
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
}
@@ -591,14 +591,14 @@
List<String> caseIdList = new ArrayList<>();
caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
- assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
- .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
- List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
- for(CaseAssistApply caseAssistApply: caseAssistApplyList){
+ QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
+ unfoldQueryWrapper.in("id", caseIdList);
+ List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
+ for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){
- frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
+ if(frontPageListDTO.getCaseId().equals(unfold.getId())){
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
}
@@ -1340,7 +1340,7 @@
caseWindupApply.setAuditUserName(loginUser.getTrueName());
caseWindupApply.setAuditTime(nowDate);
caseWindupApply.setUpdateTime(nowDate);
- caseWindupApplyService.saveCaseWindupApply(caseWindupApply);
+ caseWindupApplyService.updateCaseWindupApply(caseWindupApply);
// 查询结案审核任务
CaseTask jashCaseTask = mapper.selectById(caseWindupApply.getCaseTaskId());
// 审核通过，
--
Gitblit v1.8.0