全版本提交 以防切换验证版本导致代码丢失

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -32,11 +32,11 @@ public class IdCardCryptoUtil {
         String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
         System.out.println("====================== 示例 ======================");
         // 加密
-        String source_dec = "19925235717";
+        String source_dec = "13714472486";
         String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
         System.out.println(source_dec+" 加密后 : "+enc);
         // 解密
-        String source_enc = "LRMP+aj4E91RjfadXf1GbQ==";
+        String source_enc = "p1Xr9AdPUrpxzaHKlQO/3w==";
         String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc);
         System.out.println(source_enc+" 解密后 : "+dec);
 
@@ -48,9 +48,15 @@ public class IdCardCryptoUtil {
 //        System.out.println(phone);
 //        System.out.println(sfz);
 
+
         System.out.println("====================== 实用 ======================");
         String[] strings={
-            "13631554532", "13692276207"
+                "12345678900",
+                "18118783355",
+                "18822818175",
+                "17722547325",
+                "15999816541",
+                "13927423641",
         };
 //        String string="";
         for(String s:strings){

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java

@@ -50,9 +50,9 @@ public final class JasyptUtils {
     }
     public static void main(String[] args) {
          //加密
-         String s = encryptWithMD5("0460493a4493a06d4e4bf20df7495b36b019b311312b4fe305450a4bfd9cb8e5cba00ef71698f67cfc68247c4f43c7b71d0ec9d18b9d8f0b68ac048d8af563c8f8eff55a02f28cf524af9ff82b0e9d3e59bf750b3a1bb38b6dbb3f2075600b941aaa68317d882622734ed068bcb1b2e496b05991dcfc31169934a0805ef7abcf7371daff66ea", "ATPfOhpnAVp6yBas7RU");
+         String s = encryptWithMD5("szsf@zfjd", "ATPfOhpnAVp6yBas7RU");
          System.out.println(s);
-        String channelcs1 = decryptWithMD5(s, "ATPfOhpnAVp6yBas7RU");
+        String channelcs1 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU");
         System.out.println(channelcs1);
     }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -407,6 +407,10 @@ public class AppEnforcementRegistrationController extends BaseController
     @ResponseBody
     public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration)
     {
+        String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
+        String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
+        enforcementRegistration.setDistrict(district);
+        enforcementRegistration.setStreet(street);
         return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0
                 ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
     }
@@ -445,6 +449,10 @@ public class AppEnforcementRegistrationController extends BaseController
     {
         int resNum = 0;
         enforcementRegistration.setIsSubmit(1);
+        String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
+        String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
+        enforcementRegistration.setDistrict(district);
+        enforcementRegistration.setStreet(street);
         if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
             resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
         } else {
@@ -467,6 +475,10 @@ public class AppEnforcementRegistrationController extends BaseController
     public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration)
     {
         enforcementRegistration.setIsSubmit(0);
+        String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
+        String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
+        enforcementRegistration.setDistrict(district);
+        enforcementRegistration.setStreet(street);
         int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
         if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
             EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
@@ -902,4 +914,15 @@ public class AppEnforcementRegistrationController extends BaseController
         rspData.setTotal(count);
         return rspData;
     }
+
+    private static String extract(String text, String regex) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
+        java.util.regex.Matcher matcher = pattern.matcher(text);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return "";
+    }
 }
+
+

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppNonEnforcementRegistrationController.java

@@ -56,6 +56,10 @@ public class AppNonEnforcementRegistrationController extends BaseController
     @ResponseBody
     public ZDResponse addSave(@RequestBody NonEnforcementRegistration enforcementRegistration)
     {
+        String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
+        String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
+        enforcementRegistration.setDistrict(district);
+        enforcementRegistration.setStreet(street);
         return enforcementRegistrationService.insertNonEnforcementRegistration(enforcementRegistration) > 0
                 ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
     }
@@ -87,4 +91,13 @@ public class AppNonEnforcementRegistrationController extends BaseController
         NonEnforcementRegistration registrations = enforcementRegistrationService.selectNonEnforcementRegistrationById(id);
         return ZDResponse.success("操作成功", registrations);
     }
+
+    private static String extract(String text, String regex) {
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
+        java.util.regex.Matcher matcher = pattern.matcher(text);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return "";
+    }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -163,17 +163,17 @@ public class AppThirdLoginController {
 //            return thirdLoginService.szyLogin(user.getLoginName());
             return thirdLoginService.szyLogin2(user);
         } catch (Exception e) {
-            List<User> us = iUserService.selectUserByLoginNameD("cr17608416852");
-            user = null!=us && us.size()>0 ? us.get(0) : null;
-            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user);
-            return thirdLoginService.szyLogin2(user);
-//            log.error("---> 市认证用户信息: {}", userJson);
-//            log.error("---> 本系统用户信息: {}", user);
-//            log.error(e.getMessage());
-//            e.printStackTrace();
+//            List<User> us = iUserService.selectUserByLoginNameD("cr17608416852");
+//            user = null!=us && us.size()>0 ? us.get(0) : null;
+//            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user);
+//            return thirdLoginService.szyLogin2(user);
+            log.error("---> 市认证用户信息: {}", userJson);
+            log.error("---> 本系统用户信息: {}", user);
+            log.error(e.getMessage());
+            e.printStackTrace();
         }
 
