From 8eb3267532e1775ca9937ba6e199595da05fc131 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 18 Apr 2023 16:00:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerAgencyServiceImpl.java       |  3 ++-
 .../service/impl/IcHouseServiceImpl.java      | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 42205950d8..4585f7481d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1699,7 +1699,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 agencyCountCensusResultDTOcom.setLevel("community");
                 agencyCountCensusResultDTOcom.setCount(0);
                 agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOcom);
-            }else if (type.get("street") == null){
+            }
+            if (type.get("street") == null){
                 AgencyCountCensusResultDTO agencyCountCensusResultDTOstree = new AgencyCountCensusResultDTO();
                 agencyCountCensusResultDTOstree.setLevel("street");
                 agencyCountCensusResultDTOstree.setCount(0);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 94ba7b61f9..02edf85863 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -438,32 +438,38 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
             houseCountPictureListResultDTO.setType("1");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("2") == null){
+        }
+        if (type.get("2") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("2");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("3") == null){
+        }
+        if (type.get("3") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("3");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("4") == null){
+        }
+        if (type.get("4") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("4");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("5") == null){
+        }
+        if (type.get("5") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("5");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("6") == null){
+        }
+        if (type.get("6") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("6");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("7") == null){
+        }
+        if (type.get("7") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("7");
             houseCountPictureListResultDTO.setCount(0);
@@ -502,17 +508,20 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
             houseCountPictureListResultDTO.setType("1");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("2") == null){
+        }
+        if (type.get("2") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("2");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("3") == null){
+        }
+        if (type.get("3") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("3");
             houseCountPictureListResultDTO.setCount(0);
             list.add(houseCountPictureListResultDTO);
-        }else if (type.get("0") == null){
+        }
+        if (type.get("0") == null){
             houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
             houseCountPictureListResultDTO.setType("0");
             houseCountPictureListResultDTO.setCount(0);

From bf7ea56aef7d7659ac96afa9a4616f9bcaf802c0 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 18 Apr 2023 16:08:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 02edf85863..9c844639ec 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -494,7 +494,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         List<HouseCountPictureListResultDTO> list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd());
 
-        resultDTO.getList().forEach(
+        list.forEach(
                 result->{
                     type.put(result.getType(),result.getType());
                     resultDTO.setTotal(resultDTO.getTotal()+result.getCount());

From d3e4887835ae011306f451d0dace7c220454bb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 18 Apr 2023 16:13:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/StaffLoginLogController.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
index 12bb6d4cb4..c8c7267101 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java
@@ -194,11 +194,9 @@ public class StaffLoginLogController {
         PageData<AccountActivityInfo> res = staffLoginLogService.getAccountActivityInfo(formDTO);
         if (!CollectionUtils.isEmpty(res.getList())) {
             if("1".equals(formDTO.getIsActivity())){
-//                List<AccountActivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, "社区活跃数据", res.getList(), AccountActivityExcel.class);
             }else {
-//                List<AccountInactivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountInactivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, "社区不活跃数据", res.getList(), AccountInactivityExcel.class);
             }
 
         }