Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2099,19 +2099,21 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             }
             //例行工作次数累加
             int patrolRoutineWorkTimes = NumConstant.ZERO;
-            workCountListTemp = workCountMap.get(org.getOrgId());
+            if (workCountMap != null){
-            if (CollectionUtils.isNotEmpty(workCountListTemp)) {
+                workCountListTemp = workCountMap.get(org.getOrgId());
-                if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
+                if (CollectionUtils.isNotEmpty(workCountListTemp)) {
-                    for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                        patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
-                        set.add(work.getStaffId());
-                    }
-                } else {
-                    if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
                         for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
                             patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                             set.add(work.getStaffId());
                         }
+                    } else {
+                        if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
+                            for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+                                patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
+                                set.add(work.getStaffId());
+                            }
+                        }
                     }
                 }
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -72,7 +72,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
         // 应产品要求添加
-        if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") || !dto.getType().equals("自建房")) || !dto.getType().equals("别墅")){
+        if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
             nums.add(num);
             return;
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -78,24 +78,26 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
         // 应产品要求
-        if (StringUtils.isNotBlank(dto.getHouseType()) && ( !dto.getHouseType().equals("楼房") || !dto.getHouseType().equals("平房") || !dto.getHouseType().equals("别墅") ) ){
+        if (StringUtils.isNotBlank(dto.getHouseType()) ){
-            nums.add(num);
+            if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
-            return;
+                nums.add(num);
+                return;
+            }
         }
         dto.setHouseType(HouseTypeEnums.getKeyByValue(dto.getHouseType()));
 
-        if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") ||
+        if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") &&
-                !dto.getPurpose().equals("商业") ||
+                !dto.getPurpose().equals("商业") &&
-                !dto.getPurpose().equals("办公") ||
+                !dto.getPurpose().equals("办公") &&
-                !dto.getPurpose().equals("工业") ||
+                !dto.getPurpose().equals("工业") &&
-                !dto.getPurpose().equals("仓储") ||
+                !dto.getPurpose().equals("仓储") &&
-                !dto.getPurpose().equals("商住混用") ||
+                !dto.getPurpose().equals("商住混用") &&
                 !dto.getPurpose().equals("其他")) ){
             nums.add(num);
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
-        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("出租") || !dto.getRentFlagString().equals("未出租"))){
+        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("是") && !dto.getRentFlagString().equals("否"))){
             nums.add(num);
             return;
         }