xieb
2024-03-16 03609afd855f5882a5296521e46472e9c637c31d
堤防普查
3 files modified
84 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml 53 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml 29 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -57,7 +57,7 @@
        if (!StringUtil.isBlank(param.getDykeGuid()))
            queryWrapper.like("\"dyke_guid\"", param.getDykeGuid());
        if (!StringUtil.isBlank(param.getCreateUser()))
            queryWrapper.like("\"create_user\"", param.getCreateUser());
            queryWrapper.eq("\"create_user\"", param.getCreateUser());
        if (null != param.getTbYear())
            queryWrapper.like("\"tb_year\"", param.getTbYear());
        if (!StringUtil.isBlank(param.getTbQuarter()))
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -19,33 +19,34 @@
        left join "SJZT_MD"."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
        left join "SJZT_MD"."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"
        left join "SJZT_MD"."tb_res_general_investigation_state" b on a."code" = b."res_guid"
        <where>
            <if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
                AND b."tb_year" = #{attResBase.tbYear}
        where 1 = 1
        <if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
            AND b."tb_year" = #{attResBase.tbYear}
        </if>
        <if test="attResBase.tbQuarter !=null and attResBase.tbQuarter !=''">
            AND b."tb_quarter" = #{attResBase.tbQuarter}
        </if>
        <if test="attResBase.name !=null and attResBase.name !=''">
            AND a."name" LIKE CONCAT('%',#{attResBase.name},'%')
        </if>
        <if test="attResBase.code !=null and attResBase.code !=''">
            AND a."code" LIKE CONCAT('%',#{attResBase.code},'%')
        </if>
        <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
            AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
        </if>
        <if test="attResBase.tbState != null and attResBase.tbState !=''">
            AND (
            <if test="attResBase.tbState == -1">
                b."check_state" IS NULL OR
            </if>
            <if test="attResBase.tbQuarter !=null and attResBase.tbQuarter !=''">
                AND b."tb_quarter" = #{attResBase.tbQuarter}
            </if>
            <if test="attResBase.name !=null and attResBase.name !=''">
                AND a."name" LIKE CONCAT('%',#{attResBase.name},'%')
            </if>
            <if test="attResBase.code !=null and attResBase.code !=''">
                AND a."code" LIKE CONCAT('%',#{attResBase.code},'%')
            </if>
            <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
                AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
            </if>
            <if test="attResBase.tbState !=null and attResBase.tbState !='' and attResBase.tbState == -1">
                AND (b."check_state" is null or b."check_state" = #{attResBase.tbState})
            </if>
            <if test="attResBase.tbState !=null and attResBase.tbState !='' and attResBase.tbState != -1">
                AND b."check_state" = #{attResBase.tbState}
            </if>
            <if test="attResBase.adCode != null and attResBase.adCode != '' ">
                and (aab."ad_code" = #{attResBase.adCode} or aa."ad_code" = #{attResBase.adCode} or ab."ad_code" =
                #{attResBase.adCode} or ac."ad_code" = #{attResBase.adCode})
            </if>
        </where>
            b."check_state" = #{attResBase.tbState}
            )
        </if>
        <if test="attResBase.adCode != null and attResBase.adCode != '' ">
            and (aab."ad_code" = #{attResBase.adCode} or aa."ad_code" = #{attResBase.adCode} or ab."ad_code" =
            #{attResBase.adCode} or ac."ad_code" = #{attResBase.adCode})
        </if>
    </select>
    <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
@@ -64,20 +64,21 @@
        left join "SJZT_MD"."att_ad_base" ab on ab."p_ad_code" = aa."ad_code"
        left join "SJZT_MD"."att_ad_base" ac on ac."p_ad_code" = ab."ad_code"
        left join "SJZT_MD"."att_ad_base" ad on ad."p_ad_code" = ac."ad_code"
        <where>
            <if test="vo.name !=null and vo.name !=''">
                AND a."name" LIKE CONCAT('%',#{vo.name},'%')
        where 1 = 1
        <if test="vo.name !=null and vo.name !=''">
            AND a."name" LIKE CONCAT('%',#{vo.name},'%')
        </if>
        <if test="vo.tbState != null and vo.tbState !=''">
            AND (
            <if test="vo.tbState == -1">
                b."check_state" IS NULL OR
            </if>
            <if test="vo.tbState !=null and vo.tbState !='' and vo.tbState == -1">
                AND (b."check_state" is null or b."check_state" = #{vo.tbState})
            </if>
            <if test="vo.tbState !=null and vo.tbState !='' and vo.tbState != -1">
                AND b."check_state" = #{vo.tbState}
            </if>
            <if test="vo.adCode != null and vo.adCode != '' ">
                and (aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" =
                #{vo.adCode} or ad."ad_code" = #{vo.adCode})
            </if>
        </where>
            b."check_state" = #{vo.tbState}
            )
        </if>
        <if test="vo.adCode != null and vo.adCode != '' ">
            and (aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" =
            #{vo.adCode} or ad."ad_code" = #{vo.adCode})
        </if>
    </select>
</mapper>