From 25cf02be9f813de87bc1e43c18a6ba057602c512 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 09 Sep 2024 11:14:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/backEnd/gz-dyh
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 5ce5c6d..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
@@ -12,10 +12,13 @@
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;
@@ -158,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);
@@ -172,16 +174,14 @@
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)){
--
Gitblit v1.8.0