From ba3e3f9528ae5352ac4ecebbbfb2e08ecdbc039d Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Sat, 10 Oct 2026 15:47:48 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E9=87=8D=E7=82=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/CimDashboardOverviewVo.java | 9 +++++ ...mDashboardOverviewDataSumSserviceImpl.java | 2 + .../CimDashboardOverviewMapper.xml | 37 ++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java index 1d30a7a0..970fdcc8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java @@ -337,4 +337,13 @@ public class CimDashboardOverviewVo { private Long qyzshb; + /** + * 区 + */ + private String district; + + /** + * 街道 + */ + private String street; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index f5453959..447000f6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -894,6 +894,8 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve entity.setEnterpriseNumber(vo.getEnterpriseNumber()); entity.setEnterpriseAddress(vo.getEnterpriseAddress()); entity.setXzzfzs(vo.getXzzfs()); + entity.setDistrict(vo.getDistrict()); + entity.setStreet(vo.getStreet()); entity.setIsDelete("0"); entList.add(entity); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml index 5ad5f7ff..f255efdc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml @@ -1529,7 +1529,42 @@ t2.enterprise_number as enterpriseNumber, t2.enterprise_name as enterpriseName, t1.enterprise_address as enterpriseAddress, - t2.xzzfs + t2.xzzfs, + CASE + WHEN t1.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t1.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + WHEN t1.enterprise_address REGEXP '^深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REPLACE(REGEXP_SUBSTR(t1.enterprise_address, '深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'),'深圳市', '') + WHEN t1.enterprise_address REGEXP '市.+?(区|县)' + THEN REGEXP_REPLACE(t1.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1') + ELSE NULL + END AS district, + + CASE + + WHEN t1.enterprise_address REGEXP '^(深圳市)?(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(SUBSTRING(t1.enterprise_address, LOCATE( + + CASE + WHEN t1.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t1.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + ELSE REPLACE(REGEXP_SUBSTR(t1.enterprise_address,'深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'), '深圳市', '') + END, + t1.enterprise_address + ) + + + CHAR_LENGTH( + CASE + WHEN t1.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t1.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + ELSE REPLACE(REGEXP_SUBSTR(t1.enterprise_address,'深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'), '深圳市', '') + END)), '[0-9一-龥]+街道') + + WHEN t1.enterprise_address REGEXP '市.+?(区|县)' + THEN REGEXP_SUBSTR(SUBSTRING(t1.enterprise_address,LOCATE(REGEXP_REPLACE(t1.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1'),t1.enterprise_address) + + CHAR_LENGTH(REGEXP_REPLACE(t1.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1'))),'[0-9一-龥]+(街道|镇)') + ELSE NULL + END AS street from enterprise_information t1 inner join (