Browse Source

Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

# Conflicts:
#	epmet-module/data-report/data-report-server/pom.xml
dev_shibei_match
yinzuomei 5 years ago
parent
commit
954490e82c
  1. 17
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
  2. 12
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
  3. 18
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
  4. 12
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
  5. 7
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
  6. 6
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
  7. 20
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
  8. 27
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
  9. 3
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
  10. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
  11. 9
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
  12. 51
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
  13. 36
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
  14. 49
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
  15. 31
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java
  16. 86
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
  17. 71
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
  18. 51
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
  19. 51
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
  20. 91
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
  21. 109
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
  22. 72
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
  23. 71
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java
  24. 87
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
  25. 76
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
  26. 51
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
  27. 71
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
  28. 66
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
  29. 72
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
  30. 71
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
  31. 61
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
  32. 221
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
  33. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
  34. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
  35. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
  36. 28
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
  37. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
  38. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
  39. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java
  40. 32
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
  41. 33
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java
  42. 32
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
  43. 32
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
  44. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
  45. 33
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
  46. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
  47. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
  48. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
  49. 33
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
  50. 201
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
  51. 346
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
  52. 63
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
  53. 55
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
  54. 47
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
  55. 47
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
  56. 59
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
  57. 63
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
  58. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
  59. 59
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
  60. 56
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml
  61. 61
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
  62. 58
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
  63. 48
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
  64. 55
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
  65. 53
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
  66. 55
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
  67. 55
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
  68. 51
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml

17
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java

@ -14,22 +14,17 @@ public class BranchResultDTO implements Serializable {
private static final long serialVersionUID = -8001714892170166320L;
/**
* 名称根据当前所在组织查询出的子级名称
* 网格ID
*/
private String name;
private String gridId;
/**
* 可能是agencyId也可以是gridId 也可以是deptId
* 网格名称
*/
private String id;
private String gridName;
/**
* 组织agency 网格grid 部门dept
* 党支部(网格)位置
*/
private String type;
/**
* 中心点位
*/
private String centerMark;
private String partyMark;
}

12
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java

@ -16,31 +16,31 @@ public class ParymemberDistributionResultDTO implements Serializable {
/**
* 可能是gridId,可能是agencyId
*/
private String subId;
private String subId = "";
/**
* 中心点位
*/
private String centerMark;
private String centerMark = "";
/**
* 党员总人数
*/
private Integer totalNum;
private Integer totalNum = 0;
/**
* 坐标区域
*/
private String areaMarks;
private String areaMarks = "";
/**
* 可以是网格的名称可以是组织的名称
*/
private String subName;
private String subName= "";
/**
* 组织agency, 网格 grid
*/
private String type;
private String type = "";
}

18
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java

