Merge branch 'dev-V1.0.8' into dev

script/sql/vincent/V1.0.8.0_20260921.sql

@@ -0,0 +1,8 @@
+ALTER TABLE `dashboard_enterprise_check`
+    ADD COLUMN `no_xzzfzs` int DEFAULT NULL COMMENT '非行政执法总数' AFTER `xzzfzs`,
+ADD COLUMN `district` varchar(64) DEFAULT NULL COMMENT '区' AFTER `no_xzzfzs`,
+ADD COLUMN `street` varchar(64) DEFAULT NULL COMMENT '街道' AFTER `district`;
+
+ALTER TABLE enterprise_user ADD COLUMN `siq_user_id` varchar(64)  DEFAULT NULL COMMENT '深i企用户ID' AFTER `password`;
+
+

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java

@@ -280,6 +280,25 @@ public class CimDashboardOverviewVo {
      */
     private Long month;
 
+    /**
+     * 执法人员数
+     */
+    private Long zfrys;
+
+    /**
+     * 执法单位数
+     */
+    private Long zfdws;
+
+    /**
+     * 风险信用预警
+     */
+    private Long fxxyyj;
+
+    /**
+     * 高频检查预警
+     */
+    private Long gpjcyj;
 
 
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml

@@ -947,7 +947,7 @@
             FROM  sxt_jcdzb107522 t
             <where>
                 <if test="monthTime !=null">
-                    and DATE_FORMAT(t1.INSPECTION_END_DATE,'%Y-%m')= DATE_FORMAT(#{monthTime},'%Y-%m')
+                    and DATE_FORMAT(t.INSPECTION_END_DATE,'%Y-%m')= DATE_FORMAT(#{monthTime},'%Y-%m')
                 </if>
             </where>
         ) t1