luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改更新中心点 按组织去修改

master
jianjun 4 years ago
parent
e3682cb613
commit
ed698777dd
6 changed files with 62 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java
  2. 67
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
  3. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
  4. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
  5. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
  6. 13
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml

1
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java
View File

@ -16,6 +16,7 @@ public class GridCenterPointForm implements Serializable {
private static final long serialVersionUID = -6988009829971668860L;
private String customerId;
private String pids;
private List<CenterPointForm> centerDataList = new ArrayList<>();

67
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
View File

@ -40,8 +40,8 @@ import java.util.List;
@Mapper
public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity> {
/**
*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<ScreenCustomerGridEntity>
/**
* 15、网格信息上传
* 2) 在批量新增
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerGrid(@Param("list") List<CustomerGridFormDTO> list, @Param("customerId")String customerId);
void batchInsertCustomerGrid(@Param("list") List<CustomerGridFormDTO> 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<ScreenCustomerGridEntity>
Integer selectCountByCustomerId(@Param("customerId") String customerId);
/**
* @return java.util.List<com.epmet.dto.ScreenCustomerGridDTO>
* @param customerId
* @return java.util.List<com.epmet.dto.ScreenCustomerGridDTO>
* @author yinzuomei
* @description 查询客户下网格信息
* @Date 2020/8/26 15:33
**/
List<ScreenCustomerGridDTO> selectListByCustomerId(@Param("customerId")String customerId);
List<ScreenCustomerGridDTO> selectListByCustomerId(@Param("customerId") String customerId);
/**
* @return java.util.List<com.epmet.dto.ScreenCustomerGridDTO>
* @param formDTO
* @return java.util.List<com.epmet.dto.ScreenCustomerGridDTO>
* @author yinzuomei
* @description 分页查询网格列表
* @Date 2020/8/27 14:42
@ -89,7 +89,7 @@ public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity>
List<ScreenCustomerGridDTO> 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<ScreenCustomerGridEntity>
* @Date 10:45 2020-09-04
**/
List<ScreenCustomerGridDTO> selectListMismatchGridInfo(@Param("customerId") String customerId,
@Param("gridIds") String[] gridIds,
@Param("customerAreaCode") String customerAreaCode,
@Param("subCustomerIds")List<String> subCustomerIds);
@Param("gridIds") String[] gridIds,
@Param("customerAreaCode") String customerAreaCode,
@Param("subCustomerIds") List<String> subCustomerIds);
/**
* 根据客户id 查询网格(党支部)详细信息
*
* @param customerId
* @return java.util.List<com.epmet.dto.ScreenCustomerGridDTO>
* @Author zhangyong
* @Date 16:57 2020-09-03
**/
List<ScreenCustomerGridDTO> selectListGridInfo(@Param("customerId")String customerId,
List<ScreenCustomerGridDTO> selectListGridInfo(@Param("customerId") String customerId,
@Param("customerAreaCode") String customerAreaCode,
@Param("subCustomerIds")List<String> subCustomerIds);
@Param("subCustomerIds") List<String> subCustomerIds);
/**
* @Description 根据agencyId查询网格ID
* @param agencyId
* @Description 根据agencyId查询网格ID
* @author zxc
* @date 2020/9/22 2:16 下午
*/
List<String> selectGridIdByAgencyId(@Param("agencyId")String agencyId);
List<String> selectGridIdByAgencyId(@Param("agencyId") String agencyId);
ScreenCustomerGridEntity getLastAddGrid();
@ -137,58 +138,59 @@ public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity>
ScreenCustomerGridEntity getByGridId(String gridId);
/**
* @Description 查询客户下所有网格ID
* @param customerId
* @param dateId
* @Description 查询客户下所有网格ID
* @author zxc
* @date 2020/9/23 3:10 下午
*/
List<PartyBaseInfoFormDTO> selectAllGridIdToParty(String customerId, String dateId);
/**
* @Description 查询客户下所有网格ID
* @Description 查询客户下所有网格ID
* @Param customerId
* @Param monthId
* @author zxc
* @date 2020/9/25 10:43 上午
*/
List<ScreenPartyLinkMassesDataFormDTO> selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId,@Param("monthId") String monthId);
List<ScreenPartyBranchDataFormDTO> selectAllGridIdToOrganize(@Param("customerId") String customerId,@Param("monthId") String monthId);
List<ScreenPartyLinkMassesDataFormDTO> selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<ScreenPartyBranchDataFormDTO> selectAllGridIdToOrganize(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 查询org名称
* @param gridIds
* @Description 查询org名称
* @author zxc
* @date 2020/9/24 1:27 下午
*/
List<OrgNameResultDTO> selectOrgName(@Param("gridIds") List<String> gridIds);
/**
* @Description 查询机关的直属网格
* @param agencyIds
* @Description 查询机关的直属网格
* @author zxc
* @date 2020/9/24 2:33 下午
*/
List<GridInfoResultDTO> selectDirectGrid(@Param("agencyIds") List<String> agencyIds);
/**
* @Description 查询全部网格信息
* @param customerId
* @Description 查询全部网格信息
* @author zxc
* @date 2020/9/19 10:50 上午
*/
List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId);
/**
* @Description 查询全部网格信息
* @param customerId
* @Description 查询全部网格信息
* @author zxc
* @date 2020/9/18 10:47 上午
*/
List<GovernAbilityGridMonthlyFormDTO> 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<ScreenCustomerGridEntity>
List<ScreenProjectGridDailyDTO> selectGridInfoByCustomerId(@Param("customerId") String customerId);
/**
* @Description 查询直属网格信息
* @Description 查询直属网格信息
* @Param customerId
* @Param level
* @author zxc
* @date 2021/3/23 下午4:03
*/
List<ScreenCustomerGridDTO> selectBelongGridInfo(@Param("customerId") String customerId,@Param("level") String level);
List<ScreenCustomerGridDTO> selectBelongGridInfo(@Param("customerId") String customerId, @Param("level") String level);
/**
* desc: 根据客户Id 和pids 获取该客户下及该组织下的网格列表
*
* @param customerId
* @param pids
* @return java.util.List<com.epmet.dto.screen.ScreenProjectGridDailyDTO>
* @author LiuJanJun
* @date 2021/6/10 10:45 上午
*/
List<ScreenProjectGridDailyDTO> selectGridInfoList(@Param("customerId") String customerId, @Param("pids") String pids);
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
View File

