Merge branch 'lingshan_master' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/AgentServiceResiSubmitFormDTO.java

@@ -32,4 +32,8 @@ public class AgentServiceResiSubmitFormDTO {
     @NotNull(message = "预约服务时间不能为空", groups = { Create.class })
     private Date exceptServeTime;
     private List<String> attachmentsList;
+
+    private String longitude;
+
+    private String latitude;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -409,7 +409,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         // 未办结事件
         q.eq(LingshanAgentServiceRecordEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
         q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath);
-        q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.ACCEPTED); //已受理=未办结
+        q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()); //已受理=未办结
 
         rl.add(new ScreenCatalogueQtyStatsRstDTO("service_unclosed", "未办结事件", agentServiceRecordDao.selectCount(q)));
 
@@ -417,7 +417,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         q.clear();
         q.eq(LingshanAgentServiceRecordEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
         q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath);
-        q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.CLOSED); //已受理=未办结
+        q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.CLOSED.getStatusCode()); //已受理=未办结
 
         rl.add(new ScreenCatalogueQtyStatsRstDTO("service_closed", "已办结事件", agentServiceRecordDao.selectCount(q)));
 

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

@@ -18,10 +18,10 @@ public class PartyCenterHouseBindLianHuDetailDTO {
     private String id;
 
     /**
-     * 小区：
+     * 小区：neighborHood
-     * 楼栋：
+     * 楼栋：building
-     * 单元：
+     * 单元：unit
-     * 房屋
+     * 房屋:house
      */
     private String type;
 }

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

@@ -12,6 +12,6 @@ import java.util.List;
 @Data
 public class PartyCenterHouseBindLianHuFormDTO {
     private String partyCenterHouseId;
-    private List<String> lianHuHouseIdList;
+    private List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList;
 }
 

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

@@ -21,4 +21,6 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao<LingshanParty
      * @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

@@ -16,6 +16,7 @@ import com.epmet.dto.result.HouseAgencyInfoResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
+import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
 import com.epmet.entity.IcHouseEntity;
 
@@ -162,7 +163,7 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @param partyCenterHouseId
      * @param lianHuHouseIdList
      */
-    void bingLianHu(String partyCenterHouseId, List<String> lianHuHouseIdList);
+    void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList);
 
     /**
      * 灵山项目-查询联户房屋列表

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

@@ -32,6 +32,7 @@ import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
 import com.epmet.entity.*;
 import com.epmet.entity.*;
@@ -604,30 +605,47 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      * @param lianHuHouseIdList
      */
     @Override
-    public void bingLianHu(String partyCenterHouseId, List<String> lianHuHouseIdList) {
+    public void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseIdList) {
         IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId);
         IcNeighborHoodEntity neighborHoodEntity=icNeighborHoodDao.selectById(partyCenterHouse.getNeighborHoodId());
         CustomerGridDTO gridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(neighborHoodEntity.getGridId());
+        String gridIdPath=PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids());
+
         // 先删除
         LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> queryWrapper=new LambdaQueryWrapper<>();
         queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId);
-        partyCenterHouseLianhuDao.delete(queryWrapper);
+        partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(partyCenterHouseId);
         // 后插入
         lianHuHouseIdList.forEach(lianHuHouseId->{
-            IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouseId);
+            //根据选中类型，查询下面的房屋
-            if(null!=icHouseEntity){
+            List<IcHouseEntity> list=new ArrayList<>();
+            if(!"house".equals(lianHuHouseId.getType())){
+                LambdaQueryWrapper<IcHouseEntity> query = new LambdaQueryWrapper<>();
+                query.eq("neighborHood".equals(lianHuHouseId.getType()), IcHouseEntity::getNeighborHoodId, lianHuHouseId.getId())
+                        .eq("building".equals(lianHuHouseId.getType()), IcHouseEntity::getBuildingId, lianHuHouseId.getId())
+                        .eq("unit".equals(lianHuHouseId.getType()), IcHouseEntity::getBuildingUnitId, lianHuHouseId.getId());
+                list.addAll(baseDao.selectList(query));
+            }else{
+                IcHouseEntity icHouseEntity=baseDao.selectById(lianHuHouseId.getId());
+                list.add(icHouseEntity);
+            }
+            if(CollectionUtils.isNotEmpty(list)){
+                for(IcHouseEntity houseEntity:list){
                     LingshanPartyCenterHouseLianhuEntity entity=new LingshanPartyCenterHouseLianhuEntity();
-                entity.setCustomerId(neighborHoodEntity.getCustomerId());
                     entity.setPartyCenterHouseId(partyCenterHouseId);
+                    //目前只能绑定同一个网格下的房屋
+                    entity.setCustomerId(neighborHoodEntity.getCustomerId());
                     entity.setAgencyId(neighborHoodEntity.getAgencyId());
                     entity.setGridId(neighborHoodEntity.getGridId());
-                entity.setGridIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()));
+                    entity.setGridIdPath(gridIdPath);
-                entity.setNeighborHoodId(icHouseEntity.getNeighborHoodId());
+
-                entity.setBuildingId(icHouseEntity.getBuildingId());
+                    entity.setNeighborHoodId(houseEntity.getNeighborHoodId());
-                entity.setBuildingUnitId(icHouseEntity.getBuildingUnitId());
+                    entity.setBuildingId(houseEntity.getBuildingId());
-                entity.setHouseId(lianHuHouseId);
+                    entity.setBuildingUnitId(houseEntity.getBuildingUnitId());
+                    entity.setHouseId(houseEntity.getId());
                     partyCenterHouseLianhuDao.insert(entity);
                 }
+            }
         });
     }
 

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

@@ -33,4 +33,7 @@
           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}
+    </delete>
 </mapper>