daimatijiao

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;
 }
 

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;
     /**

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<PageData<PartyCenterHouseResultDTO>>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId()));
     }
 
+
+    @PostMapping("yifengScreen/houseListByGroup")
+    public Result<PageData<PartyCenterHouseResultDTO>> yifengHouseListByGroup(@RequestBody PartyCenterHousePageFormDTO formDTO) {
+        return new Result<PageData<PartyCenterHouseResultDTO>>().ok(houseService.yifengHouseListByGroup(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getGroup()));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -257,4 +257,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
                                      @Param("gridId") String gridId,
                                      @Param("neighborHoodId") String neighborHoodId,
                                      @Param("buildingId") String buildingId);
+
+    List<PartyCenterHouseResultDTO> yifengHouseListByGroup(@Param("group") String group);
 }

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

@@ -238,4 +238,7 @@ public interface HouseService {
      * @return
      */
     PageData<PartyCenterHouseResultDTO> queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId);
+
+
+    PageData<PartyCenterHouseResultDTO> yifengHouseListByGroup(Integer pageNo, Integer pageSize, String group);
 }

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<PartyCenterHouseResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
+
+
+
+    @Override
+    public PageData<PartyCenterHouseResultDTO> yifengHouseListByGroup(Integer pageNo, Integer pageSize, String group) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<PartyCenterHouseResultDTO> list = icHouseDao.yifengHouseListByGroup(group);
+        PageInfo<PartyCenterHouseResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -1020,4 +1020,12 @@
             AND ih.BUILDING_ID = #{buildingId}
         </if>
     </select>
+    <select id="yifengHouseListByGroup" resultType="com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO">
+
+        select ID as houseId, FULL_NAME as houseName
+        from ic_house
+        where CUSTOMER_ID = '1739891126105206785'
+        and
+            house_group = #{group}
+    </select>
 </mapper>

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<IcPartyPlaceDTO> children;
+    private List<IcPartyPlaceTreeResultDTO> children;
 
 }

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<List<IcPartyPlaceTreeResultDTO>> getPageList(Map<String, Object> params){
+    public Result<List<IcPartyPlaceTreeResultDTO>> getPageList(@RequestParam Map<String, Object> params){
         List<IcPartyPlaceTreeResultDTO> page = icPartyPlaceService.getPageList(params);
         return new Result<List<IcPartyPlaceTreeResultDTO>>().ok(page);
     }

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<List<IcPartyPlaceTreeResultDTO>> getPageList(Integer type){
+    public Result<List<IcPartyPlaceTreeResultDTO>> getPageList(Integer type,String parentId){
-        List<IcPartyPlaceTreeResultDTO> page = icPartyPlaceService.selectPartyPlaceList(type);
+        List<IcPartyPlaceTreeResultDTO> page = icPartyPlaceService.selectPartyPlaceList(type,parentId);
         return new Result<List<IcPartyPlaceTreeResultDTO>>().ok(page);
     }
 
+    @GetMapping("selectPartyPlaceDetail")
+    public Result<IcPartyPlaceTreeResultDTO> getPageList(String placeId){
+        IcPartyPlaceTreeResultDTO result= icPartyPlaceService.selectPartyPlaceDetail(placeId);
+        return new Result<IcPartyPlaceTreeResultDTO>().ok(result);
+    }
+
     /**
      * @Description: 移列清单
      * @param :

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<IcPartyPlaceEntity> {
     List<IcPartyPlaceTreeResultDTO> getPageList(Map<String, Object> params);
 
 
-    List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type);
+    List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type,String parentId);
+
+    IcPartyPlaceTreeResultDTO selectPartyPlaceDetail(String placeId);
 }

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<IcPartyPlaceDao, Ic
     public List<IcPartyPlaceTreeResultDTO> getPageList(Map<String, Object> params) {
         List<IcPartyPlaceTreeResultDTO> resultDTOS = new ArrayList<>();
 
+        String parentId = "0";
+
+        if (params.get("parentId") != null){
+            parentId = (String) params.get("parentId");
+        }
+
         LambdaQueryWrapper<IcPartyPlaceEntity> 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<IcPartyPlaceEntity> 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<IcPartyPlaceDao, Ic
                 queryWrapper.eq(IcPartyPlaceEntity::getParentId,result.getId()).orderByAsc(IcPartyPlaceEntity::getSort);;
                 List<IcPartyPlaceEntity> 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<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type) {
+    public List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type,String parentId) {
         List<IcPartyPlaceTreeResultDTO> resultDTOS = new ArrayList<>();
 
+        if (StringUtil.isBlank(parentId)){
+            parentId = "0";
+        }
+
         LambdaQueryWrapper<IcPartyPlaceEntity> 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<IcPartyPlaceEntity> 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<IcPartyPlaceDao, Ic
                 LambdaQueryWrapper<IcPartyPlaceEntity> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(IcPartyPlaceEntity::getParentId,result.getId()).orderByAsc(IcPartyPlaceEntity::getSort);;
                 List<IcPartyPlaceEntity> entityList = baseDao.selectList(queryWrapper);
-                if (entityList.size() > 0){
+                if (entityList.size()>0){
-                    result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyPlaceDTO.class));
+                    List<IcPartyPlaceTreeResultDTO> entityListDtos = ConvertUtils.sourceToTarget(entityList,IcPartyPlaceTreeResultDTO.class);
+                    entityListDtos.forEach(result2->{
+                        result2.setDescription("");
+                        LambdaQueryWrapper<IcPartyPlaceEntity> queryWrapper2 = new LambdaQueryWrapper<>();
+                        queryWrapper2.eq(IcPartyPlaceEntity::getParentId,result2.getId()).orderByAsc(IcPartyPlaceEntity::getSort);;
+                        List<IcPartyPlaceEntity> 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);
+    }
+
 }

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<List<IcResiUserBriefDTO>> yifengScreenResiListByHomeId(String houseId) {
+        if (StringUtils.isNotBlank(houseId)) {
+            return new Result<List<IcResiUserBriefDTO>>().ok(icResiUserService.yifengScreenResiListByHomeId(houseId));
+        }
+        return new Result<>();
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -518,4 +518,5 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     int countSpecialQtyOfOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType);
 
+    List<IcResiUserBriefDTO> yifengScreenResiListByHomeId(@Param("houseId")String houseId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -602,4 +602,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                                             Integer pageNo, Integer pageSize,
                                                             String orgId, String orgType,
                                                             String codeType,String code);
+
+    List<IcResiUserBriefDTO> yifengScreenResiListByHomeId(String houseId);
 }

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

@@ -4370,6 +4370,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
 
+    @Override
+    public List<IcResiUserBriefDTO> yifengScreenResiListByHomeId(String houseId) {
+        return baseDao.yifengScreenResiListByHomeId(houseId);
+    }
+
     /**
      * 灵山需求
      *

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

@@ -1788,4 +1788,16 @@
             and s.SPECIAL_RQLB like CONCAT('%',#{specialType},'%')
         </if>
     </select>
+    <select id="yifengScreenResiListByHomeId" resultType="com.epmet.dto.result.IcResiUserBriefDTO">
+
+
+        select MOBILE as mobile,if(GENDER = 1,'男',if(GENDER = 2,'女','')) as gender,ID_CARD as idCard,
+               NAME as icUserName
+        from ic_resi_user
+        where CUSTOMER_ID = '1739891126105206785'
+        and
+            HOME_ID = #{houseId}
+
+
+    </select>
 </mapper>