From 5f074419ff94876195fa764c84ce42a249f07836 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 27 Jan 2022 11:22:58 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aagency=5Fpids?= =?UTF-8?q?=E4=B8=BA""=E7=9A=84=E5=B0=8F=E5=8C=BA=EF=BC=8C=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=9F=A5=E8=AF=A2=E6=90=9C=E4=B8=8D=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 01e2276fac..32338f7927 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -130,7 +130,10 @@ LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0' - AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%') + case c.AGENCY_PIDS + when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%') + else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') + end AND a.BUILDING_ID = #{buildingId} From 282df797cc2cea0cf5a7002ff905c0678f6f8422 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 11:41:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B8=82=E5=8C=97=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E7=BB=87pids=E6=98=AF=E8=8B=B1=E6=96=87=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E9=9A=94=E5=BC=80=EF=BC=8C=E5=85=88=E7=89=B9=E6=AE=8A=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index cbe81adec8..7000dc6f32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -35,8 +35,6 @@ import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; -import com.epmet.dataaggre.entity.epmetuser.*; -import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService; @@ -795,7 +793,12 @@ public class EpmetUserServiceImpl implements EpmetUserService { // 当前组织是根组织 gridPids=formDTO.getOrgId(); }else { - gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); + if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){ + //市北的是英文冒号隔开的 + gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId()); + }else{ + gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); + } } List list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds); if(CollectionUtils.isNotEmpty(list)){ From 56851c94846dd30331067e0bdfe516a6cf25b268 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:06:31 +0800 Subject: [PATCH 3/8] orgId --- .../dataaggre/dao/datastats/DataStatsDao.java | 1 + .../service/datastats/DataStatsService.java | 2 +- .../datastats/impl/DataStatsServiceImpl.java | 4 ++-- .../epmetuser/impl/EpmetUserServiceImpl.java | 20 +++++++++++++++---- .../mapper/datastats/DatsStatsDao.xml | 5 ++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 309d5432d9..1b0562b286 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -355,6 +355,7 @@ public interface DataStatsDao { @Param("configIds") List configIds); List queryAgencyIcUserCategoryData(@Param("gridPids") String gridPids, + @Param("orgId")String orgId, @Param("dateId") String dateId, @Param("configIds") List configIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 23a33137ab..02b5f5fef5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -283,5 +283,5 @@ public interface DataStatsService { List queryGridIcUserCategoryData(String orgId, String dateId, List configIds); - List queryAgencyIcUserCategoryData(String gridPids, String dateId, List configIds); + List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 79465829b7..08a40f4c1e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2181,10 +2181,10 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } @Override - public List queryAgencyIcUserCategoryData(String gridPids, String dateId, List configIds) { + public List queryAgeb09527201c4409e19d1dbc5e3c3429a1ncyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ return new ArrayList<>(); } - return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,dateId,configIds); + return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 7000dc6f32..aac6d6df98 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -787,7 +787,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { }); } }else if(OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())){ - CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); + /*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); String gridPids=""; if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ // 当前组织是根组织 @@ -799,12 +799,24 @@ public class EpmetUserServiceImpl implements EpmetUserService { }else{ gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); } - } - List list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds); + }*/ + List list = dataStatsService.queryAgencyIcUserCategoryData(null, formDTO.getOrgId(), formDTO.getDateId(), configIds); if(CollectionUtils.isNotEmpty(list)){ Map configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1)); resList.forEach(resDto->{ - if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){ + if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){/*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); + String gridPids=""; + if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ + // 当前组织是根组织 + gridPids=formDTO.getOrgId(); + }else { + if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){ + //市北的是英文冒号隔开的 + gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId()); + }else{ + gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); + } + }*/ FactIcuserCategoryAnalysisDailyDTO dailyDTO=configMap.get(resDto.getConfigId()); resDto.setTotal(dailyDTO.getTotal()); resDto.setImmigration(dailyDTO.getQrIncr()); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index fa315b0aa1..7e11807b3a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1134,7 +1134,10 @@ WHERE m.DATE_ID = #{dateId} AND m.DEL_FLAG = '0' - AND m.PIDS LIKE concat(#{gridPids},'%') + + AND m.PIDS LIKE concat(#{gridPids},'%') + + AND m.pids like concat('%',#{orgId},'%') AND M.ORG_TYPE='grid' From e8b21680690de01e5515d7637a831cf3dba4ef0f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:16:09 +0800 Subject: [PATCH 4/8] error --- .../dataaggre/service/datastats/impl/DataStatsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 08a40f4c1e..7427b146c7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2181,7 +2181,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } @Override - public List queryAgeb09527201c4409e19d1dbc5e3c3429a1ncyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { + public List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ return new ArrayList<>(); } From 18b427adcc9e4e08a58746c39c50f44d62403814 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:28:49 +0800 Subject: [PATCH 5/8] orgId --- .../datastats/impl/DataStatsServiceImpl.java | 2 +- .../epmetuser/impl/EpmetUserServiceImpl.java | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 7427b146c7..0f47aceaa2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2182,7 +2182,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve @Override public List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { - if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ + if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(orgId)){ return new ArrayList<>(); } return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index aac6d6df98..3ed9152224 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -33,7 +33,6 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity; import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; @@ -804,19 +803,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { if(CollectionUtils.isNotEmpty(list)){ Map configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1)); resList.forEach(resDto->{ - if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){/*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); - String gridPids=""; - if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ - // 当前组织是根组织 - gridPids=formDTO.getOrgId(); - }else { - if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){ - //市北的是英文冒号隔开的 - gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId()); - }else{ - gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); - } - }*/ + if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){ FactIcuserCategoryAnalysisDailyDTO dailyDTO=configMap.get(resDto.getConfigId()); resDto.setTotal(dailyDTO.getTotal()); resDto.setImmigration(dailyDTO.getQrIncr()); From 4dfa3cfa3120f25fb80876368d0a8368eb9b3066 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 27 Jan 2022 13:10:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E5=A4=A7=20agg=E5=92=8Creport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 4 ++-- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 9d22fdfb8c..4060745034 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-aggregator.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx760m -jar ./data-aggregator.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 600M + memory: 800M diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index c20b81b36d..7e1e17409e 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-report.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-report.jar" restart: "unless-stopped" deploy: resources: From 5ed02f594bb78a662d0e6a98dfd7a17b96d1cf5e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 3 Feb 2022 23:38:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=91=E7=94=9F=E8=B0=83?= =?UTF-8?q?=E5=8A=A8=E5=8A=A8=E4=BD=9C=EF=BC=8C=E9=99=84=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E5=A4=9A=E4=BD=99=E7=B1=BB=E5=88=AB=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserImportServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 5bb39530f9..71e0e0d9ca 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1211,7 +1211,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res Map newCategories = transferedData.getNewData().getCategories(); Map oldCategories = transferedData.getOldData().getCategories(); - oldCategories.put(columnName, "0"); + String oldValue = resiInfoMap.get(columnName); + if (StringUtils.isBlank(oldValue)) { + oldValue = "0"; + } + + oldCategories.put(columnName, oldValue); newCategories.put(columnName, "1"); return; } @@ -1371,8 +1376,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ public void saveTransferedResiRecord(Map transferedResis) { Date now = new Date(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId()); + for (Map.Entry resi : transferedResis.entrySet()) { - String customerId = loginUserUtil.getLoginUserCustomerId(); String resiId = resi.getKey(); ResiImportCategoryData oldData = resi.getValue().getOldData(); @@ -1478,8 +1485,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } } - CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId()); - IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId); // 保存 transferRecord From e1ac737788bb47b1015096343b8085dbcfe6a890 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Feb 2022 17:21:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E6=98=AF=E6=88=B7=E6=95=B0=E5=90=8D=E8=AF=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=80=BB=E6=88=B7=E6=95=B0=EF=BC=8C=E5=B7=A6=E8=BE=B9=E6=A0=91?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E8=AE=A1=E7=AE=97=E6=80=BB=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index ed8b1b7b85..cdf6227a8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -208,14 +208,16 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setChildren(new ArrayList<>()); //当前楼栋共有多少户，有多少户有人住 buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); - // 总单元数 + /* // 总单元数 Integer totalUnitNum = null == item.getTotalUnitNum() ? NumConstant.ZERO : item.getTotalUnitNum(); // 总楼层总数 Integer totalFloorNum = null == item.getTotalFloorNum() ? NumConstant.ZERO : item.getTotalFloorNum(); // *总户数 Integer totalHouseNum = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum(); //总户数=以上三个数相乘 - Integer total=totalUnitNum*totalFloorNum*totalHouseNum; + Integer total=totalUnitNum*totalFloorNum*totalHouseNum;*/ + //02.11 之前录入的户数概念改为总户数，无需计算直接用就可以了 + Integer total = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum(); //已经添加了多少户 LambdaQueryWrapper icHouseEntityWrapper = new QueryWrapper().lambda() .in(IcHouseEntity::getBuildingId, item.getId());