From ed698777dd83b9703934ce8439490cbe6f0e4b9f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Jun 2021 10:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=82=B9=20=E6=8C=89=E7=BB=84=E7=BB=87=E5=8E=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screen/form/GridCenterPointForm.java | 1 + .../screen/ScreenCustomerGridDao.java | 67 +++++++++++-------- .../screen/ScreenCustomerGridService.java | 2 + .../impl/ScreenCustomerGridServiceImpl.java | 5 ++ .../epmet/service/impl/EIDimServiceImpl.java | 2 +- .../screen/ScreenCustomerGridDao.xml | 13 ++++ 6 files changed, 62 insertions(+), 28 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java index 6859b4a1ee..22d1e569d3 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java @@ -16,6 +16,7 @@ public class GridCenterPointForm implements Serializable { private static final long serialVersionUID = -6988009829971668860L; private String customerId; + private String pids; private List centerDataList = new ArrayList<>(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java index 1d5099bc67..6aa2aacc1c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java @@ -40,8 +40,8 @@ import java.util.List; @Mapper public interface ScreenCustomerGridDao extends BaseDao { /** - *15、网格信息上传 - * 1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条 + * 15、网格信息上传 + * 1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条 * * @param customerId * @return java.util.Integer @@ -52,18 +52,18 @@ public interface ScreenCustomerGridDao extends BaseDao /** * 15、网格信息上传 - * 2) 在批量新增 + * 2) 在批量新增 * * @param list * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId")String customerId); + void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId") String customerId); /** - * @return java.lang.Integer * @param customerId + * @return java.lang.Integer * @author yinzuomei * @description 查询客户下网格总数 * @Date 2020/8/26 15:33 @@ -71,17 +71,17 @@ public interface ScreenCustomerGridDao extends BaseDao Integer selectCountByCustomerId(@Param("customerId") String customerId); /** - * @return java.util.List * @param customerId + * @return java.util.List * @author yinzuomei * @description 查询客户下网格信息 * @Date 2020/8/26 15:33 **/ - List selectListByCustomerId(@Param("customerId")String customerId); + List selectListByCustomerId(@Param("customerId") String customerId); /** - * @return java.util.List * @param formDTO + * @return java.util.List * @author yinzuomei * @description 分页查询网格列表 * @Date 2020/8/27 14:42 @@ -89,7 +89,7 @@ public interface ScreenCustomerGridDao extends BaseDao List pageListByCustomerId(PageQueryGridFormDTO formDTO); /** - * @param gridId 网格id + * @param gridId 网格id * @return java.lang.String * @author yinzuomei * @description 查询网格所属的组织id @@ -107,28 +107,29 @@ public interface ScreenCustomerGridDao extends BaseDao * @Date 10:45 2020-09-04 **/ List selectListMismatchGridInfo(@Param("customerId") String customerId, - @Param("gridIds") String[] gridIds, - @Param("customerAreaCode") String customerAreaCode, - @Param("subCustomerIds")List subCustomerIds); + @Param("gridIds") String[] gridIds, + @Param("customerAreaCode") String customerAreaCode, + @Param("subCustomerIds") List subCustomerIds); /** * 根据客户id 查询网格(党支部)详细信息 + * * @param customerId * @return java.util.List * @Author zhangyong * @Date 16:57 2020-09-03 **/ - List selectListGridInfo(@Param("customerId")String customerId, + List selectListGridInfo(@Param("customerId") String customerId, @Param("customerAreaCode") String customerAreaCode, - @Param("subCustomerIds")List subCustomerIds); + @Param("subCustomerIds") List subCustomerIds); /** - * @Description 根据agencyId查询网格ID * @param agencyId + * @Description 根据agencyId查询网格ID * @author zxc * @date 2020/9/22 2:16 下午 */ - List selectGridIdByAgencyId(@Param("agencyId")String agencyId); + List selectGridIdByAgencyId(@Param("agencyId") String agencyId); ScreenCustomerGridEntity getLastAddGrid(); @@ -137,58 +138,59 @@ public interface ScreenCustomerGridDao extends BaseDao ScreenCustomerGridEntity getByGridId(String gridId); /** - * @Description 查询客户下所有网格ID * @param customerId * @param dateId + * @Description 查询客户下所有网格ID * @author zxc * @date 2020/9/23 3:10 下午 */ List selectAllGridIdToParty(String customerId, String dateId); /** - * @Description 查询客户下所有网格ID + * @Description 查询客户下所有网格ID * @Param customerId * @Param monthId * @author zxc * @date 2020/9/25 10:43 上午 */ - List selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId,@Param("monthId") String monthId); - List selectAllGridIdToOrganize(@Param("customerId") String customerId,@Param("monthId") String monthId); + List selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId, @Param("monthId") String monthId); + + List selectAllGridIdToOrganize(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 查询org名称 * @param gridIds + * @Description 查询org名称 * @author zxc * @date 2020/9/24 1:27 下午 */ List selectOrgName(@Param("gridIds") List gridIds); /** - * @Description 查询机关的直属网格 * @param agencyIds + * @Description 查询机关的直属网格 * @author zxc * @date 2020/9/24 2:33 下午 */ List selectDirectGrid(@Param("agencyIds") List agencyIds); /** - * @Description 查询全部网格信息 * @param customerId + * @Description 查询全部网格信息 * @author zxc * @date 2020/9/19 10:50 上午 */ List selectAllGridInfoToParty(String customerId); /** - * @Description 查询全部网格信息 * @param customerId + * @Description 查询全部网格信息 * @author zxc * @date 2020/9/18 10:47 上午 */ List selectAllGridInfo(@Param("customerId") String customerId); /** - * @Description 查询客户下的网格信息 + * @Description 查询客户下的网格信息 * @Param customerId * @author zxc * @date 2021/1/28 下午3:18 @@ -196,11 +198,22 @@ public interface ScreenCustomerGridDao extends BaseDao List selectGridInfoByCustomerId(@Param("customerId") String customerId); /** - * @Description 查询直属网格信息 + * @Description 查询直属网格信息 * @Param customerId * @Param level * @author zxc * @date 2021/3/23 下午4:03 */ - List selectBelongGridInfo(@Param("customerId") String customerId,@Param("level") String level); + List selectBelongGridInfo(@Param("customerId") String customerId, @Param("level") String level); + + /** + * desc: 根据客户Id 和pids 获取该客户下及该组织下的网格列表 + * + * @param customerId + * @param pids + * @return java.util.List + * @author LiuJanJun + * @date 2021/6/10 10:45 上午 + */ + List selectGridInfoList(@Param("customerId") String customerId, @Param("pids") String pids); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java index d19a8bfca8..f2a40b11c0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java @@ -107,4 +107,6 @@ public interface ScreenCustomerGridService extends BaseService center); List selectGridInfoByCustomerId(String customerId); + + List selectGridInfoList(String customerId, String pids); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java index b7f23a6ba1..b012accfe0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java @@ -205,4 +205,9 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl selectGridInfoByCustomerId(String customerId) { return baseDao.selectGridInfoByCustomerId(customerId); } + + @Override + public List selectGridInfoList(String customerId, String pids) { + return baseDao.selectGridInfoList(customerId,pids); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index f5e8dfb818..54b7068f5e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java @@ -137,7 +137,7 @@ public class EIDimServiceImpl implements EIDimService { @Override public Map updateCenterPointByName(GridCenterPointForm param) { - List gridInfos = screenCustomerGridService.selectGridInfoByCustomerId(param.getCustomerId()); + List gridInfos = screenCustomerGridService.selectGridInfoList(param.getCustomerId(),param.getPids()); Map result = new HashMap<>(); gridInfos.forEach(grid -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml index 84dd04e927..0fca6febf5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml @@ -372,5 +372,18 @@ AND scg.DEL_FLAG = 0 AND scg.CUSTOMER_ID = #{customerId} +