Merge branch 'develop' into release_temp

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

@@ -336,4 +336,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Date 2021/10/25 16:04
      */
     List<UnitDTO> selectUnitList(@Param("buildingId") String buildingId);
+
+    /**
+     * @Author sun
+     * @Description 查询组织下直属网格列表
+     **/
+    List<CustomerGridEntity> selectByPid(@Param("pid") String pid);
 }

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

@@ -56,7 +56,8 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
 
     List<CustomerAgencyEntity> selectAgencyChildrenList(@Param("agencyId") String agencyId);
 
-    List<Map<String, Object>> selectListByName(@Param("neighborNameList")ArrayList<String> strings,
+    List<Map<String, Object>> selectListByName(@Param("customerId") String customerId,
+                                               @Param("neighborNameList")ArrayList<String> strings,
                                                @Param("buildingNameList") ArrayList<String> strings1,
                                                @Param("buildingUnitList") ArrayList<Integer> integers);
 

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

@@ -43,7 +43,8 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
 //    List<IcNeighborHoodExcel> searchAllNeighborhood(@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
     List<IcNeighborHoodExcel> searchAllNeighborhood(@Param("neighbor") IcNeighborHoodEntity neighbor, @Param("house")IcHouseEntity house);
 
-    List<IcNeighborHoodEntity> selectListByName(@Param("neighborNameList")List<String> neighborNameList,
+    List<IcNeighborHoodEntity> selectListByName(@Param("customerId") String customerId,
+                                                @Param("neighborNameList")List<String> neighborNameList,
                                                 @Param("agencyNameList") List<String> agencyNameList,
                                                 @Param("gridNameList") List<String> gridNameList);
 

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

@@ -236,7 +236,7 @@ public class BuildingServiceImpl implements BuildingService {
         Set<String> neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toSet());
         Set<String> agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toSet());
         Set<String> gridNameList = list.stream().map(item -> item.getGridName()).collect(Collectors.toSet());
-        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectListByName(new ArrayList<String>(neighborNameList),new ArrayList<String>(agencyNameList),new ArrayList<String>(gridNameList));
+        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectListByName(customerId, new ArrayList<String>(neighborNameList),new ArrayList<String>(agencyNameList),new ArrayList<String>(gridNameList));
 //        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getNeighborHoodName, neighborNameList));
         Map<String,IcNeighborHoodEntity> neighborHoodMap =  neighborHoodList.stream().collect(Collectors.toMap(IcNeighborHoodEntity::getNeighborHoodName, Function.identity(),(key1, key2)->key1));
 

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

@@ -153,7 +153,7 @@ public class HouseServiceImpl implements HouseService {
         Set<String> neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toSet());
         Set<String> buildingNameList = list.stream().map(item -> item.getBuildingName()).collect(Collectors.toSet());
         Set<Integer> buildingUnitList = list.stream().map(item -> item.getBuildingUnit()).collect(Collectors.toSet());
-        List<Map<String,Object>> buildMapList =  icBuildingDao.selectListByName(new ArrayList<String>(neighborNameList),new ArrayList<String>(buildingNameList),new ArrayList<Integer>(buildingUnitList));
+        List<Map<String,Object>> buildMapList =  icBuildingDao.selectListByName(customerId, new ArrayList<String>(neighborNameList),new ArrayList<String>(buildingNameList),new ArrayList<Integer>(buildingUnitList));
         //转Map
         Map<String,Map<String,Object>> buildMap = new HashMap<>();
         buildMapList.forEach(item->{

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

@@ -243,6 +243,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
     public List<Integer> importExcel(String customerId,List<IcNeighborHoodExcel> list,String staffId, List<Integer> numList) {
         //2021.11.9 需求变更 当前工作人员只能导致自己所属组织下数据，网格名对应不上的数据舍弃【注：需求就这样】 sun
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        //查询当前组织下网格列表
+        List<CustomerGridEntity> customerGridList = customerGridDao.selectByPid(staffInfoCache.getAgencyId());
         //组织名称不一样的数据舍弃
         Iterator<IcNeighborHoodExcel> iterator = list.iterator();
         while (iterator.hasNext()) {
@@ -251,6 +253,14 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
                 numList.add(obj.getRowNum());
                 iterator.remove();
             }
+            //当前组织下网格名不存在的也不允许导入
+            customerGridList.forEach(g->{
+                if(!obj.getGridName().trim().equals(g.getGridName())){
+                    numList.add(obj.getRowNum());
+                    iterator.remove();
+                }
+            });
+
         }
         //end sun
 
@@ -260,13 +270,15 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
         }
         //获取所有组织 list
         List<String> agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toList());
+        agencyNameList = agencyNameList.stream().distinct().collect(Collectors.toList());
         //获取所有网格 list
-        List<String> gridNameList = list.stream().map(item->item.getGridName()).collect(Collectors.toList());
+        //List<String> gridNameList = list.stream().map(item->item.getGridName()).collect(Collectors.toList());
         //获取所有物业 list
         List<String> propertyNameList = list.stream().map(item->item.getPropertyName()).collect(Collectors.toList());
+        propertyNameList = propertyNameList.stream().distinct().collect(Collectors.toList());
         //查询对应的id
         List<CustomerAgencyEntity> customerAgencyList = customerAgencyDao.selectList(new QueryWrapper<CustomerAgencyEntity>().lambda().in(CustomerAgencyEntity::getOrganizationName, agencyNameList));
-        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getGridName, gridNameList));
+        //List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getGridName, gridNameList));
         List<IcPropertyManagementEntity> icPropertyManagementList = icPropertyManagementDao.selectList(new QueryWrapper<IcPropertyManagementEntity>().lambda().in(IcPropertyManagementEntity::getName, propertyNameList));
 
         Map<String,CustomerAgencyEntity> agencyMap =  customerAgencyList.stream().collect(Collectors.toMap(CustomerAgencyEntity::getOrganizationName, Function.identity(),(key1, key2)->key1));

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

@@ -680,5 +680,13 @@
             DEL_FLAG = '0'
             AND BUILDING_ID = #{buildingId}
     </select>
+    <select id="selectByPid" resultType="com.epmet.entity.CustomerGridEntity">
+        SELECT
+            *
+        FROM customer_grid
+        WHERE
+            del_flag = '0'
+        AND pid = {pid}
+    </select>
 
 </mapper>

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

@@ -283,7 +283,9 @@
         <foreach collection="buildingUnitList" open="(" separator="," close=")" item="val">
             #{val}
         </foreach>
-        WHERE a.DEL_FLAG = '0' and a.NEIGHBOR_HOOD_NAME in
+        WHERE a.DEL_FLAG = '0'
+        AND a.CUSTOMER_ID = #{customerId}
+        and a.NEIGHBOR_HOOD_NAME in
         <foreach collection="neighborNameList" open="(" separator="," close=")" item="val">
             #{val}
         </foreach>

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

@@ -193,7 +193,9 @@
         <foreach collection="gridNameList" open="(" separator="," close=")" item="val">
             #{val}
         </foreach>
-        where a.DEL_FLAG= '0'and  a.NEIGHBOR_HOOD_NAME in
+        where a.DEL_FLAG= '0'
+        AND a.CUSTOMER_ID = #{customerId}
+        and a.NEIGHBOR_HOOD_NAME in
         <foreach collection="neighborNameList" open="(" separator="," close=")" item="val">
             #{val}
         </foreach>