@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -17,17 +18,28 @@ public class ParymemberResultDTO implements Serializable {
/**
* 当前所选组织
*/
private String agencyId;
private String agencyId = "";
/**
* 当前所选组织名称
*/
private String name;
private String name = "";
/**
* 当前所选组织的坐标区域
*/
private String areaMarks;
private String areaMarks = "";
/**
* 机关级别
* 社区级community
* 街道:street,
* 区县级: district,
* 市级: city
* 省级:province
*/
@JsonIgnore
private String level;
/**
* 子级用户分布

12
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java

@ -1,5 +1,6 @@
package com.epmet.screen.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -29,6 +30,17 @@ public class UserResultDTO implements Serializable {
*/
private String areaMarks;
/**
* 机关级别
* 社区级community
* 街道:street,
* 区县级: district,
* 市级: city
* 省级:province
*/
@JsonIgnore
private String level;
/**
* 子级用户分布
*/

7
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@ -1,5 +1,7 @@
package com.epmet.datareport.controller.screen;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@ -35,9 +37,10 @@ public class AgencyController {
* @author zxc
* @date 2020/8/18 2:04 下午
*/
@ExternalAppRequestAuth
@PostMapping("tree")
public Result<TreeResultDTO> tree(){
return new Result<TreeResultDTO>().ok(agencyService.tree());
public Result<TreeResultDTO> tree(ExternalAppRequestParam externalAppRequestParam){
return new Result<TreeResultDTO>().ok(agencyService.tree(externalAppRequestParam));
}
/**

6
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 中央区相关各指标查询
*
@ -35,9 +37,9 @@ public class DistributionController {
* @date 2020/8/18 10:59 上午
*/
@PostMapping("branch")
public Result<BranchResultDTO> branch(@RequestBody BranchFormDTO formDTO){
public Result<List<BranchResultDTO>> branch(@RequestBody BranchFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
return new Result<BranchResultDTO>().ok(distributionService.branch(formDTO));
return new Result<List<BranchResultDTO>>().ok(distributionService.branch(formDTO));
}
/**

20
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java

@ -17,9 +17,7 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
import com.epmet.screen.dto.result.CompartmentResultDTO;
import com.epmet.screen.dto.result.TreeResultDTO;
import com.epmet.screen.dto.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -66,4 +64,20 @@ public interface ScreenCustomerAgencyDao {
*/
List<AgencyDistributionResultDTO> selectSubDistribution(@Param("agencyId")String agencyId);
/**
* @Description 查询子级用户分布机关级别
* @param parentId
* @author zxc
* @date 2020/8/19 9:33 上午
*/
List<UserDistributionResultDTO> selectUserDistributionAgency(@Param("parentId")String parentId);
/**
* @Description 查询子级党员分布机关级别
* @param parentId
* @author zxc
* @date 2020/8/19 10:30 上午
*/
List<ParymemberDistributionResultDTO> selectParymemberDistribution(@Param("parentId")String parentId);
}

27
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java

@ -18,6 +18,9 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberDistributionResultDTO;
import com.epmet.screen.dto.result.UserDistributionResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -39,5 +42,29 @@ public interface ScreenCustomerGridDao {
* @date 2020/8/18 5:12 下午
*/
List<AgencyDistributionResultDTO> selectSubDistribution(@Param("agencyId")String agencyId);
/**
* @Description 查询党支部信息
* @param agencyId
* @author zxc
* @date 2020/8/19 9:13 上午
*/
List<BranchResultDTO> selectBranch(@Param("agencyId")String agencyId);
/**
* @Description 查询子级用户分布网格级别
* @param parentId
* @author zxc
* @date 2020/8/19 9:33 上午
*/
List<UserDistributionResultDTO> selectUserDistribution(@Param("parentId")String parentId);
/**
* @Description 查询子级党员分布网格级别
* @param parentId
* @author zxc
* @date 2020/8/19 10:30 上午
*/
List<ParymemberDistributionResultDTO> selectParymemberDistribution(@Param("parentId")String parentId);
}

3
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java

@ -1,5 +1,6 @@
package com.epmet.datareport.service.screen;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.screen.dto.form.CompartmentFormDTO;
import com.epmet.screen.dto.result.CompartmentResultDTO;
@ -21,7 +22,7 @@ public interface AgencyService {
* @author zxc
* @date 2020/8/18 2:04 下午
*/
TreeResultDTO tree();
TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam);
/**
* @Description 2组织区域查询

4
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java

@ -7,6 +7,8 @@ import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
import java.util.List;
/**
* 中央区相关各指标查询
*
@ -21,7 +23,7 @@ public interface DistributionService {
* @author zxc
* @date 2020/8/18 10:59 上午
*/
BranchResultDTO branch(BranchFormDTO formDTO);
List<BranchResultDTO> branch(BranchFormDTO formDTO);
/**
* @Description 2用户分布

9
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java

@ -1,5 +1,6 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
@ -35,10 +36,9 @@ public class AgencyServiceImpl implements AgencyService {
* @date 2020/8/18 2:04 下午
*/
@Override
public TreeResultDTO tree() {
public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
// 1. 查询客户根组织ID
// TODO 改成正式注解获取customerId
String customerId = "zxc";
String customerId = externalAppRequestParam.getCustomerId();
TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);
if (null == rootAgency){
return new TreeResultDTO();
@ -74,6 +74,9 @@ public class AgencyServiceImpl implements AgencyService {
@Override
public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());
if (null == agencyAreaInfo){
return agencyAreaInfo;
}
if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
// 当level为"community"时,查询screen_customer_grid表
List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());

51
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java

@ -1,14 +1,19 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
import com.epmet.screen.dto.result.*;
import com.epmet.screen.constant.*;
import com.epmet.datareport.service.screen.DistributionService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 中央区相关各指标查询
*
@ -18,6 +23,11 @@ import org.springframework.stereotype.Service;
@Service
public class DistributionServiceImpl implements DistributionService {
@Autowired
private ScreenCustomerGridDao screenCustomerGridDao;
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
/**
* @Description 1党支部
* @param formDTO
@ -25,8 +35,9 @@ public class DistributionServiceImpl implements DistributionService {
* @date 2020/8/18 10:59 上午
*/
@Override
public BranchResultDTO branch(BranchFormDTO formDTO) {
return null;
public List<BranchResultDTO> branch(BranchFormDTO formDTO) {
List<BranchResultDTO> branchResultDTOS = screenCustomerGridDao.selectBranch(formDTO.getAgencyId());
return branchResultDTOS;
}
/**
@ -37,7 +48,20 @@ public class DistributionServiceImpl implements DistributionService {
*/
@Override
public UserResultDTO user(UserFormDTO userFormDTO) {
return null;
UserResultDTO userResult = new UserResultDTO();
CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(userFormDTO.getAgencyId());
if (null == agencyAreaInfo){
return userResult;
}
BeanUtils.copyProperties(agencyAreaInfo,userResult);
if (userResult.getLevel().equals(ScreenConstant.COMMUNITY)){
List<UserDistributionResultDTO> userDistributionResultDTOS = screenCustomerGridDao.selectUserDistribution(userFormDTO.getAgencyId());
userResult.setUserDistribution(userDistributionResultDTOS);
}else {
List<UserDistributionResultDTO> userDistributionResultDTOS = screenCustomerAgencyDao.selectUserDistributionAgency(userFormDTO.getAgencyId());
userResult.setUserDistribution(userDistributionResultDTOS);
}
return userResult;
}
/**
@ -48,6 +72,19 @@ public class DistributionServiceImpl implements DistributionService {
*/
@Override
public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
return null;
ParymemberResultDTO parymemberResult = new ParymemberResultDTO();
CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(parymemberFormDTO.getAgencyId());
if (null == agencyAreaInfo){
return parymemberResult;
}
BeanUtils.copyProperties(agencyAreaInfo,parymemberResult);
if (parymemberResult.getLevel().equals(ScreenConstant.COMMUNITY)){
List<ParymemberDistributionResultDTO> parymemberDistributionResultDTOS = screenCustomerGridDao.selectParymemberDistribution(parymemberFormDTO.getAgencyId());
parymemberResult.setUserDistribution(parymemberDistributionResultDTOS);
}else {
List<ParymemberDistributionResultDTO> parymemberDistributionResultDTOS = screenCustomerAgencyDao.selectParymemberDistribution(parymemberFormDTO.getAgencyId());
parymemberResult.setUserDistribution(parymemberDistributionResultDTOS);
}
return parymemberResult;
}
}

36
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@ -61,4 +61,40 @@
AND pid = #{agencyId}
</select>
<!-- 查询子级用户分布【机关级别】 -->
<select id="selectUserDistributionAgency" resultType="com.epmet.screen.dto.result.UserDistributionResultDTO">
SELECT
sutd.org_id AS subId,
sca.center_mark AS centerMark,
sutd.user_total AS totalNum,
sca.area_marks AS areaMarks,
sca.agency_name AS subName,
sutd.org_type AS type
FROM
screen_user_total_data sutd
LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
WHERE
sutd.del_flag = '0'
AND sca.del_flag = 0
AND sutd.parent_id = #{parentId}
</select>
<!-- 查询子级党员分布【机关级别】 -->
<select id="selectParymemberDistribution" resultType="com.epmet.screen.dto.result.ParymemberDistributionResultDTO">
SELECT
sutd.org_id AS subId,
sca.center_mark AS centerMark,
sutd.party_total AS totalNum,
sca.area_marks AS areaMarks,
sca.agency_name AS subName,
sutd.org_type AS type
FROM
screen_user_total_data sutd
LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
WHERE
sutd.del_flag = '0'
AND sca.del_flag = 0
AND sutd.parent_id = #{parentId}
</select>
</mapper>

49
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@ -17,4 +17,53 @@
del_flag = 0
AND parent_agency_id = #{agencyId}
</select>
<!-- 查询党支部信息 -->
<select id="selectBranch" resultType="com.epmet.screen.dto.result.BranchResultDTO">
SELECT
grid_id AS gridId,
grid_name AS gridName,
party_mark AS partyMark
FROM
screen_customer_grid
WHERE
del_flag = 0
AND parent_agency_id = #{agencyId}
</select>
<!-- 查询子级用户分布【网格级别】 -->
<select id="selectUserDistribution" resultType="com.epmet.screen.dto.result.UserDistributionResultDTO">
SELECT
sutd.org_id AS subId,
scg.center_mark AS centerMark,
sutd.user_total AS totalNum,
scg.area_marks AS areaMarks,
scg.grid_name AS subName,
sutd.org_type AS type
FROM
screen_user_total_data sutd
LEFT JOIN screen_customer_grid scg ON scg.grid_id = sutd.org_id
WHERE
sutd.del_flag = '0'
AND scg.del_flag = 0
AND sutd.parent_id = #{parentId}
</select>
<!-- 查询子级党员分布【网格级别】 -->
<select id="selectParymemberDistribution" resultType="com.epmet.screen.dto.result.ParymemberDistributionResultDTO">
SELECT
sutd.org_id AS subId,
scg.center_mark AS centerMark,
sutd.party_total AS totalNum,
scg.area_marks AS areaMarks,
scg.grid_name AS subName,
sutd.org_type AS type
FROM
screen_user_total_data sutd
LEFT JOIN screen_customer_grid scg ON scg.grid_id = sutd.org_id
WHERE
sutd.del_flag = '0'
AND scg.del_flag = 0
AND sutd.parent_id = #{parentId}
</select>
</mapper>

31
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ImgDataListDTO.java

@ -0,0 +1,31 @@
package com.epmet.dto.screencoll;
import lombok.Data;
import java.io.Serializable;
/**
* 图片列表
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class ImgDataListDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 原始事件id
*/
private String eventId;
/**
* 图片地址
*/
private String imgUrl;
/**
* 排序
*/
private Integer sort;
}

86
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java

@ -0,0 +1,86 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 2党员基本情况 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class CpcBaseDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 注册用户数
*/
private Integer registerUserCount;
/**
* 群众用户数
*/
private Integer resiTotal;
/**
* 注册党员数
*/
private Integer partyMemberCount;
/**
* 小于20岁
*/
private Integer ageLevel1;
/**
* 20-30岁
*/
private Integer ageLevel2;
/**
* 31-40岁
*/
private Integer ageLevel3;
/**
* 41-50岁
*/
private Integer ageLevel4;
/**
* 51-60岁
*/
private Integer ageLevel5;
/**
* 60+
*/
private Integer ageLevel6;
}

71
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java

@ -0,0 +1,71 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 14组织层级 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class CustomerAgencyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织id
*/
private String agencyId;
/**
* 组织名称
*/
private String agencyName;
/**
* 父级id ,顶级此列为0
*/
private String pid;
/**
* 所有上级ID用逗号分开
*/
private String pids;
/**
* 所有组织名称以-链接
*/
private String allParentNames;
/**
* 坐标区域
*/
private String areaMarks;
/**
* 中心点位
*/
private String centerMark;
/**
* 党工委|街道党委的位置预留字段
*/
private String partyMark;
/**
* 机关级别社区级community 街道:street, 区县级: district, 市级: city 省级:province
*/
private String level;
/**
* 行政地区编码
*/
private String areaCode;
}