@ -107,4 +107,6 @@ public interface ScreenCustomerGridService extends BaseService<ScreenCustomerGri
Integer updateCenterPointByName(String customerId, String title, List<Double> center);
List<ScreenProjectGridDailyDTO> selectGridInfoByCustomerId(String customerId);
List<ScreenProjectGridDailyDTO> selectGridInfoList(String customerId, String pids);
}

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
View File

@ -205,4 +205,9 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
public List<ScreenProjectGridDailyDTO> selectGridInfoByCustomerId(String customerId) {
return baseDao.selectGridInfoByCustomerId(customerId);
}
@Override
public List<ScreenProjectGridDailyDTO> selectGridInfoList(String customerId, String pids) {
return baseDao.selectGridInfoList(customerId,pids);
}
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
View File

@ -137,7 +137,7 @@ public class EIDimServiceImpl implements EIDimService {
@Override
public Map<String, Integer> updateCenterPointByName(GridCenterPointForm param) {
List<ScreenProjectGridDailyDTO> gridInfos = screenCustomerGridService.selectGridInfoByCustomerId(param.getCustomerId());
List<ScreenProjectGridDailyDTO> gridInfos = screenCustomerGridService.selectGridInfoList(param.getCustomerId(),param.getPids());
Map<String, Integer> result = new HashMap<>();
gridInfos.forEach(grid -> {

13
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
View File

@ -372,5 +372,18 @@
AND scg.DEL_FLAG = 0
AND scg.CUSTOMER_ID = #{customerId}
</select>
<select id="selectGridInfoList" resultType="com.epmet.dto.screen.ScreenProjectGridDailyDTO">
SELECT
cg.CUSTOMER_ID,
cg.GRID_ID,
cg.GRID_NAME,
cg.PARENT_AGENCY_ID AS pid,
cg.AREA_CODE,
cg.CENTER_MARK
FROM screen_customer_grid cg
WHERE cg.DEL_FLAG = 0
AND cg.CUSTOMER_ID = #{customerId}
AND cg.ALL_PARENT_IDS like concat(#{pids},'%')
</select>
</mapper>

Write Preview
Loading…
Cancel
Save