skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -34,7 +34,17 @@ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER LEFT JOIN BLADE_DICT_BIZ BDB ON BDB.DICT_KEY = R.TYPE AND BDB.CODE = 'MANAGE_PROTECT_TYPE' left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid" left join SJZT_MD."att_ad_base" aa on aab."p_ad_code" = aa."ad_code" 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" WHERE R.IS_DELETED = 0 <if test="record.adCode != null and record.adCode != '' "> and (aab."ad_code" = #{record.adCode} or aa."ad_code" = #{record.adCode} or ab."ad_code" = #{record.adCode} or ac."ad_code" = #{record.adCode}) </if> <if test="record.reservoirName != null and record.reservoirName !=''"> AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%') </if> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
@@ -11,4 +11,9 @@ private String reportUser; private String typeLabel; /** * 行政区划 */ private String adCode; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
@@ -24,7 +24,16 @@ SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_SCHEDULING_RECORD R LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid" left join SJZT_MD."att_ad_base" aa on aab."p_ad_code" = aa."ad_code" 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" WHERE R.IS_DELETED = 0 <if test="record.adCode != null and record.adCode != '' "> and (aab."ad_code" = #{record.adCode} or aa."ad_code" = #{record.adCode} or ab."ad_code" = #{record.adCode} or ac."ad_code" = #{record.adCode}) </if> <if test="record.reservoirName != null and record.reservoirName !=''"> AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%') </if> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/vo/SchedulingRecordVO.java
@@ -11,4 +11,9 @@ * 上报人 */ private String reportUser; /** * 行政区划 */ private String adCode; }