51
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java

@ -0,0 +1,51 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 16部门信息上传 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class CustomerDeptFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 部门id
*/
private String deptId;
/**
* 部门名称
*/
private String deptName;
/**
* 部门所属组织id
*/
private String parentAgencyId;
/**
* 坐标区域可空
*/
private String areaMarks;
/**
* 中心点位
*/
private String centerMark;
/**
* 部门所在位置
*/
private String deptMark;
}

51
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java

@ -0,0 +1,51 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 15网格信息上传 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class CustomerGridFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 网格id
*/
private String gridId;
/**
* 网格名称
*/
private String gridName;
/**
* 网格所属组织id
*/
private String parentAgencyId;
/**
* 坐标区域可空
*/
private String areaMarks;
/**
* 中心点位
*/
private String centerMark;
/**
* 党支部的位置
*/
private String partyMark;
}

91
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java

@ -0,0 +1,91 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 3难点赌点 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class DifficultyDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 事件原Id
*/
private String eventId;
/**
* 事件图片 URL
*/
private String eventImgUrl;
/**
* 事件来源 eg: XXX街道-xx社区-网格
*/
private String eventSource;
/**
* 事件内容
*/
private String eventContent;
/**
* 事件耗时单位分钟
*/
private Integer eventCostTime;
/**
* 事件设计部门数
*/
private Integer eventReOrg;
/**
* 事件类别编码
*/
private String eventCategoryCode;
/**
* 事件状态编码
*/
private String eventStatusCode;
/**
* 事件类别名称
*/
private String eventCategoryName;
/**
* 事件状态描述
*/
private String eventStatusDesc;
}

109
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java

@ -0,0 +1,109 @@
package com.epmet.dto.screencoll.form;
import com.epmet.dto.screencoll.ImgDataListDTO;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* 4事件数据(中央区-事件数据) 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class EventDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 原始事件Id
*/
private String eventId;
/**
* 事件名称
*/
private String eventTitle;
/**
* yyyy-MM-dd HH:mm:ss事件时间
*/
private String eventCreateTime;
/**
* 联系人
*/
private String linkMobile;
/**
* 事件内容
*/
private String eventContent;
/**
* 事件图片如果有图片此列为第一张图片
*/
private String eventImgUrl;
/**
* 事件待处理级别 red:yellow , green绿色
*/
private String eventLevel;
/**
* 事件发生的地址
*/
private String eventAddress;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 维度
*/
private BigDecimal latitude;
/**
* 最后处理的组织名称
*/
private String lastProcessDept;
/**
* 最后处理的时间
*/
private String lastProcessDate;
/**
* 图片列表
*/
private List<ImgDataListDTO> imgDataList;
}

72
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java

@ -0,0 +1,72 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 5基层治理-治理能力数据 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class GovernRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 年Id yyyy
*/
private String yearId;
/**
* 月份Id yyyyMM
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 响应率最大值100保留小数点后4位
*/
private BigDecimal responseRatio;
/**
* 解决率 最大值100保留小数点后4位
*/
private BigDecimal resolvedRatio;
/**
* 自治率 最大值100保留小数点后4位
*/
private BigDecimal governRatio;
/**
* 满意率最大值100保留小数点后四位
*/
private BigDecimal satisfactionRatio;
}

71
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java

@ -0,0 +1,71 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 1指数相关 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class IndexDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* yyyy
*/
private String yearId;
/**
* yyyyMM eg :202007
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 总指数
*/
private Integer indexTotal;
/**
* 党建能力指数
*/
private Integer partyDevAblity;
/**
* 服务能力指数
*/
private Integer serviceAblity;
/**
* 治理能力指数
*/
private Integer governAblity;
}