-//        return ZDResponse.success();
+        return ZDResponse.success();
     }
 
     /**

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlFilter.java

@@ -37,6 +37,7 @@ public class XssAndSqlFilter implements Filter {
             //获取请求你ip后的全部路径
             String uri = req.getRequestURI();
             if (uri.indexOf("/system/notice/") >= 0
+                || uri.indexOf("/app/code/registration/") >= 0
                 || uri.indexOf("/app/enterpriseInformation/getEnterpriseInfoBySj") >= 0) {
                 chain.doFilter(request, response);
                 return;

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/PasswordService.java

@@ -82,7 +82,7 @@ public class PasswordService {
     }
 
     public static void main(String[] args) {
-//        System.out.println(new PasswordService().encryptPassword("admin", "admin@123", "f5647d"));
-        System.out.println(new PasswordService().encryptPassword("chenr", "szsf@12#$", "123456"));
+        System.out.println(new PasswordService().encryptPassword("admin", "szsf@zfjd", "f5647d"));
+        System.out.println(new PasswordService().encryptPassword("gmAdmin", "szsf@zfjd", "1dfee6"));
     }
 }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml

@@ -6,9 +6,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: ENC(v3oHIZvpj5ZRTcLc41PnMXUVZbXK7dp+IKwsOlJ2bRUf5E5bagEjlB3qNwT7KiAnX3+ugTUeKWt1cVPh1iVLlQE1ELVNILu6k0X4/uH9ao53b4pLlyJsim67HozUikmKDQ/wDMxVUSkBW21g6jcKeEzXgSphxUQvPz/L8KJzzHJvkpDarGwYUZH+sV1VnSkHCHpPqW9wkbD/AN8K+iNiLw==)
-        username: ENC(E5mY10bkGFBgN1Pljgzggg==)
-        password: ENC(oqD1IasQS57qOeOHFtBdAAemGwJ2I7BV)
+        url: ENC(jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==)
+        username: ENC(1rDSoCn95lOAhX0J5nVklg==)
+        password: ENC(AQ64D6wCVRGllbBj0o6yd4NSrZLYj+4M)
+#        url: ENC(v3oHIZvpj5ZRTcLc41PnMXUVZbXK7dp+IKwsOlJ2bRUf5E5bagEjlB3qNwT7KiAnX3+ugTUeKWt1cVPh1iVLlQE1ELVNILu6k0X4/uH9ao53b4pLlyJsim67HozUikmKDQ/wDMxVUSkBW21g6jcKeEzXgSphxUQvPz/L8KJzzHJvkpDarGwYUZH+sV1VnSkHCHpPqW9wkbD/AN8K+iNiLw==)
+#        username: ENC(E5mY10bkGFBgN1Pljgzggg==)
+#        password: ENC(oqD1IasQS57qOeOHFtBdAAemGwJ2I7BV)
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-pro.yml

@@ -75,7 +75,16 @@ srnwg:
   #市认证数据加密字符
   secretKey: ENC(xWBA5VwT23j14A8+6I15HCerJvo3zaRxzVE2xc0i7wZ7wq/SCflOEkHCc8wwdi0KHkDGjKIoHhs=)
 
+# 测试环境
+#mssq:
+#  appId: ENC(iYSWCYHguGJTOxTcUjFcq4Tkp0HpU/7UqmxGtda3ORKF7a5UZiz612YlxZ9I4zL+)
+#  appKey: ENC(m81tKAp6NtfW/97e3NNfnfq/1TN79M9JL9UY82dhKPxWJkedAuRJPNDBULZDv4ue5vFXcAHDGtWMsH6flq06B7MdjoYGrDc7)
+#  apiUrl: ENC(2fR5TkUb/A0p4+Gp/As+LJsVCjq7pgNwJIG2OAk2yWLXY/q7DNaCDQ==)
+#  hcpappid: zfjdm
+#  hcpsign: ENC(SZL+KT860YpMBuK6GbNWTp0TYVeSu/DTYjKPRCm5xVJk9tI+O6/hqsE5zH9orApgjX6ggAS2hbGefmUsJwIkos0YtIgueK89ilDHtEy6/S0RWrnoi6F9aByxVG/mAwPxTPIXxwUECjvuET1rByTi7juNbufzWzJfYrH4dFXLmzbF5Cv5jJHM8R7Rq6DGL9X9UCqmROJygXv9KvrxN3OcnVoTHb0wQepEq6kplkd3SswLnPSDpb7q5vcs1XMxYcFRDLyqjmQYVRcx3HMsQZOGkTahOdzIfI/tL4D4upgYK1TFpaCiBL98vX/bh/s9RPmiHkyqMd8/R/NnoB8q5/5LldqxBhPCBi6RbPFGM/UfojdXeS5z2Uk/2w==)
+#  hcptimestamp: 20240710172956
 
+# 正式环境(民生诉求那边说还没上生产, 让我们别提, 但是我测流程又是通的)
 mssq:
   appId: 30cd632d18c24bc2b476535494327987
   appKey: MzBjZDYzMmQxOGMyNGJjMmI0NzY1MzU0OTQzMjc5ODc6U3pzejIwMjQ=

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/styles/analysis.css

@@ -0,0 +1,805 @@
+@charset "utf-8";
+
+/* CSS Document */
+
+
+
+
+
+
+
+
+
+
+
+
+
+* {
+	margin: 0;
+	padding: 0;
+	font-family: 'Microsoft Yahei', Arial, Verdana, sans-serif;
+}
+
+html {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+}
+
+body {
+	height: 100%;
+	width: 100%;
+	color: #4c4c4c;
+	font-size: 14px;
+}
+
+.wrap_all {
+	width: 100%;
+	height: 100%;
+	background: url(../images/bg_body.jpg) no-repeat;
+	background-size: cover;
+	box-sizing: border-box;
+	overflow: hidden;
+}
+
+.select_set {
+	display: flex;
+	margin: 0.5% 0.5% 0.6%;
+	padding-left: 30px;
+	background: url(../images/icon_scr.png) no-repeat left;
+	background-size: auto 100%;
+}
+
+.select_item {
+	margin: 0 0 0 5px;
+	font-size: 1.2rem;
+	white-space: nowrap;
+}
+
+.select_item > label {
+	position: relative;
+	display: inline-block;
+	margin: 0 5px 0 0;
+	padding: 0 25px 0 10px;
+	height: 28px;
+	line-height: 28px;
+	color: #315EFB;
+	font-weight: 500;
+	background: rgba(59, 145, 253, 0.12);
+	letter-spacing: 0;
+	text-align: center;
+	border-radius: 6px;
+	cursor: pointer;
+}
+
+.select_item > label > a {
+	display: inline-block;
+	position: absolute;
+	right: 0;
+	width: 18px;
+	height: 100%;
+}
+
+.select_item > label > a::after {
+	position: absolute;
+	right: 0;
+	width: 18px;
+	height: 18px;
+	content: "\f105";
+	color: #678dfe;
+	font-family: "FontAwesome";
+	font-size: 1.25rem;
+}
+
+.select_item > label.active > a::after {
+	position: absolute;
+	top: 0.45rem;
+	right: -0.2rem;
+	transform: rotate(90deg);
+}
+
+.fold_cont {
+	display: none;
+	position: absolute;
+	top: 3rem;
+	left: 2%;
+	z-index: 100;
+	padding: 0.5rem 1rem 1rem 0.5rem;
+	min-width: 10rem;
+	background: rgba(255, 255, 255, .9);
+	border-radius: 0.5rem;
+	box-shadow: 0 0 0.5rem #b1c9d7;
+}
+
+.fold_cont dd {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	padding: 0 0 0 2rem;
+	font-size: 1.0rem;
+	line-height: 2;
+}
+
+.fold_cont dd::before {
+	position: absolute;
+	top: 0;
+	left: 0.5rem;
+	width: 1.5rem;
+	content: "\f096";
+	color: rgba(0, 0, 0, .4);
+	font-size: 1.1rem;
+	font-family: "FontAwesome";
+}
+
+.fold_cont dd.selchk::before {
+	content: "\f046";
+	color: #315efb;
+}
+
+.fold_cont > dd > i {
+	width: 2rem;
+	height: 2rem;
+	color: #999;
+	font-size: 1.15rem;
+	line-height: 1.75;
+	text-align: center;
+	cursor: pointer;
+}
+
+.selnext {
+	position: relative;
+	width: calc(100% - 2rem);
+	color: #fff;
+}
+
+.selnext::after {
+	position: absolute;
+	top: 0;
+	left: -5%;
+	z-index: -1;
+	width: calc(100% + 1.5rem);
+	height: 100%;
+	background: #437afb;
+	content: "";
+}
+
+.fold_cont > dd.selnext > i, .fold_cont dd.selnext::before {
+	color: #fff;
+}
+
+.data_cont {
+	display: flex;
+	margin: 0.5%;
+	width: calc(99% - 2px);
+	border-radius: 10px;
+	box-shadow: 0 0 10px #ddd;
+	background: #fff url(../images/bg_data_item.jpg) no-repeat;
+	border: 1px solid rgba(126, 195, 241, .8);
+}
+
+.data_item {
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	flex-wrap: nowrap;
+	justify-content: space-around;
+	margin: 0.5% 0.5% 0.5% 1.5%;
+	width: 22%;
+	height: 100%;
+}
+
+.data_item::after {
+	position: absolute;
+	top: 0;
+	right: 0;
+	content: "";
+	width: 1px;
+	height: 90%;
+	background: linear-gradient(to bottom, transparent 15%, #e1dede 50%, transparent 100%);
+}
+
+.data_item:last-child::after {
+	background: none;
+}
+
+.cont-title {
+	margin: 2% 0;
+	color: #666;
+	font-size: 0.9rem;
+	font-weight: 550;
+	white-space: nowrap;
+}
+
+.panel-card-bottom .cont-title {
+	margin: 2% 0;
+	color: #333;
+	font-size: 1.6rem;
+	font-weight: 550;
+}
+
+.cont-total {
+	display: flex;
+	align-items: center;
+	margin: 0 0 1%;
+	color: #999;
+	font-size: 1.25rem;
+}
+
+.cont-total b {
+	margin-right: 1rem;
+	color: #ff8400;
+	font-size: 2.5rem;
+	font-weight: 500;
+	line-height: 1.5;
+}
+
+.percent-tag {
+	display: flex;
+	align-items: center;
+	margin: 1% 3% 0 0;
+	white-space: nowrap;
+}
+
+.percent-tag span {
+	margin: 0;
+	color: #333;
+	font-size: 1.0rem;
+	line-height: 1;
+}
+
+.percent-tag span.data-rise, .percent-tag span.data-fall {
+	margin: 0.75% 2% 1% 0.5%;
+	color: #67dc53;
+	font-size: 1.0rem;
+}
+
+.percent-tag span.data-fall {
+	color: #fd7c7c;
+}
+
+.percent-tag label {
+	margin: 0 2% 0 1%;
+	color: #999;
+	font-size: 0.75rem;
+}
+
+.nece-data .percent-tag span {
+	margin: 0 0 0 5%;
+	color: #4767fe;
+	font-size: 1.25rem;
+	font-weight: 500;
+	line-height: 1.25;
+}
+
+.echarts_box {
+	position: relative;
+	width: 100%;
+	height: calc(85% - 3.75rem);
+	overflow: hidden;
+}
+
+.inner {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	margin-bottom: 2%;
+	height: 98%;
+	overflow-x: hidden;
+	overflow-y: scroll;
+}
+
+.onebox {
+	flex-wrap: wrap;
+	margin: 0.5% 0.5% 0.5%;
+	padding: 0.75% 1% 0.25%;
+	width: 99%;
+	height: 18rem;
+	background: #fff none;
+	border: 0;
+	box-sizing: border-box;
+}
+
+.twobox {
+	margin: 0.25% 0.5% 0;
+	padding: 0;
+	width: 99%;
+	min-height: 18rem;
+	border: 0;
+	box-sizing: border-box;
+}
+
+.echarts_mult {
+	display: flex;
+	flex-wrap: wrap;
+	margin: 0.75% 0.5% 1%;
+	padding-bottom: 5rem;
+	width: 99%;/*height: calc(100% - 25rem);*/
+}
+
+.chart_div {
+	float: left;
+	margin: 0 0 1% 1%;
+	width: 32.25%;
+	height: 32.25%;
+}
+
+.chart_tit {
+	width: 100%;
+	height: 1.5rem;
+	font-size: 1.0rem;
+	line-height: 1.5;
+}
+
+.chart_box {
+	margin: 0 1%;
+	width: 98%;
+	height: calc(100% - 2rem);
+}
+
+.threebox {
+	position: relative;
+	flex-wrap: wrap;
+	float: left;
+	margin: 0.5% 1.23% 0.85% 0;
+	padding: 0.75% 1% 0.25%;
+	width: 32.51%;
+	height: 18rem;
+	background: #fff none;
+	border: 0;
+	box-sizing: border-box;
+}
+
+.threebox:nth-child(3n) {
+	margin-right: 0;
+}
+
+.twobox .threebox {
+	height: 25rem;
+}
+
+.twobox .threebox:first-child {
+	width: 66.25%;
+}
+
+.twobox .threebox:last-child {
+	margin-right: 0;
+}
+
+.halfbox .threebox, .halfbox .threebox:first-child {
+	width: 49.385%;
+	height: 18rem;
+}
+
+.sel_rank {
+	position: absolute;
+	top: 12px;
+	right: 20px;
+}
+
+.sel_rank select {
+	height: 26px;
+	border: 1px solid #ccc;
+	border-radius: 3px;
+}
+
+.count_wrap {
+	display: flex;
+	flex-wrap: wrap;
+	margin: -2% 0 0 0;
+	width: 100%;
+}
+
+.count_item {
+	float: left;
+	position: relative;
+	margin: -0.5% 0.5% 0.5% 0.5%;
+	width: 19%;
+	height: 9.25rem;
+	background: url(../images/bg_analy_card.jpg) no-repeat;
+	background-size: cover;
+	border-radius: 10px;
+	font-size: 1rem;
+	text-align: center;
+}
+
+.count_item .count_lab {
+	display: inline-flex;
+	margin: 5.5% 5% 3%;
+	width: 90%;
+	color: #666;
+	font-size: 0.9rem;
+	text-align: left;
+}
+
+.count_div {
+	display: flex;
+}
+
+.count_div img {
+	display: inline-block;
+	margin: 2% 2% 5%;
+	width: 36%;
+}
+
+.count_div .count_cont {
+	margin: 0 1% 0 -5%;
+	width: 62%;
+}
+
+.number_count {
+	display: block;
+	color: #4767fe;
+	font-size: 2.15rem;
+	font-weight: 500;
+	line-height: 2;
+}
+
+.number_percent {
+	color: #666;
+	font-size: 1rem;
+}
+
+.number_percent > i {
+	margin-left: 2%;
+	color: #999;
+	font-size: 0.8rem;
+}
+
+.com_cate {
+	margin-top: -6.5%;
+}
+
+.com_cate h3.chart_tit {
+	margin-bottom: 0.5rem;
+}
+
+.com_cate .number_count {
+	color: #f73b3b;
+}
+
+.com_cate .count_item {
+	margin: -1% 0.5% 0 1.5%;
+	width: 48%;
+	background: url(../images/bg_analy_card_2.jpg) no-repeat;
+	background-size: cover;
+}
+
+.com_cate .count_lab {
+	margin: 4.5% 5% 3%;
+}
+
+.com_cate .count_div img {
+	display: inline-block;
+	margin: 2% 2% 5% 5%;
+	width: 30%;
+}
+
+.key_area {
+	justify-content: space-evenly;
+	background: url(../images/bg_ring.png) no-repeat center center;
+	background-size: cover;
+}
+
+.key_area .count_item {
+	background: url(../images/bg_base.png) no-repeat center bottom;
+	background-size: 96% auto;
+}
+
+.count_review {
+	/* float: left; */
+	width: 96%;
+	height: 90%;
+}
+
+.count_com {
+	display: flex;
+	align-items: center;
+	width: 100%;
+}
+
+.count_com h4 {
+	padding-top: 6.75rem;
+	width: 35%;
+	height: 10rem;
+	background: url(../images/icon_com.png) no-repeat center;
+	background-size: auto 100%;
+	box-sizing: border-box;
+	text-align: center;
+}
+
+.count_list {
+	width: 75%;
+}
+
+.count_row {
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	margin: 3% 3%;
+	font-size: 1rem;
+}
+
+.count_list .count_row:first-child {
+	margin: 3% 3% 5%;
+}
+
+.count_row > span {
+	width: 30%;
+	font-weight: 550;
+}
+
+.count_row span:nth-child(1) {
+	width: 40%;
+	font-weight: 500;
+}
+
+.count_row span.percent_ym {
+	font-weight: normal;
+}
+
+.percent_ym .percent-tag {
+	margin: 1% 3% 5% 0;
+}
+
+.percent_ym .percent-tag label {
+	margin: 0 8% 0 1%;
+}
+
+.count_rev {
+	margin-top: 2%;
+}
+
+.count_rev h4 {
+	background: url(../images/icon_rev.png) no-repeat center;
+	background-size: auto 100%;
+}
+
+.count_rev .count_row:first-child {
+	margin: 3% 3%;
+}
+
+.popbox {
+	display: none;
+	position: absolute;
+	z-index: 999;
+	top: 3rem;
+	left: 250px;
+	zoom: 1;
+	width: 60%;
+	height: 70%;
+	background: rgba(255, 255, 255, .9);
+	border-radius: 0.5rem;
+	box-shadow: 0 0 0.5rem #b1c9d7;
+	/*transform: translateY(-50%);*/
+	overflow: hidden;
+}
+
+.poptit {
+	padding: 0 80px 0 20px;
+	height: 42px;
+	background: #F8F8F8;
+	color: #333;
+	font-size: 16px;
+	line-height: 42px;
+	border: none;
+}
+
+.closet {
+	position: absolute;
+	top: 1%;
+	right: 1%;
+	width: 30px;
+	height: 30px;
+	/*background-color: #fff;*/
+	color: #999;
+	cursor: pointer;
+	font-size: 24px;
+	font-family: sans-serif;
+	/*border-radius: 50%;
+    box-shadow: 0 0 5px #999;*/
+	text-align: center;
+	line-height: 25px;
+}
+
+.box_content {
+	width: 100%;
+	height: calc(100% - 50px);
+	background-color: #ffffff;
+	color: inherit;
+	padding: 15px 20px 10px 20px;
+	border-color: #e7eaec;
+	-webkit-border-image: none;
+	-o-border-image: none;
+	border-image: none;
+	border-style: solid solid none;
+	border-width: 1px 0px;
+	box-sizing: border-box;
+	overflow-x: hidden;
+}
+
+.tablist {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+}
+
+.tabtit {
+	display: flex;
+	margin: 0 0 1% 0;
+	width: 100%;
+	border-bottom: 1px solid #f0f1f2;
+}
+
+.tabtit > span {
+	display: inline-block;
+	margin: 1% 3.5% 0 0;
+	min-width: 4.5%;
+	height: 1.75rem;
+	line-height: 1.75;
+	color: rgba(0, 0, 0, 0.4);
+	font-size: 1.1rem;
+	font-weight: 600;
+	text-align: center;
+	white-space: nowrap;
+	cursor: pointer;
+}
+
+.tabtit > span.active {
+	border-bottom: 3px solid rgba(12, 94, 249, 1);
+	color: rgb(12, 94, 249);
+}
+
+.tabcont {
+	display: none;
+	width: 100%;
+	height: calc(100% - 50px);
+	overflow: auto;
+}
+
+.selcont a.selitem {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	margin: 2% 1% 0;
+	padding: 0 0 0 2rem;
+	font-size: 1.0rem;
+	line-height: 2;
+}
+
+.selcont a.selitem::before {
+	position: absolute;
+	top: 0;
+	left: 0.5rem;
+	width: 1.5rem;
+	content: "\f096";
+	color: rgba(0, 0, 0, .4);
+	font-size: 1.1rem;
+	font-family: "FontAwesome";
+}
+
+.selcont a.selitem.active.selected::before {
+	content: "\f046";
+	color: #315efb;
+}
+
+.deptcont {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.deptcont a.selitem {
+	width: 20%;
+}
+
+.percent-tag span.percent-single {
+	color: #666;
+	font-size: 1.25rem;
+	line-height: 2;
+}
+
+.link_btn {
+	position: absolute;
+	top: 0;
+	right: 0;
+	margin: 0.5% 2% 0;
+	height: 2rem;
+	font-size: 1.2rem;
+	line-height: 2;
+	white-space: nowrap;
+}
+
+.link_btn a {
+	position: relative;
+	margin: 3% 3%;
+	padding-left: 2rem;
+	color: #666;
+	font-size: 1.0rem;
+	opacity: .8;
+	text-decoration: none;
+}
+
+.link_btn a:hover {
+	opacity: 1;
+}
+
+.link_btn a::before {
+	position: absolute;
+	left: 0;
+	top: -2px;
+	content: "";
+	width: 1.75rem;
+	height: 1.75rem;
+	background: url(../images/icon_dept32.png) no-repeat;
+	background-size: 100% auto;
+}
+
+.link_btn a:last-child::before {
+	background: url(../images/icon_dist32.png) no-repeat;
+	background-size: 100% auto;
+}
+
+.link_btn a::after {
+	position: absolute;
+	top: -0.5rem;
+	right: -1.1rem;
+	content: "\f105";
+	color: #1ab5e0;
+	font-family: "FontAwesome";
+	font-size: 1.25rem;
+	opacity: .75;
+}
+
+.cont_total .count_row {
+	justify-content: flex-start;
+}
+
+.cont_total .count_row:first-child {
+	margin: 3% 3% 5% 2%;
+}
+
+.cont_total .count_row span, .cont_total .count_row span:nth-child(1) {
+	margin: 1% 2%;
+	width: auto;
+}
+
+.cont_total .count_row span.percent_ym {
+	display: flex;
+	justify-content: space-around;
+	width: 35%;
+}
+
+.cont_total .count_row span.percent_ym .percent-tag {
+	margin: 1% 3% 1% 0;
+}
+
+.count_num {
+	color: #fa6666;
+	font-size: 1.5rem;
+}
+
+.chart_ring {
+	background: #fff url(../images/bg_shadow.png) no-repeat center;
+	background-position-y: 90%;
+}
+
+
+
+/** 滚动条样式 **/
+::-webkit-scrollbar-track {
+ background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 10px;
+ background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+ border-radius: 6px;
+ background-color: #ccc;
+}

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/city-direct.html

@@ -0,0 +1,598 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>市直综合分析--执法监督码</title>
+  <link type="text/css" rel="stylesheet" href="/statistical-new/font-awesome/css/font-awesome.min.css" />
+  <link type="text/css" rel="stylesheet" href="/statistical-new/styles/analysis.css" />
+  <script type="text/javascript" src="/statistical-new/scripts/jquery-3.3.1.min.js"></script>
+  <script type="text/javascript" src="/statistical-new/scripts/echarts.min.js"></script>
+  <script type="text/javascript" src="/ajax/libs/layer/layer.min.js"></script>
+  <script type="text/javascript" src="/ajax/libs/layui/layui.js"></script>
+  <script type="text/javascript" src="/ajax/libs/datapicker/bootstrap-datetimepicker.min.js"></script>
+</head>
+
+<body>
+<div class="wrap_all">
+  <div class="select_set">
+    <div class="select_item">
+      <label class="select_area">各市直<a></a></label>
+      <dl class="fold_cont" id="depts" style="height: 85%; overflow: auto;"></dl>
+    </div>
+    <div class="select_item">
+      <label class="select_time">时间筛选<a id="timeSelect"></a></label>
+      <span>综合数据</span>
+    </div>
+  </div>
+  <div class="link_btn"><a href="" style="display: none;">各市直执法部门综合分析</a> <a href="">各区执法综合分析</a></div>
+  <div class="data_cont">
+    <div class="data_item">
+      <div class="cont-title">单独执法数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">联合执法数量</div>
+      <div class="cont-total"><b><span id="joint-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">被执法企业数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">入企压减率</div>
+      <div class="cont-total"><b><span id="notice-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag"> <span class="percent-single">11.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">涉企投诉数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">企业数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+  </div>
+  <div class="echarts_box">
+    <div class="inner">
+      <div class="twobox">
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">行政执法类别及占比</h3>
+          <div class="count_wrap">
+            <div class="count_item">
+              <div class="count_lab">行政检查</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_801.png" alt="行政检查" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政处罚</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_802.png" alt="行政处罚" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政许可</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_803.png" alt="行政许可" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政强制</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_804.png" alt="行政强制" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政征收</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_805.png" alt="行政征收" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政给付</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_806.png" alt="行政给付" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政确认</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_807.png" alt="行政确认" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政登记</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_808.png" alt="行政登记" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">行政裁决</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_809.png" alt="行政裁决" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">文书送达</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_8010.png" alt="文书送达" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">行政执法投诉类别及占比</h3>
+          <div class="count_wrap com_cate">
+            <div class="count_item">
+              <div class="count_lab">违规执法</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_1001.png" alt="违法执法" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">违法执法</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_1002.png" alt="违规执法" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">入企不扫码</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_1004.png" alt="入企不扫码" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">其他</div>
+              <div class="count_div"> <img src="/statistical-new/images/icon_1003.png" alt="其他" />
+                <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="twobox">
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">重点领域类别及占比</h3>
+          <div class="count_wrap key_area">
+            <div class="count_item">
+              <div class="count_lab">市场监督管理</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">规划和自然资源</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">生态环境</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">交通运输</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">卫生健康</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">应急管理</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">住房和建设</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">消防救援</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+            <div class="count_item">
+              <div class="count_lab">公安</div>
+              <div class="count_cont"> <span class="number_count">1,024</span><span class="number_percent">42.68<i>%</i></span></div>
+            </div>
+          </div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">行政执法投诉评价</h3>
+          <div class="count_review">
+            <div class="count_com">
+              <h4>投诉</h4>
+              <div class="count_list">
+                <div class="count_row"><span>投诉总量</span><span>135</span><span class="percent_ym">
+                  <div class="percent-tag">
+                    <label id="">同比</label>
+                    <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+                  <div class="percent-tag">
+                    <label id="">环比</label>
+                    <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+                  </span></div>
+                <div class="count_row"><span>已办结</span><span>135</span><span>1.35%</span></div>
+                <div class="count_row"><span>未办结</span><span>135</span><span>1.35%</span></div>
+              </div>
+            </div>
+            <div class="count_com count_rev">
+              <h4>评价</h4>
+              <div class="count_list">
+                <div class="count_row"><span>满意</span><span>135</span><span>1.35%</span></div>
+                <div class="count_row"><span>较满意</span><span>135</span><span>1.35%</span></div>
+                <div class="count_row"><span>不满意</span><span>135</span><span>1.35%</span></div>
+                <div class="count_row"><span>未评价</span><span>135</span><span>1.35%</span></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="echarts_mult">
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">被执法企业次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankCommpany"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">执法单位执法数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankInspect"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">被投诉单位次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankComplaint"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">入企压减率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankReduction"></div>
+        </div>
+        <div class="data_cont threebox single_dept" style="display: none;">
+          <h3 class="chart_tit">联合执法单位数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankUnite"></div>
+        </div>
+        <div class="data_cont threebox single_dept" style="display: none;">
+          <h3 class="chart_tit">执法人员涉企执法数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankOfficer"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerNumber"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerUse"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权休眠率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerSleep"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权被投诉次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerComplaint"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用率</h3>
+          <div class="chart_box" id="powerUseRate"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!--<script type="text/javascript" src="/statistical-new/scripts/charts-rank.js"></script>-->
+<script>
+
+  var ctx="/"
+  var deptSize = 0;
+
+  layui.use('laydate',function(){
+    var laydate = layui.laydate;
+    laydate.render({
+      elem: "#timeSelect",// 指定元素
+      range: true, // 开启范围选择
+      format: 'yyyy-MM-dd', // 日期格式
+      min: '2019-04-14', // 最小可选日期
+      max: '2099-06-16', // 最大可选日期
+      trigger: 'click', // 选择器触发方式，可选值：click, hover等
+      done: function(value, date, endDate){ // 选择日期后的回调函数
+        //选择了清空
+        if (value ===''){
+          changeDate(null,null);
+        }
+        //选择了确定
+        if (value !==null && value !==''){
+          var month1 = 10 > date.month?"0"+date.month:date.month
+          var date1 = 10 > date.date?"0"+date.date:date.date
+          let beginTime = date.year+"-"+month1+"-"+date1
+
+          var month2 = 10 > endDate.month?"0"+endDate.month:endDate.month
+          var date2 = 10 > endDate.date?"0"+endDate.date:endDate.date
+          let endTime = endDate.year+"-"+month2+"-"+date2
+          changeDate(beginTime,endTime);
+        }
+      }
+    })
+  });
+
+  function changeDate(time1, time2) {
+    beginTime = time1;
+    endTime = time2;
+    console.log(beginTime +' - '+ endTime);
+    // sixIndicators(beginTime,endTime,deptId);
+    // checkCategory(beginTime,endTime,deptId);
+    // evaluateCategory(beginTime,endTime,deptId);
+    // complaintCategory(beginTime,endTime,deptId);
+    // enforceType(beginTime,endTime,deptId);
+    // if (null == deptName) deptName = "全市直<a></a>"
+    // $("#dept_flag").html(deptName+"<a></a>")
+  }
+
+  $(function(){
+    getDeptLength();
+  });
+
+  /** 获取部门长度 */
+  function getDeptLength() {
+    $.ajax({
+      url: ctx + "code/statisticalPanel/queryDeptLength",
+      type: "get",
+      data: {zone: 1},
+      success: function (result) {
+        deptSize = result.data;
+        queryDept();
+      }
+    });
+  }
+
+  /** 获取市直列表 */
+  function queryDept() {
+    $.ajax({
+      url: ctx + "code/statisticalPanel/queryDept",
+      type: "post",
+      data: JSON.stringify({"zoneList": [1, 15, 16]}),
+      dataType: 'json',
+      contentType: "application/json",
+      success: function(res) {
+        if(res.success) {
+          const datas = res.data;
+          var html = '';
+          if(datas.length === deptSize) {
+            if (datas.length === 0){
+              html += '<dd class="check_label" onclick="changeArea(-1, \'无权限\')">无权限</dd>';
+              //html += '<dd class="check_label" onclick="changeArea(null, \'全市直\')">全市直</dd>';
+              $("#dept_flag").html('无权限')
+              deptId = -1; deptName='无权限';
+              changeArea(-1, '无权限')
+            }else {
+              html += '<dd class="check_label" onclick="changeArea(null, \'全市直\')">全市直</dd>';
+              $("#dept_flag").html('全市直')
+              deptId = null; deptName='全市直';
+              changeArea(null, '全市直')
+            }
+          } else {
+            $("#dept_flag").html(datas[0].deptName)
+            deptId = datas[0].deptId; deptName= datas[0].deptName;
+            changeArea(datas[0].deptId, datas[0].deptName)
+          }
+          for(var i=0; i<datas.length; i++) {
+            html += '<dd class="check_label" onclick="changeArea(\''+datas[i].deptId+'\',\''+datas[i].deptName+'\')">'+datas[i].deptName+'</dd>'
+          }
+          $("#depts").html(html);
+
+          $('.fold_cont dd:first').addClass('selchk');//给第一个dd追加
+          //each遍历元素
+          $(".fold_cont dd").each(function () {
+            $(this).click(function () {   //点击事件
+              //当点击自身的时候添加，及删除同级的
+              $(this).addClass('selchk').siblings().removeClass('selchk')
+            })
+          });
+        }
+      },
+      error: function (error) {
+        $.modal.alertWarning("获取分析数据失败。");
+      }
+    });
+  }
+
+  function changeArea(id, name) {
+    deptId = id;
+    deptName = name;
+    // sixIndicators(beginTime,endTime,deptId);
+    // checkCategory(beginTime,endTime,deptId);
+    // evaluateCategory(beginTime,endTime,deptId);
+    // complaintCategory(beginTime,endTime,deptId);
+    // enforceType(beginTime,endTime,deptId);
+    if (null == deptName) deptName = "全市直<a></a>"
+    $("#dept_flag").html(deptName+"<a></a>")
+  }
+	
+// $('.fold_cont dd:first').addClass('selchk');//给第一个dd追加
+// //each遍历元素
+// $(".fold_cont dd").each(function () {
+//     $(this).click(function () {   //点击事件
+//     	//当点击自身的时候添加，及删除同级的
+//         $(this).addClass('selchk').siblings().removeClass('selchk')
+//     })
+// });
+//
+//
+//
+//
+// /**********数据子项折叠************/
+//
+//   $(".select_item > label").each(function(i) {
+//       var ame = $(this);
+//       ame.attr("flag", "1");
+//       ame.on("click", {idx: i, a: ame}, function(e) {
+//         var aobj = e.data.a;
+//         var aflag = aobj.attr("flag");
+//         var foldCoutArray = $(".fold_cont");
+//         foldCoutArray.hide();
+//         if (aflag == "1") {
+//           foldCoutArray.eq(e.data.idx).show();
+//           aobj.attr("flag", "0");
+//           $(this).addClass("active")
+//         } else {
+//           aobj.attr("flag", "1");
+//           $(this).removeClass("active")
+//         }
+//
+//       })
+//   });
+//
+//
+// /**********综合/单一主体切换 显示/隐藏排行图表间距************/
+//
+// 	if($(".multiple_dept").css("display")=="block")
+// 	{ $(".single_dept").css("display","none");
+// 		$(".threebox:nth-child(8),.threebox:nth-child(11)").css("margin-right","0");
+// 		$(".threebox:nth-child(9),.threebox:nth-child(10)").css("margin-right","1.23%");
+// 	}
+//
+// 	else {
+// 		$(".threebox:nth-child(8),.threebox:nth-child(10)").css("margin-right","1.23%");
+// 		$(".threebox:nth-child(9)").css("margin-right","0");
+// 	}
+
+	
+</script>
+</body>
+</html>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html

@@ -0,0 +1,394 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>各区综合分析--执法监督码</title>
+<link type="text/css" rel="stylesheet" href="/statistical-new/font-awesome/css/font-awesome.min.css" />
+<link type="text/css" rel="stylesheet" href="/statistical-new/styles/analysis.css" />
+<script type="text/javascript" src="/statistical-new/scripts/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="/statistical-new/scripts/echarts.min.js"></script>
+  <script type="text/javascript" src="/ajax/libs/layer/layer.min.js"></script>
+  <script type="text/javascript" src="/ajax/libs/layui/layui.js"></script>
+  <script type="text/javascript" src="/ajax/libs/datapicker/bootstrap-datetimepicker.min.js"></script>
+</head>
+
+<body>
+<div class="wrap_all">
+  <div class="select_set">
+    <div class="select_item">
+      <label class="select_area">各区<a></a></label>
+      <dl class="fold_cont" style="height: 85%; overflow: auto;">
+        <dd class="check_label" onclick="">深圳市司法局</dd>
+        <dd class="check_label" onclick="">深圳市发展和改革委员会</dd>
+        <dd class="check_label" onclick="">深圳市教育局</dd>
+        <dd class="check_label" onclick="">深圳市科技创新局</dd>
+        <dd class="check_label" onclick="">深圳市工业和信息化局</dd>
+        <dd class="check_label" onclick="">深圳市公安局</dd>
+        <dd class="check_label" onclick="">深圳市民政局</dd>
+        <dd class="check_label" onclick="">深圳市财政局</dd>
+        <dd class="check_label" onclick="">深圳市人力资源和社会保障局</dd>
+        <dd class="check_label" onclick="">深圳市规划和自然资源局</dd>
+      </dl>
+    </div>
+    <div class="select_item">
+      <label class="select_time">时间筛选<a id="timeSelect"></a></label>
+      <span>综合数据</span>
+    </div>
+  </div>
+  <div class="link_btn"><a href="">各市直执法部门综合分析</a> <a href="" style="display: none;">各区执法综合分析</a></div>
+  <div class="data_cont">
+    <div class="data_item">
+      <div class="cont-title">单独执法数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">联合执法数量</div>
+      <div class="cont-total"><b><span id="joint-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">被执法企业数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">入企压减率</div>
+      <div class="cont-total"><b><span id="notice-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag"> <span class="percent-single">11.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">涉企投诉数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+    <div class="data_item">
+      <div class="cont-title">企业数量</div>
+      <div class="cont-total"><b><span id="regis-total">6,457</span></b>
+        <div class="nece-data">
+          <div class="percent-tag">
+            <label id="">昨日</label>
+            <span class="data-change" id="">105</span> </div>
+          <div class="percent-tag">
+            <label id="">本月</label>
+            <span class="data-change" id="">1902</span> </div>
+        </div>
+      </div>
+      <div class="percent-tag">
+        <label id="">同比</label>
+        <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+      <div class="percent-tag">
+        <label id="">环比</label>
+        <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+    </div>
+  </div>
+  <div class="echarts_box">
+    <div class="inner">
+      <div class="data_cont onebox">
+        <h3 class="chart_tit">各区综合数据</h3>
+        <div class="chart_box" id="countDistrict" style="top: -8%;"></div>
+      </div>
+      <div class="twobox halfbox">
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">行政执法投诉</h3>
+          <div class="count_list cont_total">
+            <div class="count_row"><span>投诉总量</span><span class="count_num">437</span><span class="percent_ym">
+              <div class="percent-tag">
+                <label id="">同比</label>
+                <span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id="" style="display: none;"><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+              <div class="percent-tag">
+                <label id="">环比</label>
+                <span class="data-rise" id="" style="display: none;"><i class="fa fa fa-long-arrow-up"></i></span> <span class="data-fall" id=""><i class="fa fa fa-long-arrow-down"></i></span> <span class="data-change" id="">1.13%</span> </div>
+              </span></div>
+          </div>
+          <div class="chart_box" id="complaintHandling" style="margin-top: -10%; height: 70%;"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">行政执法评价</h3>
+          <div class="chart_box" id="evaluateRate"></div>
+        </div>
+      </div>
+      <div class="echarts_mult">
+        <div class="data_cont threebox chart_ring">
+          <h3 class="chart_tit">执法类别数量及占比</h3>
+          <div class="chart_box" id="countInspect"></div>
+        </div>
+        <div class="data_cont threebox chart_ring">
+          <h3 class="chart_tit">重点领域数量及占比</h3>
+          <div class="chart_box" id="countCommpany"></div>
+        </div>
+        <div class="data_cont threebox chart_ring">
+          <h3 class="chart_tit">投诉类别数量及占比</h3>
+          <div class="chart_box" id="countComplaint"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">被执法企业次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankCommpany"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">执法单位执法数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankInspect"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">被投诉单位次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankComplaint"></div>
+        </div>
+        <div class="data_cont threebox multiple_dept" style="display: block;">
+          <h3 class="chart_tit">入企压减率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankReduction"></div>
+        </div>
+        <div class="data_cont threebox single_dept" style="display: none;">
+          <h3 class="chart_tit">联合执法单位数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankUnite"></div>
+        </div>
+        <div class="data_cont threebox single_dept" style="display: none;">
+          <h3 class="chart_tit">执法人员涉企执法数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="rankOfficer"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用数量排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerNumber"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerUse"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权休眠率排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerSleep"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权被投诉次数排行</h3>
+          <span class="sel_rank">
+          <select name="">
+            <option>TOP 10</option>
+            <option>TOP 5</option>
+          </select>
+          </span>
+          <div class="chart_box" id="powerComplaint"></div>
+        </div>
+        <div class="data_cont threebox">
+          <h3 class="chart_tit">职权使用率</h3>
+          <div class="chart_box" id="powerUseRate"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript" src="/statistical-new/scripts/charts-rank.js"></script>
+<script>
+
+  layui.use('laydate',function(){
+    var laydate = layui.laydate;
+    laydate.render({
+      elem: "#timeSelect",// 指定元素
+      range: true, // 开启范围选择
+      format: 'yyyy-MM-dd', // 日期格式
+      min: '2019-04-14', // 最小可选日期
+      max: '2099-06-16', // 最大可选日期
+      trigger: 'click', // 选择器触发方式，可选值：click, hover等
+      done: function(value, date, endDate){ // 选择日期后的回调函数
+        //选择了清空
+        if (value ===''){
+          changeDate(null,null);
+        }
+        //选择了确定
+        if (value !==null && value !==''){
+          var month1 = 10 > date.month?"0"+date.month:date.month
+          var date1 = 10 > date.date?"0"+date.date:date.date
+          let beginTime = date.year+"-"+month1+"-"+date1
+
+          var month2 = 10 > endDate.month?"0"+endDate.month:endDate.month
+          var date2 = 10 > endDate.date?"0"+endDate.date:endDate.date
+          let endTime = endDate.year+"-"+month2+"-"+date2
+          changeDate(beginTime,endTime);
+        }
+      }
+    })
+  });
+
+  function changeDate(time1, time2) {
+    beginTime = time1;
+    endTime = time2;
+    console.log(beginTime +' - '+ endTime);
+    // sixIndicators(beginTime,endTime,deptId);
+    // checkCategory(beginTime,endTime,deptId);
+    // evaluateCategory(beginTime,endTime,deptId);
+    // complaintCategory(beginTime,endTime,deptId);
+    // enforceType(beginTime,endTime,deptId);
+    // if (null == deptName) deptName = "全市直<a></a>"
+    // $("#dept_flag").html(deptName+"<a></a>")
+  }
+	
+// $('.fold_cont dd:first').addClass('selchk');//给第一个dd追加
+// //each遍历元素
+// $(".fold_cont dd").each(function () {
+//     $(this).click(function () {   //点击事件
+//     	//当点击自身的时候添加，及删除同级的
+//         $(this).addClass('selchk').siblings().removeClass('selchk')
+//     })
+// });
+//
+//
+//
+//
+// /**********数据子项折叠************/
+//
+//   $(".select_item > label").each(function(i) {
+//       var ame = $(this);
+//       ame.attr("flag", "1");
+//       ame.on("click", {idx: i, a: ame}, function(e) {
+//         var aobj = e.data.a;
+//         var aflag = aobj.attr("flag");
+//         var foldCoutArray = $(".fold_cont");
+//         foldCoutArray.hide();
+//         if (aflag == "1") {
+//           foldCoutArray.eq(e.data.idx).show();
+//           aobj.attr("flag", "0");
+//           $(this).addClass("active")
+//         } else {
+//           aobj.attr("flag", "1");
+//           $(this).removeClass("active")
+//         }
+//
+//       })
+//   });
+//
+//
+// /**********综合/单一主体切换 显示/隐藏排行图表间距************/
+//
+// 	if($(".multiple_dept").css("display")=="block")
+// 	{ $(".single_dept").css("display","none");
+// 		$(".threebox:nth-child(8),.threebox:nth-child(11),.threebox:nth-child(14)").css("margin-right","0");
+// 		$(".threebox:nth-child(9),.threebox:nth-child(12)").css("margin-right","1.23%");
+// 	}
+//
+// 	else {
+// 		$(".threebox:nth-child(8),.threebox:nth-child(10)").css("margin-right","1.23%");
+// 		$(".threebox:nth-child(9),.threebox:nth-child(12)").css("margin-right","0");
+// 	}
+
+	
+</script>
+</body>
+</html>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html

@@ -126,7 +126,8 @@
         <input type="text" class="layui-input" id="timeSelect" placeholder="时间筛选" />
       </div>
     </div>
-    <div class="link_btn"> <a href="/code/statisticalPanel/single-analysis" id="leftFlag">各市直执法单位综合分析</a> <a href="/code/statisticalPanel/overall-analysis"><span id="rightFlag">各区综合分析</span></a> </div>
+<!--    <div class="link_btn"> <a href="/code/statisticalPanel/single-analysis" id="leftFlag">各市直执法单位综合分析</a> <a href="/code/statisticalPanel/overall-analysis"><span id="rightFlag">各区综合分析</span></a> </div>-->
+    <div class="link_btn"> <a href="/code/statisticalPanelNew/city-direct" id="leftFlag">各市直执法单位综合分析</a> <a href="/code/statisticalPanelNew/district-direct"><span id="rightFlag">各区综合分析</span></a> </div>
     <div class="count_box">
       <div class="count_item admin">
         <div class="count_tit">
@@ -195,7 +196,7 @@
   var rightAct = false;
 
   $(function(){
-    changeDate();
+    // changeDate();
   });
 
   function changeDate(time1, time2) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java

@@ -122,6 +122,17 @@ public class StatisticalPanelController extends BaseController {
         return "project/code/statistical/home";
     }
 
+    @GetMapping("/city-direct")
+    public String cityDirect(Model model)
+    {
+        return "project/code/statistical-new/city-direct";
+    }
+    @GetMapping("/district-direct")
+    public String districtDirect(Model model)
+    {
+        return "project/code/statistical-new/district-direct";
+    }
+
 
     /**
      * 综合分析查询全市全区最顶部企业同环比数据

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelNewController.java

@@ -0,0 +1,50 @@
+package com.zdxt.code.controller;
+
+import com.zdxt.auth.dto.DeptBean;
+import com.zdxt.auth.dto.DictDataBean;
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.DeptApi;
+import com.zdxt.auth.feign.DictDataApi;
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.project.system.dict.service.IDictDataService;
+import com.zdxt.code.domain.SixAnalysisParams;
+import com.zdxt.code.domain.StatisticsIndicatorPart;
+import com.zdxt.code.domain.dto.StatisticalPanelDto;
+import com.zdxt.code.service.StatisticalPaneService;
+import com.zdxt.common.ZDResponse;
+import com.zdxt.common.controller.BaseController;
+import com.zdxt.domain.auth.DictData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 综合统计
+ */
+@Controller
+@RequestMapping("/code/statisticalPanelNew")
+public class StatisticalPanelNewController extends BaseController {
+
+    @Autowired
+    private StatisticalPaneService statisticalPaneService;
+
+    @Autowired private IDictDataService iDictDataService;
+    @Autowired private DeptApi deptApi;
+    @Autowired private UserApi userApi;
+    @Autowired
+    private DictDataApi dictDataApi;
+
+    /*------------------------------------------综合分析-新版--------------------------------*/
+    @GetMapping("/city-direct")
+    public String cityDirect(Model model) { return "project/code/statistical-new/city-direct"; }
+    @GetMapping("/district-direct")
+    public String districtDirect(Model model) { return "project/code/statistical-new/district-direct"; }
+
+}
+

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -36,6 +36,13 @@ public class EnforcementRegistration extends BaseDomain
     /** 被执法企业税号 */
     private String enterpriseNumber;
 
+    /** 企业注册地址 */
+    private String enterpriseAddress;
+    /** 区 */
+    private String district;
+    /** 街道 */
+    private String street;
+
     /** 执法时间 */
     private Date enforcementTime;
 
@@ -170,7 +177,6 @@ public class EnforcementRegistration extends BaseDomain
     /** 临时用 */
     private String qy;
     private String jd;
-    private String enterpriseAddress;
     private String lawCertificateNum;
     private String lawCertificateNumText;
     private String lawCertificateNumTwoText;
@@ -204,6 +210,21 @@ public class EnforcementRegistration extends BaseDomain
      */
     private Integer warnType;
 
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
 
     public String getDeptQx() {
         return deptQx;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java

@@ -25,6 +25,10 @@ public class NonEnforcementRegistration extends BaseDomain
     private String enterpriseNumber;
     /** 企业注册地址 */
     private String enterpriseAddress;
+    /** 区 */
+    private String district;
+    /** 街道 */
+    private String street;
 
     /** 执法时间 */
     private Date enforcementTime;
@@ -83,11 +87,6 @@ public class NonEnforcementRegistration extends BaseDomain
      */
     private String area;
 
-    /**
-     * 街道
-     */
-    private String street;
-
     /**
      * 查询条件
      */
@@ -124,6 +123,14 @@ public class NonEnforcementRegistration extends BaseDomain
      */
     private String searchValue;
 
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
     @Override
     public String getSearchValue() {
         return searchValue;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -206,7 +206,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     }
 
     @Override
-    @DataScope
+//    @DataScope
+    @DataScope(deptField = "bureau_dept_id")
     public List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> enforcementRegistrations =
@@ -1241,3 +1242,4 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         return result;
     }
 }
+

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java

@@ -427,8 +427,10 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             e.printStackTrace();
         }
         //作废之前的二维码数据
