整改： 1、工作台-办理中列表 2、工作台-结案申请/已结案列表 3、事项状态，办理中改为化解中

liyj

2024-09-21 230c051d5afafaa3957f5f2c471f16116103e16c

整改：
1、工作台-办理中列表
2、工作台-结案申请/已结案列表
3、事项状态，办理中改为化解中

 dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseInfoProcessBaseConstsEnum.java

@@ -11,10 +11,10 @@
public enum CaseInfoProcessBaseConstsEnum {

    /**
     * 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理，4：不予受理
     * 对外展示事项进度，1：待受理，2：化解中，3：已结案，4：不予受理，4：不予受理
     */
    CASE_INFO_PROCESS_1(1, "待受理"),
    CASE_INFO_PROCESS_2(2, "办理中"),
    CASE_INFO_PROCESS_2(2, "化解中"),
    CASE_INFO_PROCESS_3(3, "已结案"),
    CASE_INFO_PROCESS_4(3, "不予受理");


 dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseStatusBaseConstsEnum.java

@@ -11,12 +11,12 @@
public enum CaseStatusBaseConstsEnum {

    /**
     * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
     * 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
     */
    CASE_STATUS_1(1, "待分派"),
    CASE_STATUS_2(2, "待签收"),
    CASE_STATUS_3(3, "待受理"),
    CASE_STATUS_4(4, "办理中"),
    CASE_STATUS_4(4, "化解中"),
    CASE_STATUS_5(5, "结案审核"),
    CASE_STATUS_6(6, "待评价"),
    CASE_STATUS_7(7, "已归档"),

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java

@@ -370,7 +370,7 @@
        if (StringUtils.isNotBlank(inputWay)){
            terms.put("inputWay", inputWay);
        }
        // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
        // 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
        String status = request.getParameter("status");
        if (StringUtils.isNotBlank(status)){
            terms.put("status", status);
@@ -390,7 +390,7 @@
        if (StringUtils.isNotBlank(processName)){
            terms.put("processName", processName);
        }
        // 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理
        // 对外展示事项进度，1：待受理，2：化解中，3：已结案，4：不予受理
        String infoProcess = request.getParameter("process");
        if (StringUtils.isNotBlank(infoProcess)){
            terms.put("infoProcess", infoProcess);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java

@@ -84,7 +84,7 @@
            terms.put("defendants", defendants);
        }

        // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
        // 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档
        String status = request.getParameter("status");
        if (org.apache.commons.lang3.StringUtils.isNotBlank(status)){
            terms.put("status", status);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java

@@ -17,6 +17,7 @@
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
@@ -324,6 +325,7 @@
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            // 条件
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/分派时间区间
            String timeStart = request.getParameter("timeStart");
@@ -344,6 +346,10 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("status", status);
            // 排序
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
@@ -373,9 +379,6 @@
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("status", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskFp(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
@@ -397,6 +400,7 @@
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            // 条件
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/签收时间区间
            String timeStart = request.getParameter("timeStart");
@@ -417,6 +421,10 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("signStatus", status);
            // 排序
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
@@ -446,9 +454,6 @@
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("signStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskQs(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
@@ -470,30 +475,7 @@
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
                               @RequestParam(value = "status") int status, @CurrentUser String userId) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/受理时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                // 待受理，查询流转时间
                if (status == 1){
                    terms.put("createTimeStart", timeStart);
                    terms.put("createTimeEnd", timeEnd);
                }else if (status == 2){
                    // 已受理，查询受理时间
                    terms.put("handleTimeStart", timeStart);
                    terms.put("handleTimeEnd", timeEnd);
                }else {
                    // 不予受理，查询不予受理时间
                    terms.put("disTimeStart", timeStart);
                    terms.put("disTimeEnd", timeEnd);
                }
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            // 排序
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
@@ -533,6 +515,31 @@
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            // 条件
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/受理时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                // 待受理，查询流转时间
                if (status == 1){
                    terms.put("createTimeStart", timeStart);
                    terms.put("createTimeEnd", timeEnd);
                }else if (status == 2){
                    // 已受理，查询受理时间
                    terms.put("handleTimeStart", timeStart);
                    terms.put("handleTimeEnd", timeEnd);
                }else {
                    // 不予受理，查询不予受理时间
                    terms.put("disTimeStart", timeStart);
                    terms.put("disTimeEnd", timeEnd);
                }
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            // 不予受理，查询case_dismiss表
            if (status == 3){
@@ -553,28 +560,34 @@
     * @url {ctx}/api/web/caseTask/pageMyTaskBlz
     * @param page 页码
     * @param size 每页数量
     * @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：流转时间/已办天数；2：分派时限；3：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskBlz")
    public Object pageMyTaskBlz(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                                @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
                                @CurrentUser String userId) {
                                @RequestParam(value = "caseTaskType") int caseTaskType, @RequestParam(value = "sortType") int sortType,
                                @RequestParam(value = "sortColmn") int sortColmn, @CurrentUser String userId) {
        try {
            // 条件
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/结案申请/结案时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                terms.put("timeStart", timeStart);
                terms.put("timeEnd", timeEnd);
                terms.put("createTimeStart", timeStart);
                terms.put("createTimeEnd", timeEnd);
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            terms.put("caseTaskType", caseTaskType);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId", loginUser.getUnitId());
            // 排序
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
@@ -599,10 +612,7 @@
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }

            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            return ReturnSucUtils.getRepInfo(service.pageMyTaskBlz(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
@@ -610,38 +620,55 @@
    }

    /**
     * web端-工作台-查询待办任务-办理任务
     * web端-工作台-查询待办任务-已办理任务
     * @url {ctx}/api/web/caseTask/pageMyTaskBl
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，0：结案申请，1：已结案
     * @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：结案申请时间；2：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskBl")
    public Object pageMyTaskBl(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
                               @RequestParam(value = "status") int status, @RequestParam(value = "caseTaskType") int caseTaskType,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
                               @CurrentUser String userId) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/结案申请/结案时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                terms.put("timeStart", timeStart);
                terms.put("timeEnd", timeEnd);
                terms.put("applyTimeStart", timeStart);
                terms.put("applyTimeStart", timeEnd);
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            terms.put("applyStatus", status);
            if (status == 1){
                terms.put("auditResult", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            if (caseTaskType == 1){
                terms.put("applyUnitId", loginUser.getUnitId());
            }else {
                terms.put("assistUnitId", loginUser.getUnitId());
            }
            // 排序
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.apply_time";
                    if (status == 0) {
                        sortName = "t1.apply_time";
                    }else {
                        sortName = "t1.audit_time";
                    }
                    break;
                case 2:
                    sortName = "t1.case_level";
@@ -659,10 +686,7 @@
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("applyUnitId",loginUser.getUnitId());
            terms.put("applyStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskBl(pageRequest, terms));
            return ReturnSucUtils.getRepInfo(service.pageMyTaskJa(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java

@@ -62,7 +62,7 @@
        if (StringUtils.isNotBlank(process)){
            terms.put("process", process);
        }
        // 办理进度，1：待受理，2：办理中，3：已结案，4：不予受理
        // 办理进度，1：待受理，2：化解中，3：已结案，4：不予受理
        String processStatus = request.getParameter("processStatus");
        if (StringUtils.isNotBlank(processStatus)){
            terms.put("infoProcess", processStatus);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java

@@ -137,18 +137,18 @@
    List<FrontPageListDTO> pageMyTaskShWSQD(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核条件统计
     * 首页-办理中条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskProcessing(@Param("terms") Map<String, Object> terms);
    long countMyTaskBlz(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * 首页-办理中分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskProcessing(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
    List<FrontPageListBLZDTO> pageMyTaskBlz(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java

@@ -1,6 +1,7 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.dto.FrontPageListJADTO;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.po.CaseWindupApply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -86,17 +87,17 @@
    List<FrontPageListDTO> listMyTaskApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核条件统计
     * 首页-结案申请/已结案条件条件统计
     * @param terms 条件
     * @return long
     */
    long countMySubmitApplyReview(@Param("terms") Map<String, Object> terms);
    long countMyTaskJa(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * 首页-结案申请/已结案分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> listMySubmitApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
    List<FrontPageListJADTO> listMyTaskJa(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml

@@ -580,45 +580,56 @@
        limit #{page.offset}, #{page.size}
    </select>


    <!-- 工作台-办理中条件查询-条件 -->
    <sql id="myTaskBlz-where-part">
        <if test="terms != null">
            <if test="terms.candeUnitId != null and terms.candeUnitId !=''">
                and t1.cande_unit_id = #{terms.candeUnitId}
            </if>
            <if test="terms.status != null and terms.status !=''">
                and t1.status = #{terms.status}
            </if>
            <if test="terms.caseTaskType != null and terms.caseTaskType !=''">
                and t1.case_task_type = #{terms.caseTaskType}
            </if>
            <if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
                and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
                and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createTimeEnd})
            </if>
            <if test="terms.partyName != null and terms.partyName !=''">
                and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
            </if>
        </if>
    </sql>
    <!--  首页-办理中条件统计  -->
    <select id="countMyTaskProcessing" resultType="java.lang.Long">
    <select id="countMyTaskBlz" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        left join dyh_case_info_unfold t3 on t1.case_id = t3.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.node_id = 'BLFK'
        and t2.delete_status = 0
        t1.node_id = 'BLFK'
        and t1.status = 1
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        and t2.delete_status = 0
        <include refid="myTaskBlz-where-part"/>
    </select>
    <!--  首页-办理中分页查询  -->
    <select id="pageMyTaskProcessing" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as caseId,
        t1.create_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
    <select id="pageMyTaskBlz" resultType="cn.huge.module.cases.domain.dto.FrontPageListBLZDTO">
        SELECT
        t1.id as ownerId, t1.case_id as caseId, t1.create_time as turnaroundTime, t2.case_level as caseGrade,
        t2.canal_name as caseSource, t2.case_type_name as caseType, t3.mediator as mediator,
        t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
        concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        left join dyh_case_info_unfold t3 on t1.case_id = t3.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.node_id = 'BLFK'
        and t2.delete_status = 0
        t1.node_id = 'BLFK'
        and t1.status = 1
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        and t2.delete_status = 0
        <include refid="myTaskBlz-where-part"/>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml

@@ -350,46 +350,61 @@
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页-结案申请条件统计  -->
    <select id="countMySubmitApplyReview" resultType="java.lang.Long">

    <!-- 工作台-办理中条件查询-条件 -->
    <sql id="mySubmitApplyReview-where-part">
        <if test="terms != null">
            <if test="terms.applyUnitId != null and terms.applyUnitId !=''">
                and t1.apply_unit_id = #{terms.applyUnitId}
            </if>
            <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
                and t3.assist_unit_id like concat('%', #{terms.assistUnitId}, '%')
            </if>
            <if test="terms.applyStatus != null and terms.applyStatus !=''">
                and t1.apply_status = #{terms.applyStatus}
            </if>
            <if test="terms.auditResult != null and terms.auditResult !=''">
                and t1.audit_result = #{terms.auditResult}
            </if>
            <if test="terms.applyTimeStart != null and terms.applyTimeStart !='' and terms.applyTimeEnd != null and terms.applyTimeEnd !=''">
                and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.applyTimeStart}
                and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.applyTimeEnd})
            </if>
            <if test="terms.partyName != null and terms.partyName !=''">
                and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
            </if>
        </if>
    </sql>
    <!--  首页-结案申请/已结案条件统计  -->
    <select id="countMyTaskJa" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.apply_unit_id = #{terms.applyUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        t2.delete_status = 0
        <include refid="mySubmitApplyReview-where-part"/>
    </select>
    <!--  首页-结案申请分页查询  -->
    <select id="listMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process,
        t1.apply_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
             t1.medi_result_name as mediResult,t1.fail_reason as reason,
         concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants,
        t3.mediator as manager
    <!--  首页-结案申请/已结案分页查询  -->
    <select id="listMyTaskJa" resultType="cn.huge.module.cases.domain.dto.FrontPageListJADTO">
        SELECT
        t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
        <if test="terms.applyStatus == 0">
            t1.apply_time as turnaroundTime,
        </if>
        <if test="terms.applyStatus == 1">
            t1.audit_time as turnaroundTime,
        </if>
        t1.audit_unit_name as auditUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
        t3.mediator as manager, t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
        t1.medi_result as mediResult, t1.medi_result_name as mediResultName, t2.status_name as caseStatusName,
        concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        left join dyh_case_info_unfold t3 on t3.id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.apply_unit_id = #{terms.applyUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        t2.delete_status = 0
        <include refid="mySubmitApplyReview-where-part"/>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}

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

@@ -18,7 +18,7 @@
     */
    private String id;
    /**
     * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
     * 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
     */
    private Integer status;


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

New file
@@ -0,0 +1,87 @@
package cn.huge.module.cases.domain.dto;

import cn.huge.module.cases.domain.po.CaseInfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;

/**
 * @title: 工作台-待办列表-传输对象-办理中
 * @description: 作台-待办列表-传输对象-办理中
 * @company: hugeinfo
 * @author: liyj
 * @time: 2024-09-21 09:36:25
 * @version: 1.0.0
 * @see CaseInfo
 */
@Data
public class FrontPageListBLZDTO {

    /**
     * 所属业务表编号
     */
    private String ownerId;

    /**
     * 纠纷信息ID
     */
    private String caseId;

    /**
     * 流转时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
    private Date turnaroundTime;

    /**
     * 办理天数
     */
    private long processingDays;

    /**
     * 事项等级
     */
    private Integer caseGrade;

    /**
     * 事项来源
     */
    private String caseSource;

    /**
     * 纠纷类型
     */
    private String caseType;

    /**
     * 经办人
     */
    private String manager;

    /**
     * 配合部门
     */
    private String cooperatingUnit;

    /**
     * 承办部门
     */
    private String organizingUnit;

    /**
     * 申请方
     */
    private String plaintiffs;

    /**
     * 被申请方
     */
    private String defendants;

    /**
     * 督办次数
     */
    private int superviseCount;

}

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

New file
@@ -0,0 +1,107 @@
package cn.huge.module.cases.domain.dto;

import cn.huge.module.cases.domain.po.CaseInfo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;

/**
 * @title: 工作台-待办列表-传输对象-结案
 * @description: 作台-待办列表-传输对象-结案
 * @company: hugeinfo
 * @author: liyj
 * @time: 2024-09-21 09:36:25
 * @version: 1.0.0
 * @see CaseInfo
 */
@Data
public class FrontPageListJADTO {
    /**
     * 所属结案申请信息编号
     */
    private String windupId;

    /**
     * 所属业务表编号
     */
    private String ownerId;

    /**
     * 纠纷信息ID
     */
    private String caseId;

    /**
     * 结案申请/结案时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
    private Date turnaroundTime;

    /**
     * 结案审核部门
     */
    private String auditUnit;

    /**
     * 事项等级
     */
    private Integer caseGrade;

    /**
     * 事项来源
     */
    private String caseSource;

    /**
     * 纠纷类型
     */
    private String caseType;

    /**
     * 经办人
     */
    private String manager;

    /**
     * 配合部门
     */
    private String cooperatingUnit;

    /**
     * 承办部门
     */
    private String organizingUnit;

    /**
     * 调解结果
     */
    private String mediResult;

    /**
     * 调解结果名称
     */
    private String mediResultName;

    /**
     * 事项状态
     */
    private String caseStatusName;

    /**
     * 申请方
     */
    private String plaintiffs;

    /**
     * 被申请方
     */
    private String defendants;

    /**
     * 督办次数
     */
    private int superviseCount;

}

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

@@ -7,8 +7,8 @@
import java.util.Date;

/**
 * @title: 工作台-待办列表-传输对象-分派
 * @description: 作台-待办列表-传输对象-分派
 * @title: 工作台-待办列表-传输对象-签收
 * @description: 作台-待办列表-传输对象-签收
 * @company: hugeinfo
 * @author: liyj
 * @time: 2024-09-21 09:36:25

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

@@ -7,8 +7,8 @@
import java.util.Date;

/**
 * @title: 工作台-待办列表-传输对象-分派
 * @description: 作台-待办列表-传输对象-分派
 * @title: 工作台-待办列表-传输对象-受理
 * @description: 作台-待办列表-传输对象-受理
 * @company: hugeinfo
 * @author: liyj
 * @time: 2024-09-21 09:36:25

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java

@@ -354,7 +354,7 @@
    private Integer inputWay;

    /**
    * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档，8：不予受理
    * 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
    */
    @TableField(value = "status")
    private Integer status;
@@ -378,7 +378,7 @@
    private String processName;

    /**
     * 对外展示事项进度，1：待受理，2：办理中，3：已结案，4：不予受理
     * 对外展示事项进度，1：待受理，2：化解中，3：已结案，4：不予受理
     */
    @TableField(value = "info_process")
    private Integer infoProcess;

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

@@ -267,8 +267,8 @@
            sb.setId("sb");
            sb.setName("上报");
            TabButtonInfoDTO bysl = new TabButtonInfoDTO();
            sb.setId("bysl");
            sb.setName("不予受理");
            bysl.setId("bysl");
            bysl.setName("不予受理");
            // 根据流程显示tab
            List<TabButtonInfoDTO> tabList = new LinkedList<>();
            // 根据流程显示button
@@ -804,39 +804,22 @@
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListBLZDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskProcessing(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
            List<String> caseIdList = new ArrayList<>();
            long total = mapper.countMyTaskBlz(terms);
            List<FrontPageListBLZDTO> frontPageListBLZDTOList = mapper.pageMyTaskBlz(page, terms);
            Date now = DateUtils.getNowDate();
            for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
            for(FrontPageListBLZDTO frontPageListBLZDTO: frontPageListBLZDTOList){
                long milliseconds1 = frontPageListBLZDTO.getTurnaroundTime().getTime();
                long milliseconds2 = now.getTime();
                long diff = milliseconds2 - milliseconds1;
                long daysBetween = diff / (24 * 60 * 60 * 1000);
                frontPageListDTO.setProcessingDays(daysBetween);
                caseIdList.add(frontPageListDTO.getCaseId());
                frontPageListBLZDTO.setProcessingDays(daysBetween);
            }
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
                unfoldQueryWrapper.in("id", caseIdList);
                List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
                for(CaseInfoUnfold unfold: unfoldList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                            frontPageListDTO.setManager(unfold.getMediator());
                        }
                    }
                }
            }

            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            return new PageImpl<FrontPageListBLZDTO>(frontPageListBLZDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.pageMyTaskBlz]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskBlz", e);
        }
    }

@@ -846,30 +829,14 @@
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListJADTO> pageMyTaskJa(PageRequest page, Map<String, Object> terms){
        try {
            long total = caseWindupApplyService.countMySubmitApplyReview(terms);
            List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);

            List<String> caseIdList = new ArrayList<>();
            caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
                unfoldQueryWrapper.in("id", caseIdList);
                List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
                for(CaseInfoUnfold unfold: unfoldList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                        }
                    }
                }
            }
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            long total = caseWindupApplyService.countMyTaskJa(terms);
            List<FrontPageListJADTO> frontPageListJADTOList = caseWindupApplyService.listMyTaskJa(page, terms);
            return new PageImpl<FrontPageListJADTO>(frontPageListJADTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.pageMyTaskJa]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskJa", e);
        }
    }

