cim-重点企业新增区街道

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;
 }

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);
             }

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,
+            <!-- ========== street 街道/镇 ==========-->
+            CASE
+                 <!--深圳地址-->
+                WHEN t1.enterprise_address REGEXP '^(深圳市)?(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'
+                THEN REGEXP_SUBSTR(SUBSTRING(t1.enterprise_address, LOCATE(
+                <!--先算出区名字符串（不包CHAR_LENGTH）-->
+                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，算区名占几个字符-->
+                + 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 (