diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 89f03e8545..23579dd5d2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -169,16 +169,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl queryProjectList(TDuckListFormDTO formDTO) { List orgIds = new ArrayList<>(); + // 工作端不需要传orgId if (formDTO.getClient().equals(TDuckConstant.CLIENT_GOV)){ + // 根据 客户ID 和 人ID 从redis获取信息 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); String pids = staffInfo.getAgencyPIds(); String agencyId = staffInfo.getAgencyId(); + // 来源于 部门 if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){ List deptList = staffInfo.getDeptList(); if (CollectionUtils.isEmpty(deptList)){ return new ArrayList<>(); } orgIds = joint(pids,agencyId,deptList); + // 来源于 网格 }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){ List gridList = staffInfo.getGridList(); if (CollectionUtils.isEmpty(gridList)){ @@ -192,6 +196,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO); if (!gridResult.success()){ throw new RenException("查询网格信息失败了..."); @@ -200,12 +205,14 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl projectKeys = baseDao.selectProjectKey(orgIds); if (CollectionUtils.isEmpty(projectKeys)){ return new ArrayList<>(); } PageInfo projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient())); List result = projectPageInfo.getList(); + // 查询此人已填写过的问卷 并赋值已填写字段 List records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId()); if (!CollectionUtils.isEmpty(records)){ for (String r : records) { @@ -217,6 +224,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy()); String orgName = "";