Merge branch 'yantai_zhengwu_master' into dev

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);
             }
 
         }

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);

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);
@@ -488,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());
@@ -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);