+        if (null != qrCodeGenerateHistory1) {
             qrCodeGenerateHistory1.setStatus(1);
             iQrCodeGenerateHistoryService.updateQrCodeGenerateHistory(qrCodeGenerateHistory1);
+        }
         //重新生成二维码
         QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory();
         qrCodeGenerateHistory.setId(uuid);
@@ -492,8 +494,10 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             e.printStackTrace();
         }
         //作废之前的二维码数据
+        if (null != qrCodeGenerateHistory1) {
             qrCodeGenerateHistory1.setStatus(1);
             iQrCodeGenerateHistoryService.updateQrCodeGenerateHistory(qrCodeGenerateHistory1);
+        }
         //重新生成二维码
         QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory();
         qrCodeGenerateHistory.setId(uuid);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java

@@ -15,6 +15,7 @@ import com.zdxt.auth.project.system.dict.service.IDictDataService;
 import com.zdxt.code.domain.NonEnforcementRegistration;
 import com.zdxt.code.mapper.NonEnforcementRegistrationMapper;
 import com.zdxt.code.service.INonEnforcementRegistrationService;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.CommonUtil;
 import com.zdxt.common.util.Convert;
 import com.zdxt.common.util.DateUtils;
@@ -208,6 +209,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
     }
 
     @Override
