From 6362e43078e0d5492e22e4bfbc378143afa6c8f3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 21 Jan 2022 16:11:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=82=E5=8C=97=E8=B5=8B=E8=83=BD?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9F=A5=E8=AF=A2=E8=AE=AE=E9=A2=98=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E5=A7=93=E5=90=8D=EF=BC=8C=E5=9B=A0=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=B8=8A=E4=BC=A0userWechat=E8=A1=A8=20=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E6=94=B9=E5=8E=BBuserbaseinfo=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/UserResiInfoDao.java | 1 + .../service/impl/UserResiInfoServiceImpl.java | 4 ++- .../main/resources/mapper/UserResiInfoDao.xml | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 73044f21c4..1fddb41280 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -78,6 +78,7 @@ public interface UserResiInfoDao extends BaseDao { * @date 2020/5/11 11:18 */ IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); + IssueInitiatorResultDTO issueInitiatorByBaseInfo(IssueInitiatorFormDTO formDTO); /** * @param userId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 017a0469df..ee80c0809d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -387,7 +387,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl + + - SELECT - GROUP_CONCAT(m.CATEGORY_NAME) + m.CUSTOMER_ID, + m.CATEGORY_CODE, + m.CATEGORY_NAME, + m.LEVEL, + m.PARENT_CODE, + IFNULL(p.CATEGORY_NAME,'') as parentName FROM - ic_resi_demand_dict m + ic_resi_demand_dict m + left join ic_resi_demand_dict p + on(m.PARENT_CODE=p.CATEGORY_CODE + and p.CUSTOMER_ID=#{customerId}) WHERE m.DEL_FLAG = '0' AND m.CUSTOMER_ID = #{customerId} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ce575f5a48..55f75b5307 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -53,6 +53,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -403,6 +404,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds); List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + + //查询需求分类字典 + UserDemandNameQueryFormDTO userDemandNameQueryFormDTO=new UserDemandNameQueryFormDTO(); + userDemandNameQueryFormDTO.setCustomerId(formDTO.getCustomerId()); + Result> demandNameRes=heartOpenFeignClient.queryDemandNames(userDemandNameQueryFormDTO); + if(!demandNameRes.success()||CollectionUtils.isEmpty(demandNameRes.getData())){ + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"获取需求分类字典表数据异常",EpmetErrorCode.SERVER_ERROR.getMsg()); + } + Map demandDictMap=demandNameRes.getData().stream().collect(Collectors.toMap(IcResiDemandDictDTO::getCategoryCode,Function.identity())); + for (Map resultMap : list) { String gridIdValue = null != resultMap.get(UserConstant.GRID_ID) ? resultMap.get(UserConstant.GRID_ID).toString() : StrConstant.EPMETY_STR; resultMap.put("GRID_ID_VALUE", gridIdValue); @@ -439,7 +450,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } - private String queryUserDemandName(String customerId,String icResiUserId) { + private String queryUserDemandName(String icResiUserId,Map demandDictMap) { + // epmet_user.ic_resi_demand.category_code存储的值为 分类编码的全路径，eg: + // 1003,10030002 + // 1012,10120003 + // 1016,10160003 Set demandCodePath=baseDao.selectUserDemandCode(icResiUserId); if(CollectionUtils.isEmpty(demandCodePath)){ return StrConstant.EPMETY_STR; } - Set codeSet=new HashSet<>(); + List nameList=new ArrayList<>(); for(String codePath:demandCodePath){ if(codePath.contains(StrConstant.COMMA)){ String[] codeAtt=codePath.split(StrConstant.COMMA); - codeSet.add(codeAtt[codeAtt.length-1]); + String code=codeAtt[codeAtt.length-1]; + if(StringUtils.isNotBlank(code)&&demandDictMap.containsKey(code)){ + nameList.add(demandDictMap.get(code).getParentName()); + } }else{ - codeSet.add(codePath); + if(StringUtils.isNotBlank(codePath)&&demandDictMap.containsKey(codePath)){ + nameList.add(demandDictMap.get(codePath).getParentName()); + } } } - String demandName=""; -// String demandName=baseDao.selectCategoryNames(customerId,codeSet); - UserDemandNameQueryFormDTO userDemandNameQueryFormDTO=new UserDemandNameQueryFormDTO(); - userDemandNameQueryFormDTO.setCustomerId(customerId); - userDemandNameQueryFormDTO.setCodeSet(codeSet); - Result demandNameRes=heartOpenFeignClient.queryDemandNames(userDemandNameQueryFormDTO); - if(demandNameRes.success()){ - demandName=demandNameRes.getData(); - } + String demandName=String.join(StrConstant.COMMA_ZH,nameList); return demandName; } + /** * 编辑页面，显示居民信息详情 *