监督端-企业注销字段修改

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

@@ -41,8 +41,8 @@ public class StatisticsEnterpriseController extends BaseController {
     public String statisticsEnterprise(Model model) {
         LocalDate localDate = LocalDate.now();
         List<EnterpriseInformation> enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
-        List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-        List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+        List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+        List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
         //model.addAttribute("yearList", yearMake());
         model.addAttribute("number", enterpriseInformationList.size());//企业总数
         model.addAttribute("exist", existList.size());//续存数量
@@ -93,8 +93,8 @@ public class StatisticsEnterpriseController extends BaseController {
             model.addAttribute("qyJd", "全市");
             }
         List<EnterpriseInformation> enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation);
-        List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-        List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+        List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+        List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
         model.addAttribute("number", enterpriseInformationList.size());//企业总数
         model.addAttribute("exist", existList.size());//续存数量
         model.addAttribute("logout", logoutList.size());//注销数量

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

@@ -580,8 +580,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             StatisticsIndicator s = new StatisticsIndicator();
             System.out.println(qy.substring(0, qy.indexOf("区")));
             List<EnterpriseInformation> qyList = enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "区") || item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "新区")).collect(Collectors.toList());
-            List<EnterpriseInformation> existList = qyList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-            List<EnterpriseInformation> logoutList = qyList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+            List<EnterpriseInformation> existList = qyList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+            List<EnterpriseInformation> logoutList = qyList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
             s.setName(qy);
             s.setTotalNumber(qyList.size());
             s.setNumInt(existList.size());
@@ -590,8 +590,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             enterpriseInformationList = enterpriseInformationList.stream().filter(item -> !item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "区") && !item.getEnterpriseAddress().startsWith("深圳市" + qy.substring(0, qy.indexOf("区")) + "新区")).collect(Collectors.toList());
         }
         if (enterpriseInformationList.size() > 0) {
-            List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-            List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+            List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+            List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
             StatisticsIndicator s = new StatisticsIndicator();
             s.setName("其他");
             s.setTotalNumber(enterpriseInformationList.size());
@@ -618,8 +618,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             String jdName = d.getDictLabel();
             StatisticsIndicator s = new StatisticsIndicator();
             List<EnterpriseInformation> jdList = enterpriseInformationList.stream().filter(item -> item.getEnterpriseAddress().startsWith("深圳市" + qyName.substring(0, qyName.indexOf("区")) + "区" + jdName) || item.getEnterpriseAddress().startsWith("深圳市" + qyName.substring(0, qyName.indexOf("区")) + "新区" + jdName)).collect(Collectors.toList());
-            List<EnterpriseInformation> existList = jdList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-            List<EnterpriseInformation> logoutList = jdList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+            List<EnterpriseInformation> existList = jdList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+            List<EnterpriseInformation> logoutList = jdList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
             s.setName(jdName);
             s.setAddress(qyName);
             s.setTotalNumber(jdList.size());
@@ -630,8 +630,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
         }
         if (enterpriseInformationList.size() > 0) {
             StatisticsIndicator s = new StatisticsIndicator();
-            List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-            List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+            List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+            List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
             s.setAddress(qyName);
             s.setTotalNumber(enterpriseInformationList.size());
             s.setNumInt(existList.size());

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

@@ -77,10 +77,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
         enterpriseLast.setEndTime(sLast.getEndTime());
         List<EnterpriseInformation> enterpriseNowList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseNow);
         List<EnterpriseInformation> enterpriseLastList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseLast);
-        List<EnterpriseInformation> existListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-        List<EnterpriseInformation> logoutListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
-        List<EnterpriseInformation> existListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
-        List<EnterpriseInformation> logoutListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
+        List<EnterpriseInformation> existListNow = enterpriseNowList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+        List<EnterpriseInformation> logoutListNow = enterpriseNowList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
+        List<EnterpriseInformation> existListLast = enterpriseLastList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList());
+        List<EnterpriseInformation> logoutListLast = enterpriseLastList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList());
         StatisticsIndicatorPart p1=new StatisticsIndicatorPart();
         p1.setName("企业数量");
         p1.setTotal(enterpriseNowList.size());

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

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
             and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
         </if>
-        and is_delete is not null
+        and is_unsubscribe is not null
         and company_org_type is not null
         and enterprise_address is not null
     </where>