87
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java

@ -0,0 +1,87 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 6党建引领-组织排行 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class OrgRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 年Id yyyy
*/
private String yearId;
/**
* 月份Id yyyyMM
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 党员总数
*/
private Integer partyTotal;
/**
* 小组支部建设总数
*/
private Integer groupTotal;
/**
* 话题总数
*/
private Integer topicTotal;
/**
* 议题总数
*/
private Integer issueTotal;
/**
* 项目总数
*/
private Integer projectTotal;
/**
* 结案率最大值100保留小数点后四位
*/
private BigDecimal closeProjectRatio;
/**
* 满意率最大值100保留小数点后四位
*/
private BigDecimal satisfactionRatio;
}

76
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java

@ -0,0 +1,76 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 7基层党建-建设情况数据支部联建 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class PartyBranchDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 年Id yyyy
*/
private String yearId;
/**
* 月份Id yyyyMM
*/
private String monthId;
/**
* 数据类别 party:支部建设;union:联合建设
*/
private String type;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 议题分类名称
*/
private String issueCategoryName;
/**
* 议题分类id
*/
private String issueCategoryId;
/**
* 组织次数
*/
private Integer organizeCount;
/**
* 参加人数
*/
private Integer joinUserCount;
}

51
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java

@ -0,0 +1,51 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 8党建引领-党员联系群众数据 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class PartyLinkMassesDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 建群总数
*/
private Integer createGroupTotal;
/**
* 群成员总数
*/
private Integer groupUserTotal;
}

71
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@ -0,0 +1,71 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 9党建引领|基层治理-居民党员积分排行榜 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class PartyUserRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 年Id yyyy
*/
private String yearId;
/**
* 月份Id yyyyMM
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 用户身份 party:党员;resi居民
*/
private String userType;
/**
* 用户Id
*/
private String userId;
/**
* 用户名称
*/
private String userName;
/**
* 用户积分
*/
private Integer pointTotal;
}

66
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java

@ -0,0 +1,66 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 10党建引领-先锋模范数据
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class PioneerDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 用户总数
*/
private Integer userTotal;
/**
* 议事数
*/
private Integer issueTotal;
/**
* 话题总数
*/
private Integer topicTotal;
/**
* 议题转项目数
*/
private Integer shiftProjectTotal;
/**
* 解决项目总数
*/
private Integer resolvedProjectTotal;
}

72
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java

@ -0,0 +1,72 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 11基层治理-公众参与 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class UserJoinFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 总的参与次数
*/
private Integer joinTotal;
/**
* 总的参与次数较上月增长率
*/
private BigDecimal joinTotalUpRate;
/**
* 人均议题
*/
private Integer avgIssue;
/**
* 人均议题较上月增长率
*/
private BigDecimal avgIssueUpRate;
/**
* 平均参与度
*/
private Integer avgJoin;
/**
* 平均参与度较上月增长率
*/
private BigDecimal avgJoinUpRate;
}

71
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java

@ -0,0 +1,71 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 12中央区各类总数 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class UserTotalDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 用户总数
*/
private Integer userTotal;
/**
* 注册党员数
*/
private Integer partyTotal;
/**
* 小组党群总数
*/
private Integer groupTotal;
/**
* 话题总数
*/
private Integer topicTotal;
/**
* 议题总数
*/
private Integer issueTotal;
/**
* 项目总数
*/
private Integer projectTotal;
}

61
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java

@ -0,0 +1,61 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 13党建引领-志愿活动服务数据 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class VoluntaryActivityDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* yyyy
*/
private String yearId;
/**
* yyyyMM
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 组织活动次数
*/
private Integer activetyCount;
/**
* 活动参与人数
*/
private Integer joinUserCount;
}