@@ -1422,7 +1389,7 @@
                // 拼接配合组织编号和名称
                String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitName).
                        collect(Collectors.joining(BaseConsts.COMMA));
                for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
                    // 启动联合处置工作流
@@ -1898,7 +1865,6 @@
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
@@ -2012,12 +1978,6 @@
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
                caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
                caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
                caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
@@ -2080,18 +2040,6 @@
                caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
                caseInfoPO.setUpdateTime(nowDate);
                caseInfoService.updateCaseInfo(caseInfoPO);
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
                caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
                caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
                caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
        }catch (Exception e){
            log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);

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

@@ -5,6 +5,7 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.dto.FrontPageListJADTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseWindupApplyMapper;
@@ -190,23 +191,21 @@
    }

    /**
     * 首页-查询待办任务-办理任务数量统计
     * 首页-查询待办任务-结案申请/已结案条件统计
     * @param terms 条件
     * @return Page
     */
    public long countMySubmitApplyReview(Map<String, Object> terms){
        long total = mapper.countMySubmitApplyReview(terms);
        return total;
    public long countMyTaskJa(Map<String, Object> terms){
        return mapper.countMyTaskJa(terms);
    }

    /**
     * 首页-查询待办任务-办理任务
     * 首页-查询待办任务-结案申请/已结案分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public List<FrontPageListDTO> listMySubmitApplyReview(PageRequest page, Map<String, Object> terms){
        List<FrontPageListDTO> frontPageListDTOList = mapper.listMySubmitApplyReview(page, terms);
        return frontPageListDTOList;
    public List<FrontPageListJADTO> listMyTaskJa(PageRequest page, Map<String, Object> terms){
        return mapper.listMyTaskJa(page, terms);
    }
}