elink-star
/
epmet-cloud-zhengwu-yantai
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

房屋、组织 0值

master
lichao 2 years ago
parent
b35a699620
commit
818722d2f8
3 changed files with 100 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
  2. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  3. 85
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
View File

@ -530,7 +530,7 @@ public class CustomerAgencyController {
/**
* @Description: 返回下级数量统计
* @param agencyId:
* @param dto:
* @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyCountCensusResultDTO>>
* @Author: lichao
* @Date: 2023/4/7 14:48

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
View File

@ -1674,9 +1674,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId());
if (customerAgency != null){
Map<String,String> type = new HashMap<>();
String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids());
agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd());
agencyCountCensusResultDTOS.forEach(
agencyCountCensusResultDTO ->{
type.put(agencyCountCensusResultDTO.getLevel(),agencyCountCensusResultDTO.getLevel());
}
);
AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO();
agencyCountCensusResultDTOGrid.setLevel("grid");
agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
@ -1687,9 +1694,22 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff);
if (type.get("community") == null){
AgencyCountCensusResultDTO agencyCountCensusResultDTOcom = new AgencyCountCensusResultDTO();
agencyCountCensusResultDTOcom.setLevel("community");
agencyCountCensusResultDTOcom.setCount(0);
agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOcom);
}else if (type.get("street") == null){
AgencyCountCensusResultDTO agencyCountCensusResultDTOstree = new AgencyCountCensusResultDTO();
agencyCountCensusResultDTOstree.setLevel("street");
agencyCountCensusResultDTOstree.setCount(0);
agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOstree);
}
}else{
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常");
}
return agencyCountCensusResultDTOS;
}

85
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
View File

@ -416,17 +416,60 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
Map<String,String> type = new HashMap<>();
resultDTO.setTotal(0);
if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){
dto.setOrgType("agency");
}
resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()));
resultDTO.getList().forEach(
result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
);
List<HouseCountPictureListResultDTO> list = baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd());
list.forEach(
result->{
resultDTO.setTotal(resultDTO.getTotal()+result.getCount());
type.put(result.getType(),result.getType());
}
);
HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
if (type.get("1") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("1");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("2") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("2");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("3") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("3");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("4") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("4");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("5") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("5");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("6") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("6");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("7") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("7");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}
resultDTO.setList(list);
return resultDTO;
}
@ -435,18 +478,48 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
Map<String,String> type = new HashMap<>();
resultDTO.setTotal(0);
if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){
dto.setOrgType("agency");
}
resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()));
List<HouseCountPictureListResultDTO> list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd());
resultDTO.getList().forEach(
result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
result->{
type.put(result.getType(),result.getType());
resultDTO.setTotal(resultDTO.getTotal()+result.getCount());
}
);
HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
if (type.get("1") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("1");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("2") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("2");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("3") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("3");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}else if (type.get("0") == null){
houseCountPictureListResultDTO = new HouseCountPictureListResultDTO();
houseCountPictureListResultDTO.setType("0");
houseCountPictureListResultDTO.setCount(0);
list.add(houseCountPictureListResultDTO);
}
resultDTO.setList(list);
return resultDTO;
}

Write Preview
Loading…
Cancel
Save