221
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@ -1,8 +1,16 @@
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import com.epmet.service.screen.ScreenCollService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 大屏数据采集api
*
@ -12,4 +20,217 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("screencoll")
public class ScreenCollController {
@Autowired
private ScreenCollService screenCollService;
/**
* 9党建引领|基层治理-居民党员积分排行榜
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("partyuserrankdata")
public Result partyUserRankData(@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
return screenCollService.insertPartyUserRankData(formDTO);
}
/**
* 8党建引领-党员联系群众数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("partylinkmassesdata")
public Result partyLinkMassesData(@RequestBody List<PartyLinkMassesDataFormDTO> formDTO) {
return screenCollService.insertPartyLinkMassesData(formDTO);
}
/**
* 7基层党建-建设情况数据支部联建
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("partybranchdata")
public Result partyBranchData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
return screenCollService.insertPartyBranchData(formDTO);
}
/**
* 6党建引领-组织排行
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("orgrankdata")
public Result orgRankData(@RequestBody List<OrgRankDataFormDTO> formDTO) {
return screenCollService.insertOrgRankData(formDTO);
}
/**
* 5基层治理-治理能力数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("governrankdata")
public Result governRankData(@RequestBody List<GovernRankDataFormDTO> formDTO) {
return screenCollService.insertGovernRankData(formDTO);
}
/**
* 4事件数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("eventdata")
public Result eventData(@RequestBody List<EventDataFormDTO> formDTO) {
return screenCollService.insertEventData(formDTO);
}
/**
* 3难点赌点
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("difficultydata")
public Result difficultyData(@RequestBody List<DifficultyDataFormDTO> formDTO) {
return screenCollService.insertDifficultyData(formDTO);
}
/**
* 2党员基本情况
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("cpcbasedata")
public Result cpcbaseData(@RequestBody List<CpcBaseDataFormDTO> formDTO) {
return screenCollService.insertCpcbaseData(formDTO);
}
/**
* 1指数相关
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("indexdata")
public Result indexData(@RequestBody List<IndexDataFormDTO> formDTO) {
return screenCollService.insertIndexData(formDTO);
}
// --
/**
* 16部门信息上传
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("customerdept")
public Result customerDept(@RequestBody List<CustomerDeptFormDTO> formDTO) {
return screenCollService.insertCustomerDept(formDTO);
}
/**
* 15网格信息上传
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("customergrid")
public Result customerGrid(@RequestBody List<CustomerGridFormDTO> formDTO) {
return screenCollService.insertCustomerGrid(formDTO);
}
/**
* 14组织层级
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("customeragency")
public Result customerAgency(@RequestBody List<CustomerAgencyFormDTO> formDTO) {
return screenCollService.insertCustomerAgency(formDTO);
}
/**
* 13党建引领-志愿活动服务数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("voluntaryactivitydata")
public Result voluntaryActivityData(@RequestBody List<VoluntaryActivityDataFormDTO> formDTO) {
return screenCollService.insertVoluntaryActivityData(formDTO);
}
/**
* 12中央区各类总数
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("usertotaldata")
public Result userTotalData(@RequestBody List<UserTotalDataFormDTO> formDTO) {
return screenCollService.insertUserTotalData(formDTO);
}
/**
* 11基层治理-公众参与
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("userjoin")
public Result userJoin(@RequestBody List<UserJoinFormDTO> formDTO) {
return screenCollService.insertUserJoin(formDTO);
}
/**
* 10党建引领-先锋模范数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("pioneerdata")
public Result pioneerData(@RequestBody List<PioneerDataFormDTO> formDTO) {
return screenCollService.insertPioneerData(formDTO);
}
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.CpcBaseDataFormDTO;
import com.epmet.entity.screen.ScreenCpcBaseDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基层党建-党员基本情况
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
}
/**
* 2党员基本情况
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteCpcBaseData(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
/**
* 2党员基本情况
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCpcBaseData(@Param("list") List<CpcBaseDataFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java

@ -18,8 +18,13 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.CustomerAgencyFormDTO;
import com.epmet.dto.screencoll.form.CustomerGridFormDTO;
import com.epmet.entity.screen.ScreenCustomerAgencyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 组织机构信息
@ -29,5 +34,25 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEntity> {
}
/**
*14组织层级
* 1) 根据CUSTOMER_IDAGENCY_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param agencyIds 组织id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteCustomerAgency(@Param("customerId") String customerId,
@Param("agencyIds") String[] agencyIds);
/**
* 14组织层级
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerAgency(@Param("list") List<CustomerAgencyFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.CustomerDeptFormDTO;
import com.epmet.entity.screen.ScreenCustomerDeptEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 部门信息
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerDeptDao extends BaseDao<ScreenCustomerDeptEntity> {
}
/**
*16部门信息上传
* 1) 根据CUSTOMER_IDDEPT_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param deptIds 部门Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteCustomerDept(@Param("customerId") String customerId,
@Param("deptIds") String[] deptIds);
/**
* 16部门信息上传
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerDept(@Param("list") List<CustomerDeptFormDTO> list);
}

28
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.CustomerGridFormDTO;
import com.epmet.entity.screen.ScreenCustomerGridEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 网格信息
@ -29,5 +33,25 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity> {
}
/**
*15网格信息上传
* 1) 根据CUSTOMER_IDGRID_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param gridIds 网格Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteCustomerGrid(@Param("customerId") String customerId,
@Param("gridIds") String[] gridIds);
/**
* 15网格信息上传
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerGrid(@Param("list") List<CustomerGridFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.DifficultyDataFormDTO;
import com.epmet.entity.screen.ScreenDifficultyDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基层治理-难点堵点
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenDifficultyDataDao extends BaseDao<ScreenDifficultyDataEntity> {
}
/**
* 3难点赌点
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* CUSTOMER_ID
* EVENT_ID
* ORG_ID
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteDifficultyData(DifficultyDataFormDTO list);
/**
* 3难点赌点
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertDifficultyData(@Param("list") List<DifficultyDataFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.EventDataFormDTO;
import com.epmet.entity.screen.ScreenEventDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 中央区-事件数据
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventDataDao extends BaseDao<ScreenEventDataEntity> {
}
/**
* 4事件数据
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* CUSTOMER_ID
* EVENT_ID
* ORG_ID
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteEventData(EventDataFormDTO list);
/**
* 4事件数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertEventData(@Param("list") List<EventDataFormDTO> list);
}

14
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventImgDataDao.java

@ -20,6 +20,7 @@ package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.screen.ScreenEventImgDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 中央区-事件数据图片数据
@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventImgDataDao extends BaseDao<ScreenEventImgDataEntity> {
}
/**
* 根据原始事件Id进行物理删除
*
* @param eventId
* @return void
* @Author zhangyong
* @Date 16:47 2020-08-18
**/
void delEventImgDataByEventId(@Param("eventId") String eventId);
}

