Merge remote-tracking branch 'origin/房屋tree_yzm'

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -1149,8 +1149,9 @@ public class AgencyServiceImpl implements AgencyService {
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId);
             agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId());
             List<String> currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null);
-            List<String> preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime);
+            // List<String> preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime);
-            return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size());
+            // return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size());
+            return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), 0);
         } else if ("grid".equals(orgType)) {
             // 网格下不会有该数据，给个0
             return new UsingCommunityStatsResultDTO(0, 0);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -724,6 +724,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resultDTO.setOrgId(formDTO.getOrgId());
         resultDTO.setOrgType(formDTO.getOrgType());
 
+        /*应烟台要求 页面去掉“较上月”的数据，后端程序也去掉，提升接口相应时间
         // 加载上个月，该组织的人房统计信息，并且计算较上月信息
         Date lastDayOfLastMonth = DateUtils.getLastDayOfMonth(DateUtils.addDateMonths(new Date(), -1));
         UserHouseStatsQueryFormDTO form = new UserHouseStatsQueryFormDTO(formDTO.getOrgId(), formDTO.getOrgType(), DateUtils.format(lastDayOfLastMonth, "yyyyMMdd"));
@@ -733,7 +734,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resultDTO.setHouseTotalJSY(resultDTO.getHouseTotal() - lastMonthUserHouseStats.getHouseTotal());
         resultDTO.setCzHouseTotalJSY(resultDTO.getCzHouseTotal() - lastMonthUserHouseStats.getCzHouseTotal());
         resultDTO.setXzHouseTotalJSY(resultDTO.getXzHouseTotal() - lastMonthUserHouseStats.getXzHouseTotal());
-        resultDTO.setZzHouseTotalJSY(resultDTO.getZzHouseTotal() - lastMonthUserHouseStats.getZzHouseTotal());
+        resultDTO.setZzHouseTotalJSY(resultDTO.getZzHouseTotal() - lastMonthUserHouseStats.getZzHouseTotal());*/
         return resultDTO;
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -459,6 +459,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             NatListDTO dto = new NatListDTO();
             dto.setAddress(item.getNatAddress());
             dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
+            if(StringUtils.isNotBlank(item.getNatResult())){
                 switch (item.getNatResult())
                 {
                     case NumConstant.ZERO_STR:
@@ -470,6 +471,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                     default:
                         dto.setResult("未知");
                 }
+            }else{
+                dto.setResult("未知");
+            }
             return dto;
         }).collect(Collectors.toList());
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2112,6 +2112,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         resultDTO.setOrgId(formDTO.getOrgId());
         resultDTO.setOrgType(formDTO.getOrgType());
 
+        /*应烟台要求 页面去掉“较上月”的数据，后端程序也去掉，提升接口相应时间
         // 计算较上月的数据
         Date lastDayOfLastMonth = DateUtils.getLastDayOfMonth(DateUtils.addDateMonths(new Date(), -1));
         UserHouseStatsQueryFormDTO form = new UserHouseStatsQueryFormDTO(formDTO.getOrgId(), formDTO.getOrgType(), DateUtils.format(lastDayOfLastMonth, "yyyyMMdd"));
@@ -2120,7 +2121,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         resultDTO.setUserTotalJSY(resultDTO.getUserTotal() - lastMonthUserHouseStats.getUserTotal());
         resultDTO.setCzUserTotalJSY(resultDTO.getCzUserTotal() - lastMonthUserHouseStats.getCzUserTotal());
-        resultDTO.setLdUserTotalJSY(resultDTO.getLdUserTotal() - lastMonthUserHouseStats.getLdUserTotal());
+        resultDTO.setLdUserTotalJSY(resultDTO.getLdUserTotal() - lastMonthUserHouseStats.getLdUserTotal());*/
 
         return resultDTO;
     }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -861,7 +861,7 @@
         FROM
             ic_resi_user a
             LEFT JOIN (
-                SELECT ID_CARD, count( id ) AS count
+                SELECT ID_CARD, count(distinct v.INOCULATE_TIME ) AS count
                 FROM ic_vaccine
                 WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
                 <if test="startDate != null and startDate != ''">