+    @DataScope(deptAlias = "n",userAlias = "n",deptField = "bureau_dept_id")
     public List<NonEnforcementRegistration> getList(NonEnforcementRegistration param) {
         List<NonEnforcementRegistration> list=nonEnforcementRegistrationMapper.getList(param);
         if(list.size()==0)return list;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml

@@ -43,8 +43,6 @@
     <select id="primarySectionA" parameterType="ComprehensiveAnalysis" resultMap="ComprehensiveAnalysisResult">
         select r.check_category,r.law_enforce_category, e.company_org_type,r.enterprise_number,r.enterprise_name,e.enterprise_address,r.bureau_dept_id,r.bureau_dept_name
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number) e
-        on r.enterprise_number = e.enterprise_number
         <where>
             and r.enterprise_number is not null
             and r.check_category is not null
@@ -55,11 +53,11 @@
             </if>
             <if test="bureauDeptId != null and bureauDeptId != '' ">and r.bureau_dept_id=#{bureauDeptId}</if>
             <if test="qy != null  and qy != ''">
-                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
-                e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
+                r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
-                    and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
-                    e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+                    and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
+                    r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="dateType != null and dateType != '' and dateType == 'year' ">
@@ -80,7 +78,7 @@
         </where>
     </select>
     <select id="huanSectionA" parameterType="ComprehensiveAnalysis" resultMap="ComprehensiveAnalysisResult">