32
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.GovernRankDataFormDTO;
import com.epmet.entity.screen.ScreenGovernRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基层治理-治理能力排行数据
@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenGovernRankDataDao extends BaseDao<ScreenGovernRankDataEntity> {
}
/**
* 5基层治理-治理能力数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteGovernRankData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 5基层治理-治理能力数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertGovernRankData(@Param("list") List<GovernRankDataFormDTO> list);
}

33
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.IndexDataFormDTO;
import com.epmet.entity.screen.ScreenIndexDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 指数-指数数据
@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataEntity> {
}
/**
*1指数相关
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteIndexData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 1指数相关
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertIndexData(@Param("list") List<IndexDataFormDTO> list);
}

32
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.OrgRankDataFormDTO;
import com.epmet.entity.screen.ScreenOrgRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领-组织排行榜
@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenOrgRankDataDao extends BaseDao<ScreenOrgRankDataEntity> {
}
/**
* 6党建引领-组织排行
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteOrgRankData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 6党建引领-组织排行
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertOrgRankData(@Param("list") List<OrgRankDataFormDTO> list);
}

32
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.PartyBranchDataFormDTO;
import com.epmet.entity.screen.ScreenPartyBranchDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基层党建-建设情况数据支部联建
@ -29,5 +33,29 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataEntity> {
}
/**
* 7基层党建-建设情况数据支部联建
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deletePartyBranchData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 7基层党建-建设情况数据支部联建
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyBranchData(@Param("list") List<PartyBranchDataFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.PartyLinkMassesDataFormDTO;
import com.epmet.entity.screen.ScreenPartyLinkMassesDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领-党员联系群众数据
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyLinkMassesDataDao extends BaseDao<ScreenPartyLinkMassesDataEntity> {
}
/**
* 8党建引领-党员联系群众数据
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deletePartyLinkMassesData(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
/**
* 8党建引领-党员联系群众数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyLinkMassesData(@Param("list") List<PartyLinkMassesDataFormDTO> list);
}

33
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.PartyUserRankDataFormDTO;
import com.epmet.entity.screen.ScreenPartyUserRankDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领基层治理-市民党员积分排行榜
@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankDataEntity> {
}
/**
* 9党建引领|基层治理-居民党员积分排行榜
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deletePartyUserRankData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 9党建引领|基层治理-居民党员积分排行榜
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.PioneerDataFormDTO;
import com.epmet.entity.screen.ScreenPioneerDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领-先锋模范数据
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenPioneerDataDao extends BaseDao<ScreenPioneerDataEntity> {
}
/**
* 10党建引领-先锋模范数据
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deletePioneerData(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
/**
* 10党建引领-先锋模范数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPioneerData(@Param("list") List<PioneerDataFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.UserJoinFormDTO;
import com.epmet.entity.screen.ScreenUserJoinEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基层治理-公众参与
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenUserJoinDao extends BaseDao<ScreenUserJoinEntity> {
}
/**
* 11基层治理-公众参与
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteUserJoin(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
/**
* 11基层治理-公众参与
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertUserJoin(@Param("list") List<UserJoinFormDTO> list);
}

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.UserTotalDataFormDTO;
import com.epmet.entity.screen.ScreenUserTotalDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 中央区-各类用户总数
@ -29,5 +33,26 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenUserTotalDataDao extends BaseDao<ScreenUserTotalDataEntity> {
}
/**
* 12中央区各类总数
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteUserTotalData(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
/**
* 12中央区各类总数
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertUserTotalData(@Param("list") List<UserTotalDataFormDTO> list);
}

33
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java

@ -18,8 +18,12 @@
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.VoluntaryActivityDataFormDTO;
import com.epmet.entity.screen.ScreenVoluntaryActivityDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领-志愿活动服务数据
@ -29,5 +33,30 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenVoluntaryActivityDataDao extends BaseDao<ScreenVoluntaryActivityDataEntity> {
}
/**
* 13党建引领-志愿活动服务数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteVoluntaryActivityData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 13党建引领-志愿活动服务数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertVoluntaryActivityData(@Param("list") List<VoluntaryActivityDataFormDTO> list);
}

201
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java

@ -0,0 +1,201 @@
package com.epmet.service.screen;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import java.util.List;
public interface ScreenCollService {
/**
* 9党建引领|基层治理-居民党员积分排行榜
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO);
/**
* 8党建引领-党员联系群众数据
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO);
/**
* 7基层党建-建设情况数据支部联建
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO);
/**
* 6党建引领-组织排行
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO);
/**
* 5基层治理-治理能力数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO);
/**
* 4事件数据
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertEventData(List<EventDataFormDTO> formDTO);
/**
* 3难点赌点
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO);
/**
* 2党员基本情况
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO);
/**
* 1指数相关
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertIndexData(List<IndexDataFormDTO> formDTO);
/**
* 16部门信息上传
* 1) 根据CUSTOMER_IDDEPT_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO);
/**
* 15网格信息上传
* 1) 根据CUSTOMER_IDGRID_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO);
/**
* 14组织层级
* 1) 根据CUSTOMER_IDAGENCY_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO);
/**
* 13党建引领-志愿活动服务数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertVoluntaryActivityData(List<VoluntaryActivityDataFormDTO> formDTO);
/**
* 12中央区各类总数
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO);
/**
* 11基层治理-公众参与
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserJoin(List<UserJoinFormDTO> formDTO);
/**
* 10党建引领-先锋模范数据
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPioneerData(List<PioneerDataFormDTO> formDTO);
}

346
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

@ -0,0 +1,346 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service.screen.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.screen.*;
import com.epmet.dto.screencoll.form.*;
import com.epmet.entity.screen.ScreenEventImgDataEntity;
import com.epmet.service.screen.ScreenCollService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 大屏数据采集
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-05-11
*/
@Service
public class ScreenCollServiceImpl implements ScreenCollService {
@Autowired
private ScreenPartyUserRankDataDao screenPartyUserRankDataDao;
@Autowired
private ScreenPartyLinkMassesDataDao screenPartyLinkMassesDataDao;
@Autowired
private ScreenPartyBranchDataDao screenPartyBranchDataDao;
@Autowired
private ScreenOrgRankDataDao screenOrgRankDataDao;
@Autowired
private ScreenGovernRankDataDao screenGovernRankDataDao;
@Autowired
private ScreenEventDataDao screenEventDataDao;
@Autowired
private ScreenEventImgDataDao screenEventImgDataDao;
@Autowired
private ScreenDifficultyDataDao screenDifficultyDataDao;
@Autowired
private ScreenCpcBaseDataDao screenCpcBaseDataDao;
@Autowired
private ScreenIndexDataDao screenIndexDataDao;
@Autowired
private ScreenCustomerDeptDao screenCustomerDeptDao;
@Autowired
private ScreenCustomerGridDao screenCustomerGridDao;
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
@Autowired
private ScreenVoluntaryActivityDataDao screenVoluntaryActivityDataDao;
@Autowired
private ScreenUserTotalDataDao screenUserTotalDataDao;
@Autowired
private ScreenUserJoinDao screenUserJoinDao;
@Autowired
private ScreenPioneerDataDao screenPioneerDataDao;
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenPartyLinkMassesDataDao.deletePartyLinkMassesData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO);
}
return new Result();
}
@Override
public Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenPartyBranchDataDao.deletePartyBranchData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenOrgRankDataDao.deleteOrgRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenOrgRankDataDao.batchInsertOrgRankData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenGovernRankDataDao.deleteGovernRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenGovernRankDataDao.batchInsertGovernRankData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertEventData(List<EventDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenEventDataDao.deleteEventData(formDTO.get(i));
}
screenEventDataDao.batchInsertEventData(formDTO);
for (int i = NumConstant.ZERO; i < formDTO.size(); i++) {
if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) {
// 根据原始事件ID,物理删除 - 事件数据图片数据
screenEventImgDataDao.delEventImgDataByEventId(formDTO.get(i).getEventId());
for (int j = NumConstant.ZERO; j < formDTO.get(i).getImgDataList().size(); j++){
// 新增 中央区-事件数据图片数据 表
ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
imgDataEntity.setEventId(formDTO.get(i).getImgDataList().get(j).getEventId());
imgDataEntity.setEventImgUrl(formDTO.get(i).getImgDataList().get(j).getImgUrl());
imgDataEntity.setSort(formDTO.get(i).getImgDataList().get(j).getSort());
screenEventImgDataDao.insert(imgDataEntity);
}
}
}
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenDifficultyDataDao.deleteDifficultyData(formDTO.get(i));
}
screenDifficultyDataDao.batchInsertDifficultyData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenCpcBaseDataDao.deleteCpcBaseData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertIndexData(List<IndexDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenIndexDataDao.deleteIndexData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenIndexDataDao.batchInsertIndexData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] deptIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
deptIds[i] = formDTO.get(i).getDeptId();
}
screenCustomerDeptDao.deleteCustomerDept(formDTO.get(NumConstant.ZERO).getCustomerId(), deptIds);
screenCustomerDeptDao.batchInsertCustomerDept(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] gridIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
gridIds[i] = formDTO.get(i).getGridId();
}
screenCustomerGridDao.deleteCustomerGrid(formDTO.get(NumConstant.ZERO).getCustomerId(), gridIds);
screenCustomerGridDao.batchInsertCustomerGrid(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] agencyIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
agencyIds[i] = formDTO.get(i).getAgencyId();
}
screenCustomerAgencyDao.deleteCustomerAgency(formDTO.get(NumConstant.ZERO).getCustomerId(), agencyIds);
screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertVoluntaryActivityData(List<VoluntaryActivityDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenVoluntaryActivityDataDao.deleteVoluntaryActivityData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenVoluntaryActivityDataDao.batchInsertVoluntaryActivityData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenUserTotalDataDao.deleteUserTotalData(formDTO.get(NumConstant.ZERO).getCustomerId(),
orgIds);
screenUserTotalDataDao.batchInsertUserTotalData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserJoin(List<UserJoinFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
orgIds);
screenUserJoinDao.batchInsertUserJoin(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPioneerData(List<PioneerDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenPioneerDataDao.deletePioneerData(formDTO.get(NumConstant.ZERO).getCustomerId(),
orgIds);
screenPioneerDataDao.batchInsertPioneerData(formDTO);
}
return new Result();
}
}

