From 63d28a28601323b63897317bc276eb25e6bc76f4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 13 Apr 2022 09:28:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?=
=?UTF-8?q?=E7=8E=B0=E5=B1=85=E5=9C=B0=E8=A1=8C=E6=94=BF=E5=9C=B0=E5=8C=BA?=
=?UTF-8?q?=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D=E9=99=90?=
=?UTF-8?q?=E5=88=B6=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/AreaCodeDao.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
index eca90f2415..324edf5f0f 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
@@ -84,7 +84,6 @@
area_code_child ac
WHERE
ac.DEL_FLAG = '0'
- AND ac.USER_DEFINED = '0'
AND ac.p_code=#{pCode}
@@ -101,7 +100,6 @@
area_code_child ac
WHERE
ac.DEL_FLAG = '0'
- AND ac.USER_DEFINED = '0'
AND ac.p_code=#{pCode}
From aabbf44618d269ae9aaf2b26c1b34af0b4a169a4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 13 Apr 2022 09:44:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E9=9C=80=E6=B1=82=E6=8C=87?=
=?UTF-8?q?=E6=B4=BE=E6=97=B6=E6=8C=87=E6=B4=BE=E7=BB=99=E8=81=94=E5=BB=BA?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/db/migration/V0.0.13__up_sys_dict_data.sql | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql
new file mode 100644
index 0000000000..8cf8a7e21a
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql
@@ -0,0 +1,6 @@
+update sys_dict_data set dict_label='联建单位'
+where dict_value='party_unit'
+and DEL_FLAG='0'
+and dict_type_id=(
+ select st.id from sys_dict_type st where st.dict_type='user_demand_service_type' and st.DEL_FLAG='0'
+);
\ No newline at end of file
From 270f49dc8514e8d6b72e2140d515e91a9d80224d Mon Sep 17 00:00:00 2001
From: sunyuchao
Date: Wed, 13 Apr 2022 10:08:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?22=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?=
=?UTF-8?q?=E7=A7=8D=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E3=80=81=E6=A0=B8?=
=?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E6=88=BF?=
=?UTF-8?q?=E5=B1=8B=E4=B8=80=E5=88=97=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=BA=AB?=
=?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=98=BE=E7=A4=BA=E8=AF=A5=E8=BA=AB?=
=?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=89=80=E5=B1=9E=E6=88=BF=E5=B1=8B?=
=?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=EF=BC=9B=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E6=89=80=E5=B1=9E=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/form/VaccinationListFormDTO.java | 20 +++++++++
.../dto/result/VaccinationListResultDTO.java | 45 +++++++++++++++++++
.../epmet/excel/VaccinationExportExcel.java | 3 ++
...IcEpidemicSpecialAttentionServiceImpl.java | 23 ++++++++++
.../mapper/IcEpidemicSpecialAttentionDao.xml | 38 +++++++++++++++-
5 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
index fc69f5da84..23da9d859b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
@@ -54,6 +54,26 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable
* 备注，核酸检测关注名单，此字段可填可不填
*/
private String remark;
+ /**
+ * 所属小区ID
+ */
+ private String villageId;
+
+ /**
+ * 所属楼宇Id
+ */
+ private String buildId;
+
+ /**
+ * 单元id
+ */
+ private String unitId;
+
+ /**
+ * 所属家庭Id
+ */
+ private String homeId;
+
private String userId;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
index a0b10a13d3..a2012686fe 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
@@ -55,6 +55,51 @@ public class VaccinationListResultDTO implements Serializable {
*/
private String lastInformTime;
+ /**
+ * 所属小区ID
+ */
+ private String villageId;
+
+ /**
+ * 所属小区名称
+ */
+ private String villageName;
+
+ /**
+ * 所属楼宇Id
+ */
+ private String buildId;
+
+ /**
+ * 所属楼宇名称
+ */
+ private String buildName;
+
+ /**
+ * 单元id
+ */
+ private String unitId;
+
+ /**
+ * 单元名称
+ */
+ private String unitName;
+
+ /**
+ * 所属家庭Id
+ */
+ private String homeId;
+
+ /**
+ * 所属家庭名称
+ */
+ private String homeName;
+
+ /**
+ * 小区名+楼栋名+单元名+房屋名
+ */
+ private String allName;
+
public VaccinationListResultDTO() {
this.vaccinationCount = NumConstant.ZERO;
this.name = "";
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java
index 65534756cd..8fe217466f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java
@@ -32,4 +32,7 @@ public class VaccinationExportExcel {
@Excel(name = "最近一次通知时间",width = 20)
private String lastInformTime;
+ @Excel(name = "所属房屋",width = 40)
+ private String allName;
+
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index f27bc46842..94ed60ce9f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcEpidemicSpecialAttentionDao;
import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
import com.epmet.dto.form.*;
+import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.dto.result.VaccinationListResultDTO;
import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
@@ -30,6 +31,7 @@ import com.epmet.enums.ChannelEnum;
import com.epmet.excel.ImportEpidemicSpecialAttention;
import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.feign.OssFeignClient;
import com.epmet.service.IcEpidemicSpecialAttentionService;
import com.epmet.service.IcNoticeService;
@@ -53,6 +55,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -71,6 +74,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl page(Map params) {
@@ -160,10 +165,28 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl houseInfoMap = new HashMap<>();
+ //查询房屋信息
+ if (result.getList().size() > NumConstant.ZERO) {
+ Set houseIds = result.getList().stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet());
+ Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+ List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
+ houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+ }
+
int i = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
for (VaccinationListResultDTO v : result.getList()) {
i += 1;
v.setSort(i);
+ if (null != houseInfoMap && houseInfoMap.containsKey(v.getHomeId())) {
+ v.setVillageName(houseInfoMap.get(v.getHomeId()).getNeighborHoodName());
+ v.setBuildName(houseInfoMap.get(v.getHomeId()).getBuildingName());
+ v.setUnitName(houseInfoMap.get(v.getHomeId()).getUnitName());
+ v.setHomeName(houseInfoMap.get(v.getHomeId()).getDoorName());
+ v.setAllName(houseInfoMap.get(v.getHomeId()).getAllName());
+ }
}
return result;
}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
index 0340d288bd..2b063d7094 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@@ -26,13 +26,18 @@
a.ID_CARD,
a.reason,
a.REMARK,
+ b.VILLAGE_ID,
+ b.BUILD_ID,
+ b.UNIT_ID,
+ b.HOME_ID,
IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
IFNULL(v.vaccinationCount,0) AS vaccinationCount
FROM ic_epidemic_special_attention a
+ LEFT JOIN ic_resi_user b ON a.id_card = b.id_card
LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD)
WHERE a.DEL_FLAG = 0
AND a.ORG_ID = #{orgId}
- AND ATTENTION_TYPE = #{attentionType}
+ AND a.ATTENTION_TYPE = #{attentionType}
AND a.`NAME` LIKE CONCAT('%',#{name},'%')
@@ -42,6 +47,18 @@
AND a.ID_CARD LIKE CONCAT('%',#{idCard},'%')
+
+ AND b.village_id = #{villageId}
+
+
+ AND b.build_id = #{buildId}
+
+
+ AND b.unit_id = #{unitId}
+
+
+ AND b.home_id = #{homeId}
+
HAVING vaccinationCount = #{vaccinationCount}
@@ -56,11 +73,16 @@
a.ID_CARD,
a.REMARK,
a.REASON,
+ b.VILLAGE_ID,
+ b.BUILD_ID,
+ b.UNIT_ID,
+ b.HOME_ID,
IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime
FROM ic_epidemic_special_attention a
+ LEFT JOIN ic_resi_user b ON a.id_card = b.id_card
WHERE a.DEL_FLAG = 0
AND a.ORG_ID = #{orgId}
- AND ATTENTION_TYPE = #{attentionType}
+ AND a.ATTENTION_TYPE = #{attentionType}
AND a.`NAME` LIKE CONCAT('%',#{name},'%')
@@ -76,6 +98,18 @@
AND a.REMARK LIKE CONCAT('%',#{remark},'%')
+
+ AND b.village_id = #{villageId}
+
+
+ AND b.build_id = #{buildId}
+
+
+ AND b.unit_id = #{unitId}
+
+
+ AND b.home_id = #{homeId}
+
ORDER BY a.CREATED_TIME DESC
From 45477714089131a74b132ce9fcc2569cd803448b Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 13 Apr 2022 10:24:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=9A=E6=A0=B9=E6=8D=AE=E5=B0=8F=E5=8C=BA?=
=?UTF-8?q?=E3=80=81=E6=A5=BC=E6=A0=8B=E3=80=81=E5=8D=95=E5=85=83=E3=80=81?=
=?UTF-8?q?=E9=97=A8=E7=89=8C=E5=8F=B7(=E5=88=86=E5=88=AB=E6=8C=89?=
=?UTF-8?q?=E7=85=A7=E6=95=B0=E5=AD=97=E5=92=8C=E4=B8=AD=E6=96=87)?=
=?UTF-8?q?=E5=88=86=E5=88=AB=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/controller/HouseController.java | 9 +-
.../main/java/com/epmet/dao/IcHouseDao.java | 11 +-
.../java/com/epmet/service/HouseService.java | 3 +-
.../epmet/service/impl/HouseServiceImpl.java | 9 +-
.../src/main/resources/mapper/IcHouseDao.xml | 152 +-----------------
5 files changed, 15 insertions(+), 169 deletions(-)
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 d001801185..316ab3e12f 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
@@ -89,11 +89,9 @@ public class HouseController implements ResultDataResolver {
//效验数据
ValidatorUtils.validateEntity(formDTO);
- String queryScene = "house_manage";
-
IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(),
formDTO.getOwnerPhone(), null,
- null, queryScene,
+ null,
formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag());
return new Result().ok(icNeighborHoodResultDTO);
@@ -129,9 +127,6 @@ public class HouseController implements ResultDataResolver {
buildingName = null;
}
- // 使用场景:社区查询
- String scene = "community_search";
-
LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
form.setUserId(loginUser.getUserId());
form.setClient(loginUser.getClient());
@@ -142,7 +137,7 @@ public class HouseController implements ResultDataResolver {
null);
IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null,
- neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null);
+ neighborhoodName, buildingName, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null);
return new Result().ok(icNeighborHoodResultDTO);
}
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 686f2f01b8..6841d60ce3 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
@@ -24,14 +24,6 @@ import java.util.Set;
@Mapper
public interface IcHouseDao extends BaseDao {
-// IPage> searchHouseByPage(IPage page,
-// @Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper,
-// @Param("ew1") QueryWrapper buildingEntityQueryWrapper,
-// @Param("ew2") QueryWrapper houseEntityQueryWrapper);
-// IPage> searchHouseByPage(IPage page,
-// @Param("neighbor") IcNeighborHoodEntity neighbor,
-// @Param("building") IcBuildingEntity building,
-// @Param("house") IcHouseEntity house);
IPage> searchHouseByPage(IPage page,
@Param("pids") String pids,
@Param("buildingId") String buildingId,
@@ -39,7 +31,6 @@ public interface IcHouseDao extends BaseDao {
@Param("ownerPhone") String ownerPhone,
@Param("neighborHoodName") String neighborHoodName,
@Param("buildingName") String buildingName,
- @Param("queryScene") String queryScene,
@Param("id")String id,
@Param("level")String level,
@Param("rentFlag")String rentFlag);
@@ -104,4 +95,4 @@ public interface IcHouseDao extends BaseDao {
*/
List getHousesNameByIdCards(@Param("idCards") List idCards);
-}
\ No newline at end of file
+}
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 59e7e3c973..04413fb902 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
@@ -60,7 +60,6 @@ public interface HouseService {
String ownerPhone,
String neighborHoodName,
String buildingName,
- String queryScene,
Integer pageNo,
Integer pageSize,
String id,
@@ -82,4 +81,4 @@ public interface HouseService {
void allDelete(NeighborHoodManageDelFormDTO formDTO);
HouseInfoDTO getHouseInfoDTO(String customerId,String houseId);
-}
\ No newline at end of file
+}
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 cbf82419a4..6d92f82fab 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
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException;
@@ -254,26 +255,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
String ownerPhone,
String neighborHoodName,
String buildingName,
- String queryScene,
Integer pageNo,
Integer pageSize,
String id,String level, String rentFlag) {
IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO();
- //如果类型是house 查房屋
- //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
-
// 查询pids
String pids = null;
if (StringUtils.isNotBlank(ancestorAgencyId)) {
pids = getPids(ancestorAgencyId);
}
- if (StringUtils.isNotBlank(level) && level.equals("agency")){
+ if (StringUtils.isNotBlank(level) && OrgTypeEnum.AGENCY.getCode().equals(level)){
pids = getPids(ancestorAgencyId);
}
IPage page = new Page(pageNo,pageSize);
- IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene,id,level,rentFlag);
+ IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName,id,level,rentFlag);
List> records = mapIPage.getRecords();
records.forEach(item->{
item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
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 19e99c1eff..b2b6b99b29 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
@@ -70,83 +70,6 @@
)
-
-
-