forked from gzzfw/backEnd/gz-dyh

liyj
2024-09-08 a85508278ebdd73b32a92446ff741609ddb7d047
1、新增对外展示事项进度字段
3 files modified
38 ■■■■■ changed files
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java 12 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml 12 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java 14 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
@@ -336,7 +336,7 @@
        if (StringUtils.isNotBlank(inputWay)){
            terms.put("inputWay", inputWay);
        }
        // 事项状态,1:待签收,2:待受理,3:办理中,4:结案审核,5:待评价,6:已归档
        // 事项状态,1:待分派,2:待签收,3:待受理,:4:办理中,5:结案审核,6:待评价,7:已归档
        String status = request.getParameter("status");
        if (StringUtils.isNotBlank(status)){
            terms.put("status", status);
@@ -356,6 +356,16 @@
        if (StringUtils.isNotBlank(processName)){
            terms.put("processName", processName);
        }
        // 对外展示事项进度,1:待受理,2:办理中,3:已结案
        String infoProcess = request.getParameter("process");
        if (StringUtils.isNotBlank(infoProcess)){
            terms.put("infoProcess", infoProcess);
        }
        // 对外展示事项进度
        String infoProcessName = request.getParameter("infoProcessName");
        if (StringUtils.isNotBlank(infoProcessName)){
            terms.put("infoProcessName", infoProcessName);
        }
        // 意向调解组织编号
        String wantUnitId = request.getParameter("wantUnitId");
        if (StringUtils.isNotBlank(wantUnitId)){
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -70,6 +70,8 @@
            <result property="statusName" column="status_name"/>
            <result property="process" column="process"/>
            <result property="processName" column="process_name"/>
            <result property="infoProcess" column="infoProcess"/>
            <result property="infoProcessName" column="info_process_name"/>
            <result property="wantUnitId" column="want_unit_id"/>
            <result property="wantUnitName" column="want_unit_name"/>
            <result property="wantUserId" column="want_user_id"/>
@@ -160,6 +162,8 @@
        status_name,
        process,
        process_name,
        info_process,
        info_process_name,
        want_unit_id,
        want_unit_name,
        want_user_id,
@@ -229,6 +233,8 @@
            <if test="entity.statusName != null">status_name = #{entity.statusName},</if>
            <if test="entity.process != null">process = #{entity.process},</if>
            <if test="entity.processName != null">process_name = #{entity.processName},</if>
            <if test="entity.infoProcess != null">info_process = #{entity.infoProcess},</if>
            <if test="entity.infoProcessName != null">info_process_name = #{entity.infoProcessName},</if>
            <if test="entity.wantUnitId != null">want_unit_id = #{entity.wantUnitId},</if>
            <if test="entity.wantUnitName != null">want_unit_name = #{entity.wantUnitName},</if>
            <if test="entity.wantUserId != null">want_user_id = #{entity.wantUserId},</if>
@@ -463,6 +469,12 @@
                <if test="terms.processName != null and terms.processName !=''">
                    and process_name = #{terms.processName}
                </if>
                <if test="terms.infoProcess != null and terms.infoProcess !=''">
                    and info_process = #{terms.infoProcess}
                </if>
                <if test="terms.infoProcessName != null and terms.infoProcessName !=''">
                    and info_process_name = #{terms.infoProcessName}
                </if>
                <if test="terms.wantUnitId != null and terms.wantUnitId !=''">
                    and want_unit_id = #{terms.wantUnitId}
                </if>
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:已归档
    * 事项状态,1:待分派,2:待签收,3:待受理,:4:办理中,5:结案审核,6:待评价,7:已归档
    */
    @TableField(value = "status")
    private Integer status;
@@ -378,6 +378,18 @@
    private String processName;
    /**
     * 对外展示事项进度,1:待受理,2:办理中,3:已结案
     */
    @TableField(value = "info_process")
    private Integer infoProcess;
    /**
     * 对外展示事项进度
     */
    @TableField(value = "info_process_name")
    private String infoProcessName;
    /**
     * 意向调解组织编号
     */
    @TableField(value = "want_unit_id")