63
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml

@ -3,6 +3,67 @@
<mapper namespace="com.epmet.dao.screen.ScreenCpcBaseDataDao">
<delete id="deleteCpcBaseData">
delete from screen_cpc_base_data
where CUSTOMER_ID = #{customerId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertCpcBaseData" parameterType="java.util.List">
insert into screen_cpc_base_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
REGISTER_USER_COUNT,
RESI_TOTAL,
PARTY_MEMBER_COUNT,
AGE_LEVEL_1,
AGE_LEVEL_2,
AGE_LEVEL_3,
AGE_LEVEL_4,
AGE_LEVEL_5,
AGE_LEVEL_6,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.registerUserCount},
#{item.resiTotal},
</mapper>
#{item.partyMemberCount},
#{item.ageLevel1},
#{item.ageLevel2},
#{item.ageLevel3},
#{item.ageLevel4},
#{item.ageLevel5},
#{item.ageLevel6},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>

55
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@ -3,6 +3,59 @@
<mapper namespace="com.epmet.dao.screen.ScreenCustomerAgencyDao">
<delete id="deleteCustomerAgency">
delete from screen_customer_agency
where CUSTOMER_ID = #{customerId}
AND AGENCY_ID IN
<foreach item="item" collection="agencyIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertCustomerAgency" parameterType="java.util.List">
insert into screen_customer_agency
(
ID,
CUSTOMER_ID,
AGENCY_ID,
AGENCY_NAME,
PID,
PIDS,
ALL_PARENT_NAMES,
AREA_MARKS,
CENTER_MARK,
PARTY_MARK,
`LEVEL`,
AREA_CODE,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.agencyId},
#{item.agencyName},
#{item.pid},
#{item.pids},
#{item.allParentNames},
#{item.areaMarks},
#{item.centerMark},
#{item.partyMark},
#{item.level},
#{item.areaCode},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

47
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml

@ -3,6 +3,51 @@
<mapper namespace="com.epmet.dao.screen.ScreenCustomerDeptDao">
<delete id="deleteCustomerDept">
delete from screen_customer_dept
where CUSTOMER_ID = #{customerId}
AND DEPT_ID IN
<foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertCustomerDept" parameterType="java.util.List">
insert into screen_customer_dept
(
ID,
CUSTOMER_ID,
DEPT_ID,
DEPT_NAME,
PARENT_AGENCY_ID,
AREA_MARKS,
CENTER_MARK,
DEPT_MARK,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.deptId},
#{item.deptName},
#{item.parentAgencyId},
#{item.areaMarks},
#{item.centerMark},
#{item.deptMark},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

47
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@ -3,6 +3,51 @@
<mapper namespace="com.epmet.dao.screen.ScreenCustomerGridDao">
<delete id="deleteCustomerGrid">
delete from screen_customer_grid
where CUSTOMER_ID = #{customerId}
AND GRID_ID IN
<foreach item="item" collection="gridIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertCustomerGrid" parameterType="java.util.List">
insert into screen_customer_grid
(
ID,
CUSTOMER_ID,
GRID_ID,
GRID_NAME,
PARENT_AGENCY_ID,
AREA_MARKS,
CENTER_MARK,
PARTY_MARK,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.gridId},
#{item.gridName},
#{item.parentAgencyId},
#{item.areaMarks},
#{item.centerMark},
#{item.partyMark},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

59
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@ -3,6 +3,63 @@
<mapper namespace="com.epmet.dao.screen.ScreenDifficultyDataDao">
<delete id="deleteDifficultyData">
delete from screen_difficulty_data
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
</delete>
<insert id="batchInsertDifficultyData" parameterType="java.util.List">
insert into screen_difficulty_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
EVENT_ID,
EVENT_IMG_URL,
EVENT_SOURCE,
EVENT_CONTENT,
EVENT_COST_TIME,
EVENT_RE_ORG,
EVENT_CATEGORY_CODE,
EVENT_CATEGORY_NAME,
EVENT_STATUS_CODE,
EVENT_STATUS_DESC,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.eventId},
#{item.eventImgUrl},
#{item.eventSource},
#{item.eventContent},
#{item.eventCostTime},
#{item.eventReOrg},
#{item.eventCategoryCode},
#{item.eventCategoryName},
#{item.eventStatusCode},
#{item.eventStatusDesc},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

63
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@ -3,6 +3,67 @@
<mapper namespace="com.epmet.dao.screen.ScreenEventDataDao">
<delete id="deleteEventData">
delete from screen_event_data
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
</delete>
<insert id="batchInsertEventData" parameterType="java.util.List">
insert into screen_event_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
EVENT_ID,
EVENT_TITLE,
EVENT_CREATE_TIME,
LINK_MOBILE,
EVENT_CONTENT,
EVENT_IMG_URL,
EVENT_LEVEL,
EVENT_ADDRESS,
LONGITUDE,
LATITUDE,
LAST_PROCESS_DEPT,
LAST_PROCESS_DATE,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.eventId},
#{item.eventTitle},
#{item.eventCreateTime},
#{item.linkMobile},
#{item.eventContent},
#{item.eventImgUrl},
#{item.eventLevel},
#{item.eventAddress},
#{item.longitude},
#{item.latitude},
#{item.lastProcessDept},
#{item.lastProcessDate},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml

