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,7 +19,7 @@ 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> where 1 = 1 <if test="attResBase.tbYear !=null and attResBase.tbYear !=''"> AND b."tb_year" = #{attResBase.tbYear} </if> @@ -35,17 +35,18 @@ <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 test="attResBase.tbState != null and attResBase.tbState !=''"> AND ( <if test="attResBase.tbState == -1"> b."check_state" IS NULL OR </if> <if test="attResBase.tbState !=null and attResBase.tbState !='' and attResBase.tbState != -1"> AND b."check_state" = #{attResBase.tbState} 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> </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> 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 vo.tbState == -1"> AND (b."check_state" is null or b."check_state" = #{vo.tbState}) <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" = #{vo.tbState} 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> </select> </mapper>