Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

liyj

2024-09-23 dac9b1293fc59f64856bd8f9d6d872cfd5bef715

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

@@ -103,14 +103,13 @@
        <result property="agreeTypeName" column="agree_type_name"/>
        <result property="agreeContent" column="agree_content"/>
        <result property="createTime" column="create_time"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
    </resultMap>
    <!-- 表 -->
    <sql id='table-name'>dyh_case_info</sql>
    <sql id="column-part-all">
        a
        .
        id
        ,
        a.id,
        a.status,
        a.status_name,
        a.canal,
@@ -121,6 +120,8 @@
        a.input_unit_id,
        a.input_unit_name,
        a.create_time,
        a.plaintiffs,
        a.defendants,
        b.medi_result,
        b.medi_result_name,
        b.mediate_unit_id,
@@ -338,6 +339,36 @@
                </if>
                <if test="terms.isArea != null and terms.isArea !=''">
                    and a.que_city is not null and a.que_area is not null and a.que_road is not null
                </if>
                <if test="terms.caseRef != null and terms.caseRef !=''">
                    and a.case_ref = #{terms.caseRef}
                </if>
                <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
                    and a.plaintiffs = #{terms.plaintiffs}
                </if>
                <if test="terms.defendants != null and terms.defendants !=''">
                    and a.defendants = #{terms.defendants}
                </if>
                <if test="terms.peopleNumStart != null and terms.peopleNumStart !=''">
                    and a.people_num  <![CDATA[ >= ]]> #{terms.peopleNumStart}
                </if>
                <if test="terms.peopleNumEnd != null and terms.peopleNumEnd !=''">
                    and a.people_num  <![CDATA[ <= ]]> #{terms.peopleNumEnd}
                </if>
                <if test="terms.amountStart != null and terms.amountStart !=''">
                    and a.amount  <![CDATA[ >= ]]> #{terms.amountStart}
                </if>
                <if test="terms.amountEnd != null and terms.amountEnd !=''">
                    and a.amount  <![CDATA[ <= ]]> #{terms.amountEnd}
                </if>
                <if test="terms.evaluateGrade != null and terms.evaluateGrade !=''">
                    and a.id in(select case_id from dyh_case_evaluate where evaluate_grade = #{terms.evaluateGrade})
                </if>
                <if test="terms.mediateUnitId != null and terms.mediateUnitId !=''">
                    and b.mediate_unit_id = #{terms.mediateUnitId}
                </if>
                <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
                    and b.assist_unit_id = #{terms.assistUnitId}
                </if>
            </where>
        </if>
@@ -703,14 +734,17 @@

    <select id="pageTermsCaseRegister" resultType="cn.huge.module.cases.domain.dto.CaseRegisterDTO">
        SELECT
        t1.create_time as createTime,t1.input_user_name as inputUserName,t1.status_name as statusName,t1.case_level as
        t1.id as caseId,t1.create_time as createTime,t1.input_user_name as inputUserName,t1.status_name as statusName,t1.case_level as
        caseLevel,t1.canal_name as canalName,
        t1.case_type_first_name as caseTypeFirstName,t1.case_type_name as caseTypeName,t1.plaintiffs as
        plaintiffs,t1.defendants as defendants,t2.medi_result_name as mediResultName,
        t3.number as superviseCount
        t3.number as superviseCount,
        t4.id as caseTaskId
        FROM
        dyh_case_info t1 left join dyh_case_info_unfold t2 on t1.id = t2.id
        dyh_case_info t1
        left join dyh_case_info_unfold t2 on t1.id = t2.id
        left join (select count(*) as number ,case_id from dyh_case_supervise group by case_id) t3 on t3.case_id=t1.id
        left join dyh_case_task t4 on t1.id = t4.case_id
        <include refid="where-register-part"/>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -728,7 +762,9 @@
        SELECT
        count(t1.id)
        FROM
        dyh_case_info t1 left join dyh_case_info_unfold t2 on t1.id = t2.id
        dyh_case_info t1
        left join dyh_case_info_unfold t2 on t1.id = t2.id
        left join dyh_case_task t4 on t1.id = t4.case_id
        <include refid="where-register-part"/>
    </select>
    <!--  根据条件统计  -->