zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev-V1.0.5' into dev-V1.0.5 

# Conflicts:
#	zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
dev-V1.0.5
vincent 1 month ago
parent
910cebd75a ac82894d47
commit
4d5d0194d0
1 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml

48
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
View File

@ -46,15 +46,15 @@
<if test="bo.isComplaint != null">
AND is_complaint = #{bo.isComplaint}
</if>
<if test='bo.enforce != null and bo.enforce == "0"'>
AND check_css is null
<if test="bo.enforce != null and bo.enforce == '0'">}
AND enforce_reason is null
</if>
<if test='bo.enforce != null and bo.enforce == "1"'>
AND check_css is not null
<if test="bo.enforce != null and bo.enforce == '1'">
AND enforce_reason is not null
</if>
<if test="bo.checkCss != null and bo.checkCss != ''">
AND check_css = #{bo.checkCss}
</if>
<!-- <if test="bo.checkCss != null and bo.checkCss != ''">-->
<!-- AND check_css = #{bo.checkCss}-->
<!-- </if>-->
<if test="bo.district != null and bo.district != ''">
AND (enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%')
OR enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%'))
@ -172,15 +172,15 @@
<if test="bo.isComplaint != null">
AND r2.is_complaint = #{bo.isComplaint}
</if>
<if test='bo.enforce != null and bo.enforce == "0"'>
<if test="bo.enforce != null and bo.enforce == '0'">}
AND r2.check_css is null
</if>
<if test='bo.enforce != null and bo.enforce == "1"'>
<if test="bo.enforce != null and bo.enforce == '1'">
AND r2.check_css is not null
</if>
<!-- <if test="bo.checkCss != null and bo.checkCss != ''">-->
<!-- AND r2.check_css = #{bo.checkCss}-->
<!-- </if>-->
<if test="bo.checkCss != null and bo.checkCss != ''">
AND r2.check_css = #{bo.checkCss}
</if>
<if test="bo.district != null and bo.district != ''">
AND (r2.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%')
OR r2.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%'))
@ -271,15 +271,15 @@
<if test="bo.isComplaint != null">
AND r.is_complaint = #{bo.isComplaint}
</if>
<if test='bo.enforce != null and bo.enforce == "0"'>
AND r.check_css is null
<if test="bo.enforce != null and bo.enforce == '0'">}
AND r.enforce_reason is null
</if>
<if test='bo.enforce != null and bo.enforce == "1"'>
AND r.check_css is not null
<if test="bo.enforce != null and bo.enforce == '1'">
AND r.enforce_reason is not null
</if>
<if test="bo.checkCss != null and bo.checkCss != ''">
AND r.check_css = #{bo.checkCss}
</if>
<!-- <if test="bo.checkCss != null and bo.checkCss != ''">-->
<!-- AND r.check_css = #{bo.checkCss}-->
<!-- </if>-->
<if test="bo.district != null and bo.district != ''">
AND (r.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%')
OR r.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%'))
@ -420,15 +420,15 @@
<if test="bo.isComplaint != null">
AND er.is_complaint = #{bo.isComplaint}
</if>
<if test='bo.enforce != null and bo.enforce == "0"'>
<if test="bo.enforce != null and bo.enforce == '0'">
AND er.check_css is null
</if>
<if test='bo.enforce != null and bo.enforce == "1"'>
<if test="bo.enforce != null and bo.enforce == '1'">
AND er.check_css is not null
</if>
<!-- <if test="bo.checkCss != null and bo.checkCss != ''">-->
<!-- AND er.check_css = #{bo.checkCss}-->
<!-- </if>-->
<if test="bo.checkCss != null and bo.checkCss != ''">
AND er.check_css = #{bo.checkCss}
</if>
<if test="bo.district != null and bo.district != ''">
AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%')
OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%'))

Write Preview
Loading…
Cancel
Save