From d72e55e0d360450663979d7a0bb81c45ab302290 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Thu, 12 Dec 2024 17:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=B3=A8=E9=94=80=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatisticsEnterpriseController.java | 8 ++++---- .../impl/EnterpriseInformationServiceImpl.java | 16 ++++++++-------- .../service/impl/StatisticalPaneServiceImpl.java | 8 ++++---- .../mapper/EnterpriseInformationMapper.xml | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java index b9fac061..41da41e1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java +++ b/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 enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation()); - List existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List 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 enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation); - List existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List 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());//注销数量 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index a8b191c1..698132dc 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/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 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 existList = qyList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = qyList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = qyList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List 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 existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List 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 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 existList = jdList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = jdList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = jdList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List 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 existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List logoutList = enterpriseInformationList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList()); s.setAddress(qyName); s.setTotalNumber(enterpriseInformationList.size()); s.setNumInt(existList.size()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java index 83da956c..a5e47809 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java +++ b/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 enterpriseNowList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseNow); List enterpriseLastList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseLast); - List existListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); - List existListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); - List logoutListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existListNow = enterpriseNowList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List logoutListNow = enterpriseNowList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList()); + List existListLast = enterpriseLastList.stream().filter(item -> item.getIsUnsubscribe() == 0).collect(Collectors.toList()); + List logoutListLast = enterpriseLastList.stream().filter(item -> item.getIsUnsubscribe() == 1).collect(Collectors.toList()); StatisticsIndicatorPart p1=new StatisticsIndicatorPart(); p1.setName("企业数量"); p1.setTotal(enterpriseNowList.size()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml index 421b5cdb..0cf61662 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') - 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