@ -3,5 +3,9 @@
<mapper namespace="com.epmet.dao.screen.ScreenEventImgDataDao">
<delete id="delEventImgDataByEventId">
delete from screen_event_img_data
where DEL_FLAG = '0' AND EVENT_ID = #{eventId}
</delete>
</mapper>
</mapper>

59
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@ -3,6 +3,63 @@
<mapper namespace="com.epmet.dao.screen.ScreenGovernRankDataDao">
<delete id="deleteGovernRankData">
delete from screen_govern_rank_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertGovernRankData" parameterType="java.util.List">
insert into screen_govern_rank_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
</mapper>
RESPONSE_RATIO,
RESOLVED_RATIO,
GOVERN_RATIO,
SATISFACTION_RATIO,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.responseRatio},
#{item.resolvedRatio},
#{item.governRatio},
#{item.satisfactionRatio},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>

56
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml

@ -3,6 +3,60 @@
<mapper namespace="com.epmet.dao.screen.ScreenIndexDataDao">
<delete id="deleteIndexData">
delete from screen_index_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertIndexData" parameterType="java.util.List">
insert into screen_index_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
INDEX_TOTAL,
PARTY_DEV_ABLITY,
SERVICE_ABLITY,
GOVERN_ABLITY,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
</mapper>
#{item.indexTotal},
#{item.partyDevAblity},
#{item.serviceAblity},
#{item.governAblity},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>

61
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@ -3,6 +3,65 @@
<mapper namespace="com.epmet.dao.screen.ScreenOrgRankDataDao">
<delete id="deleteOrgRankData">
delete from screen_org_rank_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertOrgRankData" parameterType="java.util.List">
insert into screen_org_rank_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
PARTY_TOTAL,
GROUP_TOTAL,
TOPIC_TOTAL,
ISSUE_TOTAL,
PROJECT_TOTAL,
CLOSE_PROJECT_RATIO,
SATISFACTION_RATIO,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.partyTotal},
#{item.groupTotal},
#{item.topicTotal},
#{item.issueTotal},
#{item.projectTotal},
#{item.closeProjectRatio},
#{item.satisfactionRatio},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

58
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml

@ -3,6 +3,60 @@
<mapper namespace="com.epmet.dao.screen.ScreenPartyBranchDataDao">
<delete id="deletePartyBranchData">
delete from screen_party_branch_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>
<insert id="batchInsertPartyBranchData" parameterType="java.util.List">
insert into screen_party_branch_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
`TYPE`,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
ISSUE_CATEGORY_ID,
ISSUE_CATEGORY_NAME,
ORGANIZE_COUNT,
JOIN_USER_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.type},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.issueCategoryId},
#{item.issueCategoryName},
#{item.organizeCount},
#{item.joinUserCount},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>

48
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml

@ -3,5 +3,51 @@
<mapper namespace="com.epmet.dao.screen.ScreenPartyLinkMassesDataDao">
<delete id="deletePartyLinkMassesData">
delete from screen_party_link_masses_data
where CUSTOMER_ID = #{customerId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>
<insert id="batchInsertPartyLinkMassesData" parameterType="java.util.List">
insert into screen_party_link_masses_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
CREATE_GROUP_TOTAL,
GROUP_USER_TOTAL,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.createGroupTotal},
#{item.groupUserTotal},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>

55
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@ -3,6 +3,59 @@
<mapper namespace="com.epmet.dao.screen.ScreenPartyUserRankDataDao">
<delete id="deletePartyUserRankData">
delete from screen_party_user_rank_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertPartyUserRankData" parameterType="java.util.List">
insert into screen_party_user_rank_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
USER_TYPE,
USER_ID,
USER_NAME,
POINT_TOTAL,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.userType},
#{item.userId},
#{item.userName},
#{item.pointTotal},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

53
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@ -3,6 +3,57 @@
<mapper namespace="com.epmet.dao.screen.ScreenPioneerDataDao">
<delete id="deletePioneerData">
delete from screen_pioneer_data
where CUSTOMER_ID = #{customerId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertPioneerData" parameterType="java.util.List">
insert into screen_pioneer_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
USER_TOTAL,
ISSUE_TOTAL,
TOPIC_TOTAL,
SHIFT_PROJECT_TOTAL,
RESOLVED_PROJECT_TOTAL,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.userTotal},
#{item.issueTotal},
#{item.topicTotal},
#{item.shiftProjectTotal},
#{item.resolvedProjectTotal},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

55
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@ -3,6 +3,59 @@
<mapper namespace="com.epmet.dao.screen.ScreenUserJoinDao">
<delete id="deleteUserJoin">
delete from screen_user_join
where CUSTOMER_ID = #{customerId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertUserJoin" parameterType="java.util.List">
insert into screen_user_join
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
JOIN_TOTAL,
JOIN_TOTAL_UP_RATE,
AVG_ISSUE,
AVG_ISSUE_UP_RATE,
AVG_JOIN,
AGVG_JOIN_UP_RATE,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.joinTotal},
#{item.joinTotalUpRate},
#{item.avgIssue},
#{item.avgIssueUpRate},
#{item.avgJoin},
#{item.avgJoinUpRate},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

55
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

@ -3,6 +3,59 @@
<mapper namespace="com.epmet.dao.screen.ScreenUserTotalDataDao">
<delete id="deleteUserTotalData">
delete from screen_user_total_data
where CUSTOMER_ID = #{customerId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertUserTotalData" parameterType="java.util.List">
insert into screen_user_total_data
(
ID,
CUSTOMER_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
USER_TOTAL,
PARTY_TOTAL,
GROUP_TOTAL,
TOPIC_TOTAL,
ISSUE_TOTAL,
PROJECT_TOTAL,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.userTotal},
#{item.partyTotal},
#{item.groupTotal},
#{item.topicTotal},
#{item.issueTotal},
#{item.projectTotal},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

51
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml

@ -3,6 +3,55 @@
<mapper namespace="com.epmet.dao.screen.ScreenVoluntaryActivityDataDao">
<delete id="deleteVoluntaryActivityData">
delete from screen_voluntary_activity_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertVoluntaryActivityData" parameterType="java.util.List">
insert into screen_voluntary_activity_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
ACTIVETY_COUNT,
JOIN_USER_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.activetyCount},
#{item.joinUserCount},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
</mapper>

Loading…
Cancel
Save