diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java index 7bdd159105..40817eafe3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java @@ -36,5 +36,6 @@ public class PartyCenterHousePageFormDTO extends PageFormDTO { //tokenDto. private String staffId; + private String group; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java index 9dbe05c71c..4a09585a97 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java @@ -9,6 +9,9 @@ import lombok.Data; */ @Data public class PartyCenterHouseResultDTO { + + private String houseId; + private String partyCenterHouseId; private String houseName; /** diff --git a/epmet-module/gov-org/gov-org-server/.DS_Store b/epmet-module/gov-org/gov-org-server/.DS_Store new file mode 100644 index 0000000000..4f95a67ebf Binary files /dev/null and b/epmet-module/gov-org/gov-org-server/.DS_Store differ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 09e4793318..8157c7243c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -741,4 +741,10 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId())); } + + @PostMapping("yifengScreen/houseListByGroup") + public Result> yifengHouseListByGroup(@RequestBody PartyCenterHousePageFormDTO formDTO) { + return new Result>().ok(houseService.yifengHouseListByGroup(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getGroup())); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index db3149a73a..2cc885994e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -257,4 +257,6 @@ public interface IcHouseDao extends BaseDao { @Param("gridId") String gridId, @Param("neighborHoodId") String neighborHoodId, @Param("buildingId") String buildingId); + + List yifengHouseListByGroup(@Param("group") String group); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index f5cebceb3a..3d898d6876 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -238,4 +238,7 @@ public interface HouseService { * @return */ PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId); + + + PageData yifengHouseListByGroup(Integer pageNo, Integer pageSize, String group); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index c558ea4d6b..8104032534 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1613,4 +1613,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); } + + + + @Override + public PageData yifengHouseListByGroup(Integer pageNo, Integer pageSize, String group) { + PageHelper.startPage(pageNo, pageSize); + List list = icHouseDao.yifengHouseListByGroup(group); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } 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 f1e8576bb6..ecd3385145 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 @@ -1020,4 +1020,12 @@ AND ih.BUILDING_ID = #{buildingId} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyPlaceTreeResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyPlaceTreeResultDTO.java index 2ae0df3dc6..3d65cb18ff 100755 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyPlaceTreeResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyPlaceTreeResultDTO.java @@ -89,6 +89,6 @@ public class IcPartyPlaceTreeResultDTO implements Serializable { private Integer sort; - private List children; + private List children; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/.DS_Store b/epmet-module/resi-partymember/resi-partymember-server/.DS_Store new file mode 100644 index 0000000000..86adb18539 Binary files /dev/null and b/epmet-module/resi-partymember/resi-partymember-server/.DS_Store differ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyPlaceController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyPlaceController.java index 62a0f3e305..6271d3d861 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyPlaceController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyPlaceController.java @@ -42,7 +42,7 @@ public class IcPartyPlaceController { } @GetMapping("getPageList") - public Result> getPageList(Map params){ + public Result> getPageList(@RequestParam Map params){ List page = icPartyPlaceService.getPageList(params); return new Result>().ok(page); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java index db25f7179c..cd9d8e6f12 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java @@ -318,11 +318,17 @@ public class YiFengScreenController { } @GetMapping("selectPartyPlaceList") - public Result> getPageList(Integer type){ - List page = icPartyPlaceService.selectPartyPlaceList(type); + public Result> getPageList(Integer type,String parentId){ + List page = icPartyPlaceService.selectPartyPlaceList(type,parentId); return new Result>().ok(page); } + @GetMapping("selectPartyPlaceDetail") + public Result getPageList(String placeId){ + IcPartyPlaceTreeResultDTO result= icPartyPlaceService.selectPartyPlaceDetail(placeId); + return new Result().ok(result); + } + /** * @Description: 移列清单 * @param : diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java index 20d4591d56..a0fda752aa 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java @@ -80,5 +80,7 @@ public interface IcPartyPlaceService extends BaseService { List getPageList(Map params); - List selectPartyPlaceList(Integer type); + List selectPartyPlaceList(Integer type,String parentId); + + IcPartyPlaceTreeResultDTO selectPartyPlaceDetail(String placeId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java index 18c05e62b2..ab1a2ab459 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; import com.epmet.resi.partymember.dto.IcPartyPlaceTreeResultDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyInventoryDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInventoryListResultDTO; +import jodd.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -98,15 +99,24 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl getPageList(Map params) { List resultDTOS = new ArrayList<>(); + String parentId = "0"; + + if (params.get("parentId") != null){ + parentId = (String) params.get("parentId"); + } + LambdaQueryWrapper queryWrapperP = new LambdaQueryWrapper<>(); // queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0).orderByAsc(IcPartyPlaceEntity::getSort); - queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0); + queryWrapperP.eq(IcPartyPlaceEntity::getParentId,parentId); if (params.get("type") !=null){ queryWrapperP.eq(IcPartyPlaceEntity::getType,params.get("type")); } queryWrapperP.orderByAsc(IcPartyPlaceEntity::getSort); List entityPList = baseDao.selectList(queryWrapperP); if (entityPList.size() > 0){ + return ConvertUtils.sourceToTarget(entityPList, IcPartyPlaceTreeResultDTO.class); + } + /*if (entityPList.size() > 0){ resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class); resultDTOS.forEach(result->{ @@ -114,26 +124,33 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl entityList = baseDao.selectList(queryWrapper); if (entityList.size() > 0){ - result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyPlaceDTO.class)); + result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyPlaceTreeResultDTO.class)); } }); - } + }*/ return resultDTOS; } @Override - public List selectPartyPlaceList(Integer type) { + public List selectPartyPlaceList(Integer type,String parentId) { List resultDTOS = new ArrayList<>(); + if (StringUtil.isBlank(parentId)){ + parentId = "0"; + } + LambdaQueryWrapper queryWrapperP = new LambdaQueryWrapper<>(); - queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0); + queryWrapperP.eq(IcPartyPlaceEntity::getParentId,"0"); if (type !=null){ queryWrapperP.eq(IcPartyPlaceEntity::getType,type); } queryWrapperP.orderByAsc(IcPartyPlaceEntity::getSort); List entityPList = baseDao.selectList(queryWrapperP); + entityPList.forEach(entity->{ + entity.setDescription(""); + }); if (entityPList.size() > 0){ resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class); resultDTOS.forEach(result->{ @@ -141,13 +158,35 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcPartyPlaceEntity::getParentId,result.getId()).orderByAsc(IcPartyPlaceEntity::getSort);; List entityList = baseDao.selectList(queryWrapper); - if (entityList.size() > 0){ - result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyPlaceDTO.class)); + if (entityList.size()>0){ + List entityListDtos = ConvertUtils.sourceToTarget(entityList,IcPartyPlaceTreeResultDTO.class); + entityListDtos.forEach(result2->{ + result2.setDescription(""); + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(IcPartyPlaceEntity::getParentId,result2.getId()).orderByAsc(IcPartyPlaceEntity::getSort);; + List entityList2 = baseDao.selectList(queryWrapper2); + entityList2.forEach(entity2->{ + entity2.setDescription(""); + }); + if (entityList2.size() > 0){ + result2.setChildren(ConvertUtils.sourceToTarget(entityList2, IcPartyPlaceTreeResultDTO.class)); + } + }); + if (entityListDtos.size() > 0){ + result.setChildren(entityListDtos); + } } }); } - return resultDTOS; } + @Override + public IcPartyPlaceTreeResultDTO selectPartyPlaceDetail(String placeId) { + + IcPartyPlaceEntity entity = baseDao.selectById(placeId); + + return ConvertUtils.sourceToTarget(entity,IcPartyPlaceTreeResultDTO.class); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index e48c26c81d..ccc5299507 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1618,4 +1618,13 @@ public class IcResiUserController implements ResultDataResolver { } } + + @GetMapping("yifengScreen/resiListByHomeId") + public Result> yifengScreenResiListByHomeId(String houseId) { + if (StringUtils.isNotBlank(houseId)) { + return new Result>().ok(icResiUserService.yifengScreenResiListByHomeId(houseId)); + } + return new Result<>(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index c2b3ee5a71..cb1efe2dfe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -518,4 +518,5 @@ public interface IcResiUserDao extends BaseDao { int countSpecialQtyOfOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType); + List yifengScreenResiListByHomeId(@Param("houseId")String houseId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index a64a8e4e85..a5142c090e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -602,4 +602,6 @@ public interface IcResiUserService extends BaseService { Integer pageNo, Integer pageSize, String orgId, String orgType, String codeType,String code); + + List yifengScreenResiListByHomeId(String houseId); } 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 c78f67c9ab..bf9b57981c 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 @@ -4370,6 +4370,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal(), pageSize); } + @Override + public List yifengScreenResiListByHomeId(String houseId) { + return baseDao.yifengScreenResiListByHomeId(houseId); + } + /** * 灵山需求 * diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 4b00b06cde..44c3f7637f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1788,4 +1788,16 @@ and s.SPECIAL_RQLB like CONCAT('%',#{specialType},'%') +