Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -526,17 +526,19 @@ public class JGDPStatisticsServiceImpl {
         return countDto;
     }
 
-    private CountDto getYellowStatusCompany(DPFilterParamDto dpFilterParamDto) {
+
+
+    private CountDto getRedStatusCompany(DPFilterParamDto dpFilterParamDto) {
         CountDto countDto = new CountDto();
         countDto.setLongValue(this.countCompanyForCertDateTimeOut(dpFilterParamDto));
-        countDto.setLabel("资质临期");
+        countDto.setLabel("许可超期");
         return countDto;
     }
 
-    private CountDto getRedStatusCompany(DPFilterParamDto dpFilterParamDto) {
+    private CountDto getYellowStatusCompany(DPFilterParamDto dpFilterParamDto) {
         CountDto countDto = new CountDto();
         countDto.setLongValue(this.countCompanyForCertDateTemporary(dpFilterParamDto));
-        countDto.setLabel("资质超期");
+        countDto.setLabel("许可临期");
         return countDto;
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -240,21 +240,22 @@ public class StCommonServiceImpl {
         result.put(DPMapStatisticsItemEnum.PRESSURE_PIPELINES.getCode(), length);
     }
 
-
-    public CountDto getYellowStatusCompany(DPFilterParamDto dpFilterParamDto) {
+    public CountDto getRedStatusCompany(DPFilterParamDto dpFilterParamDto) {
         CountDto countDto = new CountDto();
         countDto.setLongValue(this.countCompanyForCertDateTimeOut(dpFilterParamDto));
-        countDto.setLabel("资质临期");
+        countDto.setLabel("许可超期");
         return countDto;
     }
 
-    public CountDto getRedStatusCompany(DPFilterParamDto dpFilterParamDto) {
+    public CountDto getYellowStatusCompany(DPFilterParamDto dpFilterParamDto) {
         CountDto countDto = new CountDto();
         countDto.setLongValue(this.countCompanyForCertDateTemporary(dpFilterParamDto));
-        countDto.setLabel("资质超期");
+        countDto.setLabel("许可临期");
         return countDto;
     }
 
+
+
     private long countCompanyForCertDateTemporary(DPFilterParamDto dpFilterParamDto) {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 临期6个月

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -602,7 +602,7 @@ public class ZLDPStatisticsServiceImpl {
             JSONObject jsonObject11 = new JSONObject();
             jsonObject11.put("key", "zzcq");
             jsonObject11.put("value", orgCode == null ? 0L: stCommonService.getRedStatusCompany(params).getLongValue());
-            jsonObject11.put("name", "资质超期");
+            jsonObject11.put("name", "许可超期");
 
             jsonArray.add(jsonObject0);
             jsonArray.add(jsonObject1);