From 6c2a01f6bc53b27805dbd514ac7ea83b58af2323 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 20:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 494d279..b48fc15 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -4,29 +4,30 @@
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
-import cn.huge.module.assist.domain.po.CaseAssistApply;
-import cn.huge.module.assist.service.CaseAssistApplyService;
+import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.dto.TransactResultDTO;
-import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.client.api.impl.CustClientImpl;
+import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseInfoUnfoldMapper;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.mediate.constant.CaseBaseConsts;
+import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
+import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
-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.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -56,6 +57,9 @@
@Autowired
private CaseAssistApplyService assistApplyService;
+
+ @Autowired
+ private SysClientImpl sysClient;
/**
* 更新对象
@@ -157,12 +161,11 @@
// 获取当前登录用户
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
CaseInfoUnfold CaseInfoUnfold = new CaseInfoUnfold();
+ CaseInfoUnfold.setId(caseId);
CaseInfoUnfold.setMediatorId(loginUser.getId());
CaseInfoUnfold.setMediator(loginUser.getTrueName());
CaseInfoUnfold.setMediatorMobile(loginUser.getMobile());
- Map<String, Object> terms = new HashMap<>();
- terms.put("case_id", caseId);
- mapper.updateCaseInfoUnfoldTerms(CaseInfoUnfold, terms);
+ mapper.updateCaseInfoUnfold(CaseInfoUnfold);
}catch (Exception e){
log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败，异常信息："+e, e);
throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
@@ -171,22 +174,27 @@
public TransactResultDTO getTransactResult(String caseId){
//查询办理结果信息
- QueryWrapper<CaseInfoUnfold>caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
- caseInfoUnfoldQueryWrapper.eq("case_id", caseId);
- CaseInfoUnfold caseInfoUnfold = this.getOne(caseInfoUnfoldQueryWrapper);
+ CaseInfoUnfold caseInfoUnfold = this.getById(caseId);
TransactResultDTO transactResultDTO = new TransactResultDTO();
BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
if(ObjectUtils.isNotEmpty(transactResultDTO)){
QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
- .eq("audit_result", CaseBaseConsts.AUDIT_RESULT_1);
+ .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper);
if(ObjectUtils.isNotEmpty(caseAssistApply)){
transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName());
}
}
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", caseId);
+ terms.put("ownerIds", "'"+caseId+"'");
+ List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
+ if(ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)){
+ transactResultDTO.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
+ }
return transactResultDTO;
}
--
Gitblit v1.8.0