-        select r.check_category, e.company_org_type,e.enterprise_address
+        select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
         left join (select * from enterprise_information group by enterprise_number) e
         on r.enterprise_number = e.enterprise_number
@@ -93,11 +91,11 @@
             </if>
             <if test="bureauDeptId != null and bureauDeptId != '' ">and r.bureau_dept_id=#{bureauDeptId}</if>
             <if test="qy != null  and qy != ''">
-                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
-                e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
+                r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
-                    and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
-                    e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+                    and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
+                    r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="dateType != null and dateType != '' and dateType == 'year' ">
@@ -118,7 +116,7 @@
         </where>
     </select>
     <select id="tongSectionA" parameterType="ComprehensiveAnalysis" resultMap="ComprehensiveAnalysisResult">
-        select r.check_category, e.company_org_type,e.enterprise_address
+        select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
         left join (select * from enterprise_information group by enterprise_number) e
         on r.enterprise_number = e.enterprise_number
@@ -131,11 +129,11 @@
             </if>
             <if test="bureauDeptId != null and bureauDeptId != '' ">and r.bureau_dept_id=#{bureauDeptId}</if>
             <if test="qy != null  and qy != ''">
-                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
-                e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
+                r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
-                    and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
-                    e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+                    and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
+                    r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="dateType != null and dateType != '' and dateType == 'year' ">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -55,6 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lawEnforceCategory"    column="law_enforce_category"    />
         <result property="entrustDeptId"    column="entrust_dept_id"    />
         <result property="entrustDeptName"    column="entrust_dept_name"    />
