新增 1、不予受理流程

liyj

2024-09-21 1a34864a39b41159f83c608e72a04f14a1038228

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

@@ -4,7 +4,7 @@
import cn.huge.base.common.utils.*;
import cn.huge.module.cases.domain.dto.*;

import cn.huge.module.cases.domain.json.CaseAreaDTO;
import cn.huge.module.cases.domain.dto.CaseAreaDTO;
import cn.huge.module.cases.domain.po.CaseAgent;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.po.CasePerson;
@@ -44,17 +44,17 @@
import java.util.stream.Collectors;

/**
 * @author wangwh
 * @version 1.0.0
 * @title: 纠纷信息主表业务逻辑处理
 * @Description 纠纷信息主表业务逻辑处理
 * @company hugeinfo
 * @author wangwh
 * @Time 2024-08-27 10:00:57
 * @version 1.0.0
 */
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class CaseInfoService extends ServiceImpl<CaseInfoMapper, CaseInfo>{
public class CaseInfoService extends ServiceImpl<CaseInfoMapper, CaseInfo> {

    @Autowired
    private CaseInfoMapper mapper;
@@ -88,116 +88,138 @@


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

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

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

    /**
    * 根据编号物理删除
    * @param id 查询条件集合
    */
    public void deleteCaseInfo(String id){
        try{
     * 根据编号物理删除
     *
     * @param id 查询条件集合
     */
    public void deleteCaseInfo(String id) {
        try {
            mapper.deleteCaseInfo(id);
        }catch (Exception e){
            log.error("[CaseInfoService.deleteCaseInfo]调用失败，异常信息："+e, e);
        } catch (Exception e) {
            log.error("[CaseInfoService.deleteCaseInfo]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseInfoService.deleteCaseInfo", e);
        }
    }

    /**
    * 按条件查询
    * @param terms 条件
    * @return List
    */
    public List<CaseInfo> listTerms(Map<String, Object> terms){
     * 按条件查询
     *
     * @param terms 条件
     * @return List
     */
    public List<CaseInfo> listTerms(Map<String, Object> terms) {
        return mapper.listTerms(terms);
    }

    /**
    * 按条件统计
    * @param terms 条件
    * @return long
    */
    public long countTerms(Map<String, Object> terms){
     * 按条件统计
     *
     * @param terms 条件
     * @return long
     */
    public long countTerms(Map<String, Object> terms) {
        return mapper.countTerms(terms);
    }

    /**
    * 按条件分页查询
    * @param page 分页对象
    * @param terms 条件
    * @return Page
    */
    public Page<CaseInfo> pageQuery(PageRequest page, Map<String, Object> terms){
     * 按条件分页查询
     *
     * @param page  分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<CaseInfo> pageQuery(PageRequest page, Map<String, Object> terms) {
        long total = mapper.countTerms(terms);
        List<CaseInfo> content = mapper.pageTerms(page, terms);
        return new PageImpl<CaseInfo>(content, page, total);
    }

    /**
    * 新增或更新对象
    * @param caseInfo 实体对象
    */
    public void saveCaseInfo(CaseInfo caseInfo){
        try{
     * 按条件分页查询
     *
     * @param page  分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<CaseRegisterDTO> pageQueryRegister(PageRequest page, Map<String, Object> terms) {
        long total = mapper.countTermsCaseRegister(terms);
        List<CaseRegisterDTO> content = mapper.pageTermsCaseRegister(page, terms);
        return new PageImpl<CaseRegisterDTO>(content, page, total);
    }

    /**
     * 新增或更新对象
     *
     * @param caseInfo 实体对象
     */
    public void saveCaseInfo(CaseInfo caseInfo) {
        try {
            Date nowDate = DateUtils.getNowDate();
            // 判断是否新增
            if (IdUtils.checkNewId(caseInfo.getId())){
            if (IdUtils.checkNewId(caseInfo.getId())) {
                caseInfo.setId(utilsClient.getNewTimeId());
                caseInfo.setCreateTime(nowDate);
            }
            caseInfo.setUpdateTime(nowDate);
            this.saveOrUpdate(caseInfo);
        }catch (Exception e){
            log.error("[CaseInfoService.saveCaseInfo]调用失败，异常信息："+e, e);
        } catch (Exception e) {
            log.error("[CaseInfoService.saveCaseInfo]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseInfoService.saveCaseInfo", e);
        }
    }

    /**
     * PC端-纠纷登记-保存纠纷信息-正常案件
     *
     * @param registerSaveDTO 纠纷信息
     * @param userId 用户编号
     * @param userId          用户编号
     * @return String 纠纷编号
     */
    public String caseRegister(RegisterSaveDTO registerSaveDTO, String userId){
    public String caseRegister(RegisterSaveDTO registerSaveDTO, String userId) {
        try {
            // 获取当前登录用户
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
@@ -224,7 +246,7 @@
            caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_1.getIndex());
            caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_1.getDes());
            //todo case_title生成、经纬度转换
            if(0 == registerSaveDTO.getOperateType()){
            if (0 == registerSaveDTO.getOperateType()) {
                caseInfo.setInputUnitId(loginUser.getUnitId());
                caseInfo.setInputUnitName(loginUser.getUnitName());
                caseInfo.setInputUserId(loginUser.getId());
@@ -238,7 +260,7 @@
                caseInfo.setQueCity("1601");
                caseInfo.setQueCityName("广州市");
                // 删除草稿案件
                if(1 == registerSaveDTO.getIsDraft() ){
                if (1 == registerSaveDTO.getIsDraft()) {
                    draftInfoService.removeDraftInfo(registerSaveDTO.getId());
                }
                // 新增纠纷信息
@@ -251,34 +273,35 @@
                caseInfoUnfoldService.save(caseInfoUnfold);
                // 启动工作流
                // 判断是否自行受理
                if(1 == registerSaveDTO.getIsSelfAccept()){
                if (1 == registerSaveDTO.getIsSelfAccept()) {
                    // 自行受理流程
                     return caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
                }else {
                    return caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
                } else {
                    // 自动调度流程
                    caseTaskService.webStartFlowLFDJ(caseInfo);
                }
            }else if(1 == registerSaveDTO.getOperateType()){
            } else if (1 == registerSaveDTO.getOperateType()) {
                this.updateById(caseInfo);
            }
            return registerSaveDTO.getId();
        }catch (Exception e){
            log.error("service方法[CaseInfoService.caseRegister]调用异常："+e, e);
        } catch (Exception e) {
            log.error("service方法[CaseInfoService.caseRegister]调用异常：" + e, e);
            throw new ServiceException("CaseInfoService.caseRegister", e);
        }
    }

    /**
     * pc端-常规登记-保存正式案件-保存人员信息
     *
     * @param registerSaveDTO 纠纷信息
     * @param plaintiffs 申请人
     * @param pagents 申请人代理人
     * @param defendants 被申请人
     * @param dagents 被申请人代理人
     * @param plaintiffs      申请人
     * @param pagents         申请人代理人
     * @param defendants      被申请人
     * @param dagents         被申请人代理人
     * @return int
     */
    private void saveCasePerson(RegisterSaveDTO registerSaveDTO, StringBuffer plaintiffs, StringBuffer pagents,
                               StringBuffer defendants, StringBuffer dagents){
                                StringBuffer defendants, StringBuffer dagents) {

        Date now = DateUtils.getNowDate();

@@ -293,8 +316,8 @@
        List<String> newPersonIdList = new ArrayList<>();
        List<String> newAgentIdList = new ArrayList<>();

        if(CollectionUtils.isNotEmpty(personList)){
            for(CasePerson casePerson: personList){
        if (CollectionUtils.isNotEmpty(personList)) {
            for (CasePerson casePerson : personList) {
                newPersonIdList.add(casePerson.getId());
                casePerson.setCaseId(registerSaveDTO.getId());
                casePerson.setCustId(registerSaveDTO.getCustId());
@@ -302,13 +325,13 @@
                //绑定当事人小程序
                this.setPartyUserId(casePerson);
                //添加申请方和被申请方人名组合
                if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().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.getIndex().equals(casePerson.getPerType())){
                } else if (CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())) {
                    //被申请方
                    if (StringUtils.isNotEmpty(defendants.toString())) {
                        defendants.append(BaseConsts.COMMA);
@@ -317,9 +340,9 @@
                }

                //判断是否为更新（用原有的Id对比性的Id）
                if(oldPersonIds.contains(casePerson.getId())){
                if (oldPersonIds.contains(casePerson.getId())) {
                    personService.updateById(casePerson);
                }else{
                } else {
                    casePerson.setCreateTime(now);
                    personService.save(casePerson);
                }
@@ -327,7 +350,7 @@
            }
        }

        if(CollectionUtils.isNotEmpty(agentList)) {
        if (CollectionUtils.isNotEmpty(agentList)) {
            for (CaseAgent caseAgent : agentList) {
                newAgentIdList.add(caseAgent.getId());
                caseAgent.setCaseId(registerSaveDTO.getId());
@@ -336,12 +359,12 @@
                caseAgent.setUpdateTime(now);
                //绑定当事人小程序
                this.setPartyUserId(caseAgent);
                if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())) {
                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())) {
                } else if (CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())) {
                    if (StringUtils.isNotEmpty(dagents.toString())) {
                        dagents.append(BaseConsts.COMMA);
                    }
@@ -349,9 +372,9 @@
                }

                //判断是否为更新（用原有的Id对比性的Id）
                if(oldAgentIds.contains(caseAgent.getId())){
                if (oldAgentIds.contains(caseAgent.getId())) {
                    agentService.updateById(caseAgent);
                }else{
                } else {
                    caseAgent.setCreateTime(now);
                    agentService.save(caseAgent);
                }
@@ -363,23 +386,23 @@
            for (String oldPersonId : oldPersonIdList) {
                if (!newPersonIdList.contains(oldPersonId)) {
                    personService.removeById(oldPersonId);
                }else{
                } else {

                }
            }
        }else{
        } else {
            QueryWrapper<CasePerson> casePersonQueryWrapper = new QueryWrapper<>();
            casePersonQueryWrapper.eq("case_id", registerSaveDTO.getId());
            personService.remove(casePersonQueryWrapper);
        }
        //删除冗余的代理人
        if(CollectionUtils.isNotEmpty(newAgentIdList)){
            for(String oldAgentId: oldAgentIdList){
                if(!newAgentIdList.contains(oldAgentId)){
        if (CollectionUtils.isNotEmpty(newAgentIdList)) {
            for (String oldAgentId : oldAgentIdList) {
                if (!newAgentIdList.contains(oldAgentId)) {
                    agentService.removeById(oldAgentId);
                }
            }
        }else{
        } else {
            QueryWrapper<CaseAgent> caseAgentQueryWrapper = new QueryWrapper<>();
            caseAgentQueryWrapper.eq("case_id", registerSaveDTO.getId());
            agentService.remove(caseAgentQueryWrapper);
@@ -388,10 +411,11 @@

    /**
     * PC端-查询纠纷信息
     *
     * @param caseId 纠纷编号
     * @return CaseInfo 纠纷信息
     */
    public CaseInfoDTO getCaseInfo(String caseId){
    public CaseInfoDTO getCaseInfo(String caseId) {
        CaseInfo caseInfo = mapper.selectById(caseId);
        CaseInfoDTO caseInfoDTO = new CaseInfoDTO();
        if (ObjectUtils.isNotEmpty(caseInfo)) {
@@ -412,28 +436,28 @@
            idList.addAll(casePersonList.stream().map(CasePerson::getId).collect(Collectors.toList()));
            idList.addAll(caseAgentList.stream().map(CaseAgent::getId).collect(Collectors.toList()));
            String ids = idList.stream().map(String::valueOf).collect(Collectors.joining("','"));
            ids = "'"+ ids + "'";
            ids = "'" + ids + "'";
            Map<String, Object> term = new HashMap<>();
            term.put("mainId", caseId);
            term.put("ownerIds", ids);
            //查询所有附件
            List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
            for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                if(caseId.equals(fileInfo.getOwnerId())){
            for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                if (caseId.equals(fileInfo.getOwnerId())) {
                    caseInfoDTO.setFileInfoList(fileInfo.getFileList());
                }
            }
            for(CasePerson casePerson: casePersonList){
            for (CasePerson casePerson : casePersonList) {
                //把附件根据编号放入
                for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                    if(casePerson.getId().equals(fileInfo.getOwnerId())){
                for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                    if (casePerson.getId().equals(fileInfo.getOwnerId())) {
                        casePerson.setFileInfoList(fileInfo.getFileList());
                    }
                }
            }
            for(CaseAgent caseAgent: caseAgentList){
                for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                    if(caseAgent.getId().equals(fileInfo.getOwnerId())){
            for (CaseAgent caseAgent : caseAgentList) {
                for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                    if (caseAgent.getId().equals(fileInfo.getOwnerId())) {
                        caseAgent.setFileInfoList(fileInfo.getFileList());
                    }
                }
@@ -446,10 +470,11 @@

    /**
     * PC端-查询纠纷信息
     *
     * @param caseId 纠纷编号
     * @return CaseInfo 纠纷信息
     */
    public CaseInfoDTO getCaseArchivesInfo(String caseId){
    public CaseInfoDTO getCaseArchivesInfo(String caseId) {
        CaseInfo caseInfo = mapper.selectById(caseId);
        CaseInfoDTO caseInfoDTO = new CaseInfoDTO();
        if (ObjectUtils.isNotEmpty(caseInfo)) {
@@ -470,28 +495,28 @@
            idList.addAll(casePersonList.stream().map(CasePerson::getId).collect(Collectors.toList()));
            idList.addAll(caseAgentList.stream().map(CaseAgent::getId).collect(Collectors.toList()));
            String ids = idList.stream().map(String::valueOf).collect(Collectors.joining("','"));
            ids = "'"+ ids + "'";
            ids = "'" + ids + "'";
            Map<String, Object> term = new HashMap<>();
            term.put("mainId", caseId);
            term.put("ownerIds", ids);
            //查询所有附件
            List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
            for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                if(caseId.equals(fileInfo.getOwnerId())){
            for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                if (caseId.equals(fileInfo.getOwnerId())) {
                    caseInfoDTO.setFileInfoList(fileInfo.getFileList());
                }
            }
            for(CasePerson casePerson: casePersonList){
            for (CasePerson casePerson : casePersonList) {
                //把附件根据编号放入
                for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                    if(casePerson.getId().equals(fileInfo.getOwnerId())){
                for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                    if (casePerson.getId().equals(fileInfo.getOwnerId())) {
                        casePerson.setFileInfoList(fileInfo.getFileList());
                    }
                }
            }
            for(CaseAgent caseAgent: caseAgentList){
                for(FileIdTypeInfoBaseDTO fileInfo: fileInfoList){
                    if(caseAgent.getId().equals(fileInfo.getOwnerId())){
            for (CaseAgent caseAgent : caseAgentList) {
                for (FileIdTypeInfoBaseDTO fileInfo : fileInfoList) {
                    if (caseAgent.getId().equals(fileInfo.getOwnerId())) {
                        caseAgent.setFileInfoList(fileInfo.getFileList());
                    }
                }
@@ -504,6 +529,7 @@

    /**
     * 绑定当事人小程序
     *
     * @param casePerson 当事人信息
     */
    public void setPartyUserId(CasePerson casePerson) {
@@ -527,9 +553,10 @@

    /**
     * 绑定当事人小程序
     *
     * @param caseAgent 代理人人信息
     */
    public void setPartyUserId(CaseAgent caseAgent){
    public void setPartyUserId(CaseAgent caseAgent) {
        if (StringUtils.isEmpty(caseAgent.getPartyUserId())) {
            if (CaseBaseConstsEnum.CARD_TYPE_1.getIndex().equals(caseAgent.getCertiType())) {
                if (StringUtils.isNotEmpty(caseAgent.getCertiNo())) {
@@ -546,14 +573,15 @@

    /**
     * PC端-纠纷登记-保存纠纷信息-正常案件
     *
     * @param registerSaveDTO 纠纷信息
     * @param userId 用户编号
     * @param userId          用户编号
     * @return String 纠纷编号
     */
    public String caseRegisterWechat(RegisterSaveDTO registerSaveDTO, String userId){
    public String caseRegisterWechat(RegisterSaveDTO registerSaveDTO, String userId) {
        // 获取当前登录用户
        PaUserDTO loginUser = custClient.paclientGetUser(userId);
        if(ObjectUtils.isEmpty(registerSaveDTO.getCustId())){
        if (ObjectUtils.isEmpty(registerSaveDTO.getCustId())) {
            registerSaveDTO.setCustId(loginUser.getCustId());
        }

@@ -563,7 +591,7 @@
        CaseInfo caseInfo = new CaseInfo();
        CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
        BeanUtils.copyProperties(registerSaveDTO, caseInfo);
        if(ObjectUtils.isEmpty(caseInfo.getId())){
        if (ObjectUtils.isEmpty(caseInfo.getId())) {
            caseInfo.setId(utilsClient.getNewTimeCaseId());
        }
//            caseInfo.setInputUnitId(loginUser.getUnitId());
@@ -582,16 +610,15 @@
        caseInfo.setVisitTime(nowDate);
        caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
        //坐标转换
        if(ObjectUtils.isNotEmpty(caseInfo.getLat()) && ObjectUtils.isNotEmpty(caseInfo.getLng())){
        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()+"");
            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");
@@ -600,18 +627,18 @@
//                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());
        }
        // 根据经纬度查询问题属地
        QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat());
        log.info("xsdqueAddrBaseDTO:{}", queAddrBaseDTO);
        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());
        log.info("xsdcaseInfo:{}", caseInfo);
        caseInfoUnfold.setId(caseInfo.getId());
        caseInfoUnfold.setCreateTime(nowDate);
        caseInfoUnfold.setUpdateTime(nowDate);
@@ -621,7 +648,7 @@
        StringBuffer pagents = new StringBuffer();
        StringBuffer dagents = new StringBuffer();
        // 常规登记-保存当事人
        int peopleNum = this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
        int peopleNum = this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents, loginUser);
        caseInfo.setVisitPeopleNum(peopleNum);
        caseInfo.setPlaintiffs(plaintiffs.toString());
        caseInfo.setPagents(pagents.toString());
@@ -657,16 +684,17 @@

    /**
     * 生成调解案件标题
     * @param plaintiffs 申请人
     * @param defendants 被申请人
     *
     * @param plaintiffs   申请人
     * @param defendants   被申请人
     * @param caseTypeName 纠纷类型
     * @return String
     */
    public String createCaseTitle(String plaintiffs, String defendants, String caseTypeName){
    public String createCaseTitle(String plaintiffs, String defendants, String caseTypeName) {
        StringBuffer caseTitle = new StringBuffer();
        if (plaintiffs.indexOf(BaseConsts.COMMA) != -1){
        if (plaintiffs.indexOf(BaseConsts.COMMA) != -1) {
            caseTitle.append(plaintiffs.split(BaseConsts.COMMA)[0]).append("等");
        }else {
        } else {
            caseTitle.append(plaintiffs.split(BaseConsts.COMMA)[0]);
        }
        if (StringUtils.isNotEmpty(defendants)) {
@@ -678,7 +706,7 @@
            }
        }
        caseTitle.append("的");
        if (StringUtils.isNotEmpty(caseTypeName)){
        if (StringUtils.isNotEmpty(caseTypeName)) {
            caseTitle.append(caseTypeName);
        }
        caseTitle.append("案件");
@@ -687,15 +715,16 @@

    /**
     * pc端-常规登记-保存正式案件-保存人员信息
     *
     * @param registerSaveDTO 纠纷信息
     * @param plaintiffs 申请人
     * @param pagents 申请人代理人
     * @param defendants 被申请人
     * @param dagents 被申请人代理人
     * @param plaintiffs      申请人
     * @param pagents         申请人代理人
     * @param defendants      被申请人
     * @param dagents         被申请人代理人
     * @return int
     */
    private int saveCasePersonWechat(RegisterSaveDTO registerSaveDTO, StringBuffer plaintiffs, StringBuffer pagents,
                               StringBuffer defendants, StringBuffer dagents,PaUserDTO loginUser){
                                     StringBuffer defendants, StringBuffer dagents, PaUserDTO loginUser) {
        int peopleNum = 0;
        // 保存申请人
        List<CasePerson> personList = registerSaveDTO.getPersonList();
@@ -711,13 +740,13 @@
                personService.saveOrUpdate(casePerson);

                //添加申请方和被申请方人名组合
                if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().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.getIndex().equals(casePerson.getPerType())){
                } else if (CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())) {
                    //被申请方
                    if (StringUtils.isNotEmpty(defendants.toString())) {
                        defendants.append(BaseConsts.COMMA);
@@ -730,7 +759,7 @@
            //保存代理人
            List<CaseAgent> agentList = registerSaveDTO.getAgentList();
            if (CollectionUtils.isNotEmpty(agentList)) {
                for(CaseAgent caseAgent: agentList){
                for (CaseAgent caseAgent : agentList) {
                    caseAgent.setId(utilsClient.getNewTimeCaseId());
                    caseAgent.setPartyUserId(loginUser.getId());
                    caseAgent.setCaseId(registerSaveDTO.getId());
@@ -739,12 +768,12 @@
                    caseAgent.setCreateTime(registerSaveDTO.getUpdateTime());
                    caseAgent.setUpdateTime(registerSaveDTO.getUpdateTime());
                    agentService.saveOrUpdate(caseAgent);
                    if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())){
                    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())){
                    } else if (CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())) {
                        if (StringUtils.isNotEmpty(dagents.toString())) {
                            dagents.append(BaseConsts.COMMA);
                        }
@@ -758,15 +787,15 @@
        return peopleNum;
    }

    public RegisterSaveDTO getCaseInfoWechat(String id){
    public RegisterSaveDTO getCaseInfoWechat(String id) {
        RegisterSaveDTO registerSaveDTO = new RegisterSaveDTO();
        CaseInfo caseInfo = this.getById(id);
        if(ObjectUtils.isNotEmpty(caseInfo)){
        if (ObjectUtils.isNotEmpty(caseInfo)) {
            BeanUtils.copyProperties(caseInfo, registerSaveDTO);
        }
        QueryWrapper<CasePerson> casePersonQueryWrapper = new QueryWrapper<>();
        casePersonQueryWrapper.eq("case_id", registerSaveDTO.getId());
        List<CasePerson>  personList = personService.list(casePersonQueryWrapper);
        List<CasePerson> personList = personService.list(casePersonQueryWrapper);
        registerSaveDTO.setPersonList(personList);

        QueryWrapper<CaseAgent> caseAgentQueryWrapper = new QueryWrapper<>();
@@ -779,45 +808,46 @@

    /**
     * 按条件分页查询-小程序查询
     * @param page 分页对象
     *
     * @param page  分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<CaseInfoWeChatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms){
    public Page<CaseInfoWeChatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms) {
        PaUserDTO loginUser = custClient.paclientGetUser(userId);
        List<CaseInfoWeChatDTO> list = new ArrayList<>();
        String personType = terms.get("personType")+"";
        if(ObjectUtils.isEmpty(personType)){
        String personType = terms.get("personType") + "";
        if (ObjectUtils.isEmpty(personType)) {
            throw new RuntimeException("请选择人员类型");
        }
        if(ObjectUtils.isEmpty(loginUser.getIdcard())){
        if (ObjectUtils.isEmpty(loginUser.getIdcard())) {
            return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
        }
        QueryWrapper<CasePerson> personWrapper = new QueryWrapper<>();
        personWrapper.select("case_id");
        personWrapper.eq("certi_no", loginUser.getIdcard());
        if("1".equals(personType)){
            personWrapper.eq("per_type",CaseBaseConstsEnum.PERSON_TYPE_1.getIndex());
        }else {
            personWrapper.eq("per_type",CaseBaseConstsEnum.PERSON_TYPE_2.getIndex());
        if ("1".equals(personType)) {
            personWrapper.eq("per_type", CaseBaseConstsEnum.PERSON_TYPE_1.getIndex());
        } else {
            personWrapper.eq("per_type", CaseBaseConstsEnum.PERSON_TYPE_2.getIndex());
        }
        List<CasePerson> casePersonList = personService.list(personWrapper);
        if(ObjectUtils.isEmpty(casePersonList)){
        if (ObjectUtils.isEmpty(casePersonList)) {
            return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
        }
        List<String> ids = casePersonList.stream().map(CasePerson::getCaseId).collect(Collectors.toList());
        terms.put("ids",ids);
        terms.put("ids", ids);
        long total = mapper.countTerms(terms);
        List<CaseInfo> content = mapper.pageTerms(page, terms);
        if(ObjectUtils.isNotEmpty(content)){
            for(CaseInfo caseInfo: content){
        if (ObjectUtils.isNotEmpty(content)) {
            for (CaseInfo caseInfo : content) {
                CaseInfoWeChatDTO caseInfoWeChatDTO = new CaseInfoWeChatDTO();
                BeanUtils.copyProperties(caseInfo, caseInfoWeChatDTO);
                caseInfoWeChatDTO.setProcessStatus(caseInfo.getInfoProcess());
                caseInfoWeChatDTO.setProcessStatusName(caseInfo.getInfoProcessName());
                //扩展信息
                CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseInfo.getId());
                if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
                if (ObjectUtils.isNotEmpty(caseInfoUnfold)) {
                    caseInfoWeChatDTO.setMediResult(caseInfoUnfold.getMediResult());
                    caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName());
                    caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateUnitId());
@@ -837,9 +867,9 @@
                for (CasePerson casePerson : casePersonList1) {
                    CasePersonWechatDTO casePersonWechatDTO = new CasePersonWechatDTO();
                    BeanUtils.copyProperties(casePerson, casePersonWechatDTO);
                    if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
                    if (CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())) {
                        plaintiffList.add(casePersonWechatDTO);
                    }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
                    } else if (CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())) {
                        defendantList.add(casePersonWechatDTO);
                    }
                }
@@ -851,9 +881,9 @@
                evaluateTerms.put("deleteStatus", BaseConsts.DELETE_STATUS_0);
                evaluateTerms.put("evaluateUserId", loginUser.getId());
                long evaluateCount = caseEvaluateService.countTerms(evaluateTerms);
                if(evaluateCount > 0){
                if (evaluateCount > 0) {
                    caseInfoWeChatDTO.setIsEvaluate("1");
                }else{
                } else {
                    caseInfoWeChatDTO.setIsEvaluate("0");
                }

@@ -865,14 +895,15 @@

    /**
     * 按条件分页查询-综合查询
     * @param page 分页对象
     *
     * @param page  分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<CasePageDTO> pageQueryAll(PageRequest page, Map<String, Object> terms){
    public Page<CasePageDTO> pageQueryAll(PageRequest page, Map<String, Object> terms) {
        long total = mapper.countTermsAll(terms);
        List<CasePageDTO> content = mapper.pageTermsAll(page, terms);
        if(ObjectUtils.isNotEmpty(content)){
        if (ObjectUtils.isNotEmpty(content)) {
            for (CasePageDTO casePageDTO : content) {
                QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
                personWrapper1.eq("case_id", casePageDTO.getId());
@@ -884,9 +915,9 @@
                for (CasePerson casePerson : casePersonList1) {
                    CasePersonWeDTO casePersonWechatDTO = new CasePersonWeDTO();
                    BeanUtils.copyProperties(casePerson, casePersonWechatDTO);
                    if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
                    if (CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())) {
                        plaintiffList.add(casePersonWechatDTO);
                    }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
                    } else if (CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())) {
                        defendantList.add(casePersonWechatDTO);
                    }
                }