1、自行受理跳转bug修复 2、联合处置流程优化

liyj

2024-09-15 3ce77531a4e13d749d58fea1a13695a80fbb9516

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

@@ -14,8 +14,7 @@
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.dto.PaUserDTO;
import cn.huge.module.mediate.constant.CaseBaseConsts;
import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.draft.service.CasedraftInfoService;
import cn.huge.module.mediate.constant.CaseProcessBaseConstsEnum;
@@ -79,6 +78,10 @@
    @Autowired
    private CaseTaskService caseTaskService;

    @Autowired
    private CaseEvaluateService caseEvaluateService;


    /**
    * 更新对象
    * @param entity 对象
@@ -89,6 +92,20 @@
        }catch (Exception e){
            log.error("[CaseInfoService.updateCaseInfo]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseInfoService.updateCaseInfo", e);
        }
    }

    /**
     * 批量更新对象
     * @param entity 对象
     * @param caseIdList
     */
    public void updateCaseInfoList(CaseInfo entity, List<String> caseIdList){
        try{
            mapper.updateCaseInfoList(entity, caseIdList);
        }catch (Exception e){
            log.error("[CaseInfoService.updateCaseInfoList]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseInfoService.updateCaseInfoList", e);
        }
    }

@@ -226,7 +243,7 @@
                // 判断是否自行受理
                if(1 == registerSaveDTO.getIsSelfAccept()){
                    // 自行受理流程
                    caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
                     return caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
                }else {
                    // 自动调度流程
                    caseTaskService.webStartFlowLFDJ(caseInfo);
@@ -524,84 +541,102 @@
     * @return String 纠纷编号
     */
    public String caseRegisterWechat(RegisterSaveDTO registerSaveDTO, String userId){
        try {
            // 获取当前登录用户
            PaUserDTO loginUser = custClient.paclientGetUser(userId);
            if(ObjectUtils.isEmpty(registerSaveDTO.getCustId())){
                registerSaveDTO.setCustId(loginUser.getCustId());
            }
        // 获取当前登录用户
        PaUserDTO loginUser = custClient.paclientGetUser(userId);
        if(ObjectUtils.isEmpty(registerSaveDTO.getCustId())){
            registerSaveDTO.setCustId(loginUser.getCustId());
        }

            Date nowDate = DateUtils.getNowDate();
            registerSaveDTO.setUpdateTime(nowDate);
            StringBuffer plaintiffs = new StringBuffer();
            StringBuffer defendants = new StringBuffer();
            StringBuffer pagents = new StringBuffer();
            StringBuffer dagents = new StringBuffer();
        Date nowDate = DateUtils.getNowDate();
        registerSaveDTO.setUpdateTime(nowDate);

            CaseInfo caseInfo = new CaseInfo();
            CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
            BeanUtils.copyProperties(registerSaveDTO, caseInfo);
            if(ObjectUtils.isEmpty(caseInfo.getId())){
                caseInfo.setId(utilsClient.getNewTimeCaseId());
            }
        CaseInfo caseInfo = new CaseInfo();
        CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
        BeanUtils.copyProperties(registerSaveDTO, caseInfo);
        if(ObjectUtils.isEmpty(caseInfo.getId())){
            caseInfo.setId(utilsClient.getNewTimeCaseId());
        }
//            caseInfo.setInputUnitId(loginUser.getUnitId());
//            caseInfo.setInputUnitName(loginUser.getUnitName());
            caseInfo.setInputUserId(loginUser.getId());
            caseInfo.setInputUserName(loginUser.getTrueName());
            caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
            caseInfo.setCreateTime(nowDate);
            caseInfo.setUpdateTime(nowDate);
            caseInfo.setVisitTime(nowDate);
            caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
            //坐标转换
            if(ObjectUtils.isNotEmpty(caseInfo.getLat()) && ObjectUtils.isNotEmpty(caseInfo.getLng())){
                PointXY pointXY = MapUtils.gcj02tobd09(Double.valueOf(caseInfo.getLng()), Double.valueOf(caseInfo.getLat()));
                caseInfo.setLat(pointXY.getLat()+"");
                caseInfo.setLng(pointXY.getLon()+"");
            }
            //todo case_title生成
            caseInfo.setCaseRef(utilsClient.createCaseRef());
            // 为了演示先兼容小程序没属地问题，写死属地
            if (ObjectUtils.isEmpty(caseInfo.getQueProv())) {
                caseInfo.setQueProv("19");
                caseInfo.setQueProvName("广东");
                caseInfo.setQueCity("1601");
                caseInfo.setQueCityName("广州市");
                caseInfo.setQueArea("50258");
                caseInfo.setQueAreaName("白云区");
                caseInfo.setQueRoad("62857");
                caseInfo.setQueRoadName("新市街道");

                // 根据经纬度查询问题属地
//                QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat());
//                caseInfo.setQueProv(queAddrBaseDTO.getQueProv());
//                caseInfo.setQueProvName(queAddrBaseDTO.getQueProvName());
//                caseInfo.setQueCity(queAddrBaseDTO.getQueCity());
//                caseInfo.setQueCityName(queAddrBaseDTO.getQueCityName());
//                caseInfo.setQueArea(queAddrBaseDTO.getQueArea());
//                caseInfo.setQueAreaName(queAddrBaseDTO.getQueAreaName());
//                caseInfo.setQueRoad(queAddrBaseDTO.getQueRoad());
//                caseInfo.setQueRoadName(queAddrBaseDTO.getQueRoadName());
            }
            caseInfoUnfold.setId(caseInfo.getId());
            caseInfoUnfold.setCreateTime(nowDate);
            caseInfoUnfold.setUpdateTime(nowDate);

            // 常规登记-保存当事人
            this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
            caseInfo.setPlaintiffs(plaintiffs.toString());
            caseInfo.setPagents(pagents.toString());
            caseInfo.setDefendants(defendants.toString());
            caseInfo.setDagents(dagents.toString());
            this.saveOrUpdate(caseInfo);

            // 启动工作流-自动调度流程
            caseTaskService.webStartFlowLFDJ(caseInfo);
            return registerSaveDTO.getId();
        }catch (Exception e){
            log.error("service方法[CaseInfoService.caseRegisterWechat]调用异常："+e, e);
            throw new ServiceException("CaseInfoService.caseRegisterWechat", e);
        caseInfo.setInputUserId(loginUser.getId());
        caseInfo.setInputUserName(loginUser.getTrueName());
        caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
        caseInfo.setCreateTime(nowDate);
        caseInfo.setUpdateTime(nowDate);
        caseInfo.setVisitTime(nowDate);
        caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
        //坐标转换
        if(ObjectUtils.isNotEmpty(caseInfo.getLat()) && ObjectUtils.isNotEmpty(caseInfo.getLng())){
            PointXY pointXY = MapUtils.gcj02tobd09(Double.valueOf(caseInfo.getLng()), Double.valueOf(caseInfo.getLat()));
            caseInfo.setLat(pointXY.getLat()+"");
            caseInfo.setLng(pointXY.getLon()+"");
        }
        //todo case_title生成
        caseInfo.setCaseRef(utilsClient.createCaseRef());

        // 为了演示先兼容小程序没属地问题，写死属地
        if (ObjectUtils.isEmpty(caseInfo.getQueProv())) {
//                caseInfo.setQueProv("19");
//                caseInfo.setQueProvName("广东");
//                caseInfo.setQueCity("1601");
//                caseInfo.setQueCityName("广州市");
//                caseInfo.setQueArea("50258");
//                caseInfo.setQueAreaName("白云区");
//                caseInfo.setQueRoad("62857");
//                caseInfo.setQueRoadName("新市街道");

            // 根据经纬度查询问题属地
            QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat());
            caseInfo.setQueProv(queAddrBaseDTO.getQueProv());
            caseInfo.setQueProvName(queAddrBaseDTO.getQueProvName());
            caseInfo.setQueCity(queAddrBaseDTO.getQueCity());
            caseInfo.setQueCityName(queAddrBaseDTO.getQueCityName());
            caseInfo.setQueArea(queAddrBaseDTO.getQueArea());
            caseInfo.setQueAreaName(queAddrBaseDTO.getQueAreaName());
            caseInfo.setQueRoad(queAddrBaseDTO.getQueRoad());
            caseInfo.setQueRoadName(queAddrBaseDTO.getQueRoadName());
        }
        caseInfoUnfold.setId(caseInfo.getId());
        caseInfoUnfold.setCreateTime(nowDate);
        caseInfoUnfold.setUpdateTime(nowDate);

        StringBuffer plaintiffs = new StringBuffer();
        StringBuffer defendants = new StringBuffer();
        StringBuffer pagents = new StringBuffer();
        StringBuffer dagents = new StringBuffer();
        // 常规登记-保存当事人
        int peopleNum = this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
        caseInfo.setVisitPeopleNum(peopleNum);
        caseInfo.setPlaintiffs(plaintiffs.toString());
        caseInfo.setPagents(pagents.toString());
        caseInfo.setDefendants(defendants.toString());
        caseInfo.setDagents(dagents.toString());

        //todo case_title生成
//            caseInfo.setCaseTitle(this.createCaseTitle(plaintiffs.toString(), defendants.toString(), caseInfo.getCaseTypeName()));

        caseInfo.setInfoProcess(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getIndex());
        caseInfo.setInfoProcessName(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getDes());
        caseInfo.setProcess(CaseProcessBaseConstsEnum.CASE_PROCESS_1.getIndex());
        caseInfo.setProcessName(CaseProcessBaseConstsEnum.CASE_PROCESS_1.getDes());
        caseInfo.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
        caseInfo.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
        caseInfo.setCaseLevel(3);
        caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
        caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());

        caseInfo.setCaseRef(utilsClient.createCaseRef());
        caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_2.getIndex());
        caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_2.getDes());
        // 临时加上一级纠纷类型
        caseInfo.setCaseTypeFirst("24_01-2");
        caseInfo.setCaseTypeFirstName("劳动社保");
        this.saveOrUpdate(caseInfo);

        caseInfoUnfoldService.saveOrUpdate(caseInfoUnfold);
        // 启动工作流-自动调度流程
        caseTaskService.webStartFlowLFDJ(caseInfo);
        return registerSaveDTO.getId();
    }

    /**
@@ -660,13 +695,13 @@
                personService.saveOrUpdate(casePerson);

                //添加申请方和被申请方人名组合
                if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casePerson.getPerType())){
                if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
                    //申请方
                    if (StringUtils.isNotEmpty(plaintiffs.toString())) {
                        plaintiffs.append(BaseConsts.COMMA);
                    }
                    plaintiffs.append(casePerson.getTrueName());
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casePerson.getPerType())){
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
                    //被申请方
                    if (StringUtils.isNotEmpty(defendants.toString())) {
                        defendants.append(BaseConsts.COMMA);
@@ -688,16 +723,22 @@
                    caseAgent.setCreateTime(registerSaveDTO.getUpdateTime());
                    caseAgent.setUpdateTime(registerSaveDTO.getUpdateTime());
                    agentService.saveOrUpdate(caseAgent);

                    if (StringUtils.isNotEmpty(pagents.toString())) {
                        pagents.append(BaseConsts.COMMA);
                    if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())){
                        if (StringUtils.isNotEmpty(pagents.toString())) {
                            pagents.append(BaseConsts.COMMA);
                        }
                        pagents.append(caseAgent.getTrueName());
                    }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())){
                        if (StringUtils.isNotEmpty(dagents.toString())) {
                            dagents.append(BaseConsts.COMMA);
                        }
                        dagents.append(caseAgent.getTrueName());
                    }
                    pagents.append(caseAgent.getTrueName());

                }
                //todo 绑定当事人小程序
            }
        }

        return peopleNum;
    }

@@ -763,8 +804,11 @@
                if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
                    caseInfoWeChatDTO.setMediResult(caseInfoUnfold.getMediResult());
                    caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName());
                    caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateDeptId());
                    caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateDeptName());
                    caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateUnitId());
                    caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateUnitName());
                    caseInfoWeChatDTO.setAgreeType(caseInfoUnfold.getAgreeType());
                    caseInfoWeChatDTO.setAgreeTypeName(caseInfoUnfold.getAgreeTypeName());
                    caseInfoWeChatDTO.setAgreeContent(caseInfoUnfold.getAgreeContent());
                }

                QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
@@ -785,6 +829,18 @@
                }
                caseInfoWeChatDTO.setDefendantList(defendantList);
                caseInfoWeChatDTO.setPlaintiffList(plaintiffList);
                //评价信息
                Map<String, Object> evaluateTerms = new HashMap<>();
                evaluateTerms.put("caseId", caseInfo.getId());
                evaluateTerms.put("deleteStatus", BaseConsts.DELETE_STATUS_0);
                evaluateTerms.put("evaluateUserId", loginUser.getId());
                long evaluateCount = caseEvaluateService.countTerms(evaluateTerms);
                if(evaluateCount > 0){
                    caseInfoWeChatDTO.setIsEvaluate("1");
                }else{
                    caseInfoWeChatDTO.setIsEvaluate("0");
                }

                list.add(caseInfoWeChatDTO);
            }
        }