+        <result property="enterpriseAddress"    column="enterprise_address"    />
+        <result property="district"    column="district"    />
+        <result property="street"    column="street"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -73,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          law_enforcement_basis, law_enforcement_basis_text, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,
          is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category,
          bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, has_union, has_auto, union_no,
-            law_enforce_category,entrust_dept_id,entrust_dept_name
+            law_enforce_category,entrust_dept_id,entrust_dept_name, enterprise_address, district, street
          from enforcement_registration
     </sql>
 
@@ -352,6 +355,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--                &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
 <!--                ${params.dataScope}-->
 <!--            </if>-->
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY enterprise_number order by enforcement_time desc) t
         <where>
@@ -367,6 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--          <if test="deptId != null and warnType!=null and warnType ==0" >-->
 <!--            and t.bureau_dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors)-->
 <!--          </if>-->
+            <!-- 数据范围过滤 -->
        </where>
        order by t.num desc
     </select>
@@ -515,10 +523,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
-        select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
+        select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,r.enterprise_address,r.law_enforcement_item_text,r.unite_check,
         r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time,r.law_enforce_category
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
         <where>
             and r.bureau_dept_name is not null
             and r.law_enforcement_id is not null
@@ -531,9 +538,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and r.bureau_dept_id is not null
             and is_submit=1
             <if test="qy != null  and qy != ''">
-                and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
-                    and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+                    and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="deptQx != null  and deptQx != ''">and r.bureau_dept_id =#{deptQx}</if>
@@ -691,6 +698,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id,</if>
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address,</if>
+            <if test="district != null  and district != ''">district,</if>
+            <if test="street != null  and street != ''">street,</if>
             <if test="enforcementTime != null ">enforcement_time,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
@@ -741,6 +751,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null  and enterpriseId != ''">#{enterpriseId},</if>
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">#{enterpriseAddress},</if>
+            <if test="district != null  and district != ''">#{district},</if>
+            <if test="street != null  and street != ''">#{street},</if>
             <if test="enforcementTime != null ">#{enforcementTime},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
@@ -794,6 +807,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null  and enterpriseId != ''">enterprise_id = #{enterpriseId},</if>
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number = #{enterpriseNumber},</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address = #{enterpriseAddress},</if>
+            <if test="district != null  and district != ''">district = #{district},</if>
+            <if test="street != null  and street != ''">street = #{street},</if>
             <if test="enforcementTime != null ">enforcement_time = #{enforcementTime},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
@@ -1007,9 +1023,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and r.bureau_dept_id is not null
             and r.is_submit=1
             <if test="qy != null  and qy != ''">
-                and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
-                    and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+                    and (r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or r.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="enterpriseName != null and enterpriseName != ''">
@@ -1219,9 +1235,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by bureau_dept_id
     </select>
     <select id="selectUniteNotItself" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
-        select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
+        select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,r.enterprise_address,r.law_enforcement_item_text,r.unite_check,
         r.check_category,r.check_css,r.is_complaint,r.create_time from enforcement_registration r
-        left join enterprise_information i on r.enterprise_number=i.enterprise_number
         <where>
             <if test="uniteCheck != null and uniteCheck != ''">
                 and r.unite_check=#{uniteCheck}
@@ -1231,7 +1246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and r.id !=#{id}
             </if>
         </where>
-        order by i.enterprise_address
+        order by r.enterprise_address
     </select>
 
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml

@@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="enterpriseAddress"    column="enterprise_address"    />
+        <result property="district"    column="district"    />
+        <result property="street"    column="street"    />
     </resultMap>
 
     <sql id="selectNonEnforcementRegistrationVo">
@@ -45,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                law_enforcer_id_other, law_enforcement_type, law_enforcement_type_text, law_enforcement_item,
                law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, status,
                has_delete, has_complaint, has_submit, has_evaluate, law_id, law_text, bureau_dept_id, bureau_dept_name,
-               creditcode, user_id, dept_id, create_by, update_by, create_time, update_time,enterprise_address
+               creditcode, user_id, dept_id, create_by, update_by, create_time, update_time, enterprise_address, district, street
         from non_enforcement_registration
     </sql>
 
@@ -127,7 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             n.law_enforcement_type_text,
             n.law_enforcement_item_text,
             n.law_enforcement_basis_text,
-            n.enterprise_address
+            n.enterprise_address,
+            n.district,
+            n.street
         FROM
             non_enforcement_registration n
             <choose>
@@ -188,6 +192,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endTime != null and endTime != '' ">
             and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') <![CDATA[<=]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
         </if>
+        <!-- 数据范围过滤 -->
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
         order by n.enforcement_time desc
     </select>
 
@@ -198,6 +207,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address,</if>
+            <if test="district != null  and district != ''">district,</if>
+            <if test="street != null  and street != ''">street,</if>
             <if test="enforcementTime != null ">enforcement_time,</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer,</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id,</if>
@@ -233,6 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">#{enterpriseAddress},</if>
+            <if test="district != null  and district != ''">#{district},</if>
+            <if test="street != null  and street != ''">#{street},</if>
             <if test="enforcementTime != null ">#{enforcementTime},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">#{lawEnforcer},</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''">#{lawEnforcerId},</if>