queryLianHuHouse

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java

@@ -0,0 +1,75 @@
+package com.epmet.dto.result.lingshan;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 灵山_党员中心户联户
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-16
+ */
+@Data
+public class LingshanPartyCenterHouseLianhuDTO implements Serializable {
+
+    /**
+     * 主键（联户记录表）
+     */
+    @JsonIgnore
+	private String id;
+
+    /**
+     * 客户id
+     */
+    @JsonIgnore
+	private String customerId;
+
+    /**
+     * 党员中心户房屋id：lingshan_party_center_house.HOUSE_ID
+     */
+    @JsonIgnore
+	private String partyCenterHouseId;
+
+    /**
+     * 联户：房屋所属组织id
+     */
+    @JsonIgnore
+	private String agencyId;
+
+    /**
+     * 联户：房屋所属网格id
+     */
+    @JsonIgnore
+	private String gridId;
+
+    /**
+     * 联户：grid_id的path。包含grid_id
+     */
+    @JsonIgnore
+	private String gridIdPath;
+
+    /**
+     * 联户：小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 联户：楼栋id
+     */
+	private String buildingId;
+
+    /**
+     * 联户：单元id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 联户：联户房屋id
+     */
+	private String houseId;
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@@ -29,11 +29,11 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.HouseAgencyInfoResultDTO;
-import com.epmet.dto.result.lingshan.HouseTreeDTO;
+import com.epmet.dto.result.HouseInfoDTO;
-import com.epmet.dto.result.lingshan.HouseTreeFormDTO;
+import com.epmet.dto.result.HouseListResultDTO;
-import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuFormDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
-import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
+import com.epmet.dto.result.lingshan.*;
 import com.epmet.service.IcHouseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -199,10 +199,10 @@ public class IcHouseController {
      * @param partyCenterHouseId
      * @return
      */
-    @PostMapping("queryLianHuHouseId/{partyCenterHouseId}")
+    @PostMapping("queryLianHuHouse/{partyCenterHouseId}")
-    public Result<List<String>> queryLianHuHouseId(@PathVariable("partyCenterHouseId") String partyCenterHouseId) {
+    public Result<List<LingshanPartyCenterHouseLianhuDTO>> queryLianHuHouse(@PathVariable("partyCenterHouseId") String partyCenterHouseId) {
-        List<String> list = icHouseService.queryLianHuHouseId(partyCenterHouseId);
+        List<LingshanPartyCenterHouseLianhuDTO> list = icHouseService.queryLianHuHouse(partyCenterHouseId);
-        return new Result<List<String>>().ok(list);
+        return new Result<List<LingshanPartyCenterHouseLianhuDTO>>().ok(list);
     }
 
     /**

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

@@ -4,8 +4,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /**
  * 灵山_党员中心户联户
  *
@@ -15,12 +13,5 @@ import java.util.List;
 @Mapper
 public interface LingshanPartyCenterHouseLianhuDao extends BaseDao<LingshanPartyCenterHouseLianhuEntity> {
 
-    /**
-     * 查询党员中心对应的联户房屋id
-     * @param partyCenterHouseId
-     * @return
-     */
-    List<String> queryLianHuHouseId(String partyCenterHouseId);
-
     int deleteByPartyCenterHouseId(String partyCenterHouseId);
 }

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

@@ -15,6 +15,7 @@ import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.dto.result.lingshan.HouseTreeDTO;
+import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -164,7 +165,7 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @param partyCenterHouseId
      * @return
      */
-    List<String> queryLianHuHouseId(String partyCenterHouseId);
+    List<LingshanPartyCenterHouseLianhuDTO> queryLianHuHouse(String partyCenterHouseId);
 
     /**
      * 灵山项目-绑定联户时候，选择同网格内的房屋

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

@@ -26,6 +26,7 @@ import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.result.lingshan.HouseTreeDTO;
+import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
 import com.epmet.entity.*;
@@ -492,11 +493,14 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      * @return
      */
     @Override
-    public List<String> queryLianHuHouseId(String partyCenterHouseId) {
+    public List<LingshanPartyCenterHouseLianhuDTO> queryLianHuHouse(String partyCenterHouseId) {
         if(StringUtils.isBlank(partyCenterHouseId)){
             return new ArrayList<>();
         }
-        return partyCenterHouseLianhuDao.queryLianHuHouseId(partyCenterHouseId);
+        LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId);
+        List<LingshanPartyCenterHouseLianhuEntity> list=partyCenterHouseLianhuDao.selectList(queryWrapper);
+        return ConvertUtils.sourceToTarget(list,LingshanPartyCenterHouseLianhuDTO.class);
     }
 
     /**

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

@@ -22,16 +22,6 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <!--    查询党员中心对应的联户房屋id  -->
-    <select id="queryLianHuHouseId" parameterType="java.lang.String" resultType="java.lang.String">
-        SELECT
-            distinct h.HOUSE_ID
-        FROM
-            lingshan_party_center_house_lianhu h
-        WHERE
-            h.DEL_FLAG = '0'
-          AND h.PARTY_CENTER_HOUSE_ID = #{partyCenterHouseId}
-    </select>
 
     <delete id="deleteByPartyCenterHouseId" parameterType="java.lang.String">
         delete from lingshan_party_center_house_lianhu where PARTY_CENTER_HOUSE_ID=#{partyCenterHouseId}