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

liyj

2024-09-29 b311ca2f01e9602c1bf8caab04b4d641b314e341

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

@@ -319,7 +319,7 @@
                    and a.input_unit_id = #{terms.inputUnitId}
                </if>
                <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
                    and a.input_unit_name = #{terms.inputUnitName}
                    and a.input_unit_name like CONCAT('%', #{terms.inputUnitName}, '%')
                </if>
                <if test="terms.visitTimeStart != null and terms.visitTimeStart !='' and terms.visitTimeEnd != null and terms.visitTimeEnd !=''">
                    and (DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.visitTimeStart}
@@ -356,10 +356,10 @@
                    and a.case_ref = #{terms.caseRef}
                </if>
                <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
                    and a.plaintiffs = #{terms.plaintiffs}
                    and a.plaintiffs like CONCAT('%', #{terms.plaintiffs}, '%')
                </if>
                <if test="terms.defendants != null and terms.defendants !=''">
                    and a.defendants = #{terms.defendants}
                    and a.defendants like CONCAT('%', #{terms.defendants}, '%')
                </if>
                <if test="terms.peopleNumStart != null and terms.peopleNumStart !=''">
                    and a.people_num  <![CDATA[ >= ]]> #{terms.peopleNumStart}
@@ -381,6 +381,15 @@
                </if>
                <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
                    and b.assist_unit_id = #{terms.assistUnitId}
                </if>
                <if test="terms.mediateUnitName != null and terms.mediateUnitName !=''">
                    and b.mediate_unit_name like CONCAT('%', #{terms.mediateUnitName}, '%')
                </if>
                <if test="terms.assistUnitName != null and terms.assistUnitName !=''">
                    and b.assist_unit_name like CONCAT('%', #{terms.assistUnitName}, '%')
                </if>
                <if test="terms.mediResult != null and terms.mediResult !=''">
                    and b.medi_result = #{terms.mediResult}
                </if>
            </where>
        </if>
@@ -706,8 +715,8 @@
    <sql id="where-register-part">
        <if test="terms != null">
            <where>
                <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
                    and t1.input_unit_mame = #{inputUnitName}
                <if test="terms.inputUnitId != null and terms.inputUnitId !=''">
                    and t1.input_unit_id = #{terms.inputUnitId}
                </if>
                <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
                    and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
@@ -729,10 +738,10 @@
                    and t1.canal_name = #{terms.canalName}
                </if>
                <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
                    and t1.plaintiffs = #{terms.plaintiffs}
                    and t1.plaintiffs like CONCAT('%', #{terms.plaintiffs}, '%')
                </if>
                <if test="terms.defendants != null and terms.defendants !=''">
                    and t1.defendants = #{terms.defendants}
                    and t1.defendants like CONCAT('%', #{terms.defendants}, '%')
                </if>
                <if test="terms.statusName != null and terms.statusName !=''">
                    and t1.status_name = #{terms.statusName}
@@ -740,6 +749,9 @@
                <if test="terms.mediResultName != null and terms.mediResultName !=''">
                    and t2.medi_result_name = #{terms.mediResultName}
                </if>
                <if test="terms.mediResult != null and terms.mediResult !=''">
                    and t2.medi_result = #{terms.mediResult}
                </if>
            </where>
        </if>
    </sql>