Merge branch 'gzdyh_prod'

xusd

10 days ago 4102e0706ca52421f2776905c6e0b72d9a71ed4b

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.service;

import cn.huge.base.common.bo.R;
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.*;
import cn.huge.module.casebook.consts.ByCaseTypeEnum;
@@ -119,6 +120,8 @@
    private CaseWindupApplyService caseWindupApplyService;
    @Autowired
    private CasePersonService casePersonService;
    @Autowired
    private ThGridCitizenEventService thGridCitizenEventService;


    /**
@@ -317,7 +320,7 @@
            generateQrCodeRequestVo.setGridCode(area);
            caseInfo.setCaseRef(sysClient.getCaseRefByGenerateQrCode(generateQrCodeRequestVo));
            // 获取调解案号
            caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
//            caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
            caseInfo.setVisitWay(CaseBaseConstsEnum.getVisitWayByCanal(caseInfo.getCanal()).getIndex());
            caseInfo.setVisitWayName(CaseBaseConstsEnum.getVisitWayByCanal(caseInfo.getCanal()).getDes());
            if (caseInfo.getCanal().equals(CaseBaseConstsEnum.CASE_CANAL_3.getIndex())) {
@@ -607,6 +610,10 @@
                caseInfoDTO.setIsRisk(caseInfoUnfold.getIsRisk());
                caseInfoDTO.setTcqk(caseInfoUnfold.getTcqk());
            }
            ThGridCitizenEvent thGridCitizenEvent = thGridCitizenEventService.getByCaseId(caseId);
            if (thGridCitizenEvent != null) {
                caseInfoDTO.setCityCode(thGridCitizenEvent.getCitizenEventCode());
            }
        } else {
            CasebookInfo casebookInfo = casebookInfoService.getById(caseId);
            if (ObjectUtils.isNotEmpty(casebookInfo)) {
@@ -824,7 +831,7 @@
        generateQrCodeRequestVo.setGridCode(area);
        caseInfo.setCaseRef(sysClient.getCaseRefByGenerateQrCode(generateQrCodeRequestVo));
        // 生产调解案号
        caseInfo.setCaseNo(utilsClient.createCaseNo(caseInfo.getQueArea()));
//        caseInfo.setCaseNo(utilsClient.createCaseNo(caseInfo.getQueArea()));
        log.info("xsdcaseInfo:{}", caseInfo);
        caseInfoUnfold.setId(caseInfo.getId());
        caseInfoUnfold.setCreateTime(nowDate);
@@ -2695,7 +2702,7 @@
                }

                // 获取调解案号
                caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
//                caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
                caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_4.getIndex());
                caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_4.getDes());
                if (StringUtils.isEmpty(caseInfo.getCanal())) {
@@ -2770,4 +2777,9 @@
                .insert(5, "-")
                .toString();
    }

    public R<String> createCaseNo(String userId) {
        CtUnitDTO unitByUserId = custClient.getUnitByUserId(userId);
        return R.ok(utilsClient.createCaseNo(unitByUserId.getArea()));
    }
}