1、联合处置审核页面bug修复 2、详情也办理结果-办理意见为空修复

liyj

2024-09-27 5aa1a5263745b746b98d05c3296bf91c5c7d5edf

1、联合处置审核页面bug修复
2、详情也办理结果-办理意见为空修复

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

@@ -58,6 +58,12 @@
     */
    public static final int ASSIST_STATUS_0 = 0;
    public static final int ASSIST_STATUS_1 = 1;

    /**
     * 经办类型，1：承办组织，2：配合组织
     */
    public static final int HANDLE_TYPE_1 = 1;
    public static final int HANDLE_TYPE_2 = 2;
}
/**
 * -------------------_ooOoo_-------------------

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/TransactResultDTO.java

@@ -13,6 +13,10 @@
     * 申请配合组织名称，多个用、隔开
     */
    private String applyAssistUnitName;
    /**
     * 办理意见
     */
    private String handleContent;

    /**
     * 附件

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

@@ -249,9 +249,9 @@
            caseInfoUnfoldQueryWrapper.eq("id", caseFeedback.getCaseId());
            CaseInfoUnfold caseInfoUnfold = unfoldService.getOne(caseInfoUnfoldQueryWrapper);
            if(caseInfoUnfold.getMediateUnitId().equals(loginUser.getUnitId())){
                caseFeedback.setHandleType(1);
                caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_1);
            }else{
                caseFeedback.setHandleType(2);
                caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_2);
            }
            this.save(caseFeedback);
        }catch (Exception e){

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

@@ -6,15 +6,12 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.consts.CaseTaskConsts;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.po.*;
import cn.huge.module.cases.domain.dto.TransactResultDTO;
import cn.huge.module.cases.domain.po.CaseAssistInfo;
import cn.huge.module.cases.domain.po.CaseTask;
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.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
@@ -25,6 +22,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.el.stream.Stream;
import org.springframework.beans.BeanUtils;
@@ -72,6 +70,9 @@

    @Autowired
    private CaseAssistInfoService caseAssistInfoService;

    @Autowired
    private CaseFeedbackService caseFeedbackService;

    /**
    * 更新对象
@@ -218,8 +219,8 @@
            CaseInfoUnfold caseInfoUnfold = this.getById(caseId);
            if(StringUtils.isNotBlank(caseInfoUnfold.getMediResult())) {
                TransactResultDTO transactResultDTO = new TransactResultDTO();
                BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
                if (ObjectUtils.isNotEmpty(transactResultDTO)) {
                if (ObjectUtils.isNotEmpty(caseInfoUnfold)) {
                    BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
                    QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
                    caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
                            .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
@@ -228,6 +229,15 @@
                    if (ObjectUtils.isNotEmpty(caseAssistApply)) {
                        transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName());
                    }

                    // 查询最新的办理意见
                    QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
                    caseFeedbackQueryWrapper.eq("case_id", caseId).eq("handle_type", CaseTaskConsts.HANDLE_TYPE_1)
                            .orderByDesc("create_time");
                    List<CaseFeedback> caseFeedbackList = caseFeedbackService.list(caseFeedbackQueryWrapper);
                    if (CollectionUtils.isNotEmpty(caseFeedbackList)){
                        transactResultDTO.setHandleContent(caseFeedbackList.get(0).getHandleContent());
                    }
                }
                Map<String, Object> terms = new HashMap<>();
                terms.put("mainId", caseId);

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

@@ -431,10 +431,18 @@
                    }
                }
            }else {
                daxx.setName("详情");
                tabList.add(daxx);
                tabList.add(lcdb);
                tabList.add(sqjl);
                // 是否是联合处置审核
                CaseAssistApply caseAssistApply = caseAssistApplyService.getById(caseTaskId);
                if (ObjectUtils.isNotEmpty(caseAssistApply)){
                    tabList.add(sxxq);
                    tabList.add(lhczsh);
                    tabList.add(sqjl);
                }else {
                    daxx.setName("详情");
                    tabList.add(daxx);
                    tabList.add(lcdb);
                    tabList.add(sqjl);
                }
            }
            // 封装数据
            TabButtonDTO tabButtonDTO = new TabButtonDTO();