Browse Source

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

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
master
wangxianzhang 4 years ago
parent
commit
08322393ac
  1. 9
      epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql
  2. 3
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
  3. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
  4. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
  5. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
  6. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
  7. 6
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
  8. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
  9. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
  10. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
  11. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
  12. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
  13. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
  14. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
  15. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
  16. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
  17. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
  18. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
  19. 4
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
  20. 14
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
  21. 6
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
  22. 4
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
  23. 7
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
  24. 10
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java
  25. 22
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java
  26. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
  27. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
  28. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
  29. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java
  30. 86
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
  31. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
  32. 57
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
  33. 6
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  34. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  35. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
  36. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
  37. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
  38. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
  39. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
  40. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  41. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
  42. 6
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
  43. 19
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java
  44. 35
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
  45. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  46. 11
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
  47. 12
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
  48. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
  49. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
  50. 29
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
  51. 22
      epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

9
epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql

@ -0,0 +1,9 @@
-- 1、增加字典类型
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000011, 'age_group', '年龄范围', '', 11, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
-- 2、增加字典数据
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000230, 1000000000000000011, '50岁以下', '0', '', 0, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000231, 1000000000000000011, '50-59岁', '1', '', 1, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000232, 1000000000000000011, '60-69岁', '2', '', 2, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000233, 1000000000000000011, '70-79岁', '3', '', 3, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000234, 1000000000000000011, '80岁以上', '4', '', 4, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');

3
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java

@ -24,6 +24,9 @@ public class ProjectAnalysisFormDTO implements Serializable {
//一级分类Id集合
@NotNull(message = "分类Code集合不能为空", groups = {Analysis.class})
private List<String> categoryCodeList;
//当前查看的项目Id
@NotBlank(message = "当前查看项目Id不能为空", groups = {Analysis.class})
private String projectId;
private String customerId;

3
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@ -113,8 +113,9 @@ public class GovProjectController {
* @author sun
*/
@PostMapping("projectanalysis")
public Result<ProjectAnalysisResultDTO> projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) {
public Result<ProjectAnalysisResultDTO> projectAnalysis(@LoginUser TokenDto tokenDto, @RequestBody ProjectAnalysisFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<ProjectAnalysisResultDTO>().ok(govProjectService.projectAnalysis(formDTO));
}

2
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java

@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
* @Description 查询userId的身份证号在小程序用户中存在的多个userId值
* @author sun
*/
List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId);
List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
}

2
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@ -154,7 +154,7 @@ public interface EpmetUserService {
* @Description 查询userId的身份证号在小程序用户中存在的多个userId值
* @author sun
*/
List<UserBaseInfoDTO> getUserBaseList(String userId);
List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId);
/**
* @Description 根据身份证号查询负能平台用户信息

4
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@ -713,8 +713,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
* @author sun
*/
@Override
public List<UserBaseInfoDTO> getUserBaseList(String userId) {
return userBaseInfoDao.getUserBaseList(userId);
public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
return userBaseInfoDao.getUserBaseList(userId, customerId);
}
/**

6
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@ -480,7 +480,7 @@ public class GovProjectServiceImpl implements GovProjectService {
ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO();
resultDTO.setUserId(formDTO.getUserId());
//1.查询userId的身份证号在小程序用户中存在的多个userId值
List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId());
List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId());
List<String> userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList());
//2.查询对应负能平台用户家庭信息
@ -539,7 +539,7 @@ public class GovProjectServiceImpl implements GovProjectService {
});
//当前分类下来源楼院小组的项目
groupList.forEach(gr -> {
if (secondCodeMap.containsKey(gr.getCategoryCode())) {
if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
groupPrList.add(project);
}
@ -548,7 +548,7 @@ public class GovProjectServiceImpl implements GovProjectService {
groupProjectList.add(groupCa);
//当前分类下来源事件上报的项目
eventList.forEach(gr -> {
if (secondCodeMap.containsKey(gr.getCategoryCode())) {
if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
eventPrList.add(project);
}

1
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@ -47,6 +47,7 @@
WHERE
del_flag = '0'
AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
AND customer_id = #{customerId}
</select>
</mapper>

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@ -158,7 +158,7 @@ public class DemoController {
*/
@GetMapping("testthreadpool")
public void testThreadPool() {
System.out.println(LocalDateTime.now().getSecond());;
System.out.println(LocalDateTime.now().getSecond());
System.out.println("----------->>");
Future<Boolean> future1 = executorService.submit(() -> demoService.testThreadPool());

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java

@ -35,7 +35,6 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
* 每隔5条存储数据库实际使用中可以3000条然后清理list 方便内存回收
*/
private static volatile boolean isGroup = false;
;
AtomicInteger total = new AtomicInteger(0);
Map<String, IndexDictEntity> indexDicMap = new HashMap<>();
Map<String, IndexGroupTemplateEntity> indexGroupMap = new HashMap<>();

7
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java

@ -67,10 +67,7 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
@Override
public boolean haveSubCustomer(String customerId) {
List<CustomerRelationEntity> list = baseDao.selectListByPids(customerId);
if (null == list || list.isEmpty()) {
return false;
}
return true;
return null != list && !list.isEmpty();
}
/**
@ -86,4 +83,4 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
}
return baseDao.selectSubCustomer(customerId);
}
}
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java

@ -317,7 +317,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
// 当前网格内出来的项目:由社区结案(已解决+未解决)的项目总数
int communityClosedCount= NumConstant.ZERO;
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
int streetClosedCount=NumConstant.ZERO;;
int streetClosedCount=NumConstant.ZERO;
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
int districtDeptClosedCount=NumConstant.ZERO;
int gridSelfGovernProjectTotal=NumConstant.ZERO;

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java

@ -215,7 +215,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
//判断用户是否是党员,调用相成写的方法
//话题发布人是否是党员:1是党员0不是。 默认0
if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
} else {
mainDailyEntity.setCreateTopicUserIsParty(false);
}
@ -232,7 +232,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
logDailyEntity.setPids(gridInfoDTO.getPids());
//判断用户是否是党员,调用相成写的方法
if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
} else {
logDailyEntity.setOperateUserIsParty(false);
}

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java

@ -462,7 +462,6 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
int month = calendar.get(Calendar.MONTH) + NumConstant.ONE;
date[NumConstant.ZERO] = String.valueOf(year);
date[NumConstant.ONE] = String.valueOf(month);
;
if (NumConstant.TEN >= month) {
date[NumConstant.ONE] = NumConstant.ZERO_STR + month;
}

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@ -147,8 +147,8 @@ public class DataReportingServiceImpl implements DataReportingService {
if (StringUtils.isNotBlank(parentCustomer.getData())) {
epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData());
}
Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());;
//项目ID不为空时,因为只有一条,可以直接处理
Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());
//项目ID不为空时,因为只有一条,可以直接处理
Map<String, CustomerProjectCategoryDictEntity> finalEpmetCodeMap = epmetCodeMap;
if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) {
list = projectList.stream().map(project -> {

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@ -178,7 +178,7 @@ public class StatsUserServiceImpl implements StatsUserService {
while (iterator.hasNext()) {
GmUploadEventFormDTO.DataList m = iterator.next();
AtomicReference<Boolean> bl = new AtomicReference<>(false);
StringBuffer gridPids = new StringBuffer("");
StringBuffer gridPids = new StringBuffer();
agencyList.forEach(ag -> {
if (m.getAgencyId().equals(ag.getId())) {
bl.set(true);
@ -239,8 +239,8 @@ public class StatsUserServiceImpl implements StatsUserService {
while (iterator.hasNext()) {
GmUploadDataFormDTO.DataList m = iterator.next();
AtomicReference<Boolean> bl = new AtomicReference<>(false);
StringBuffer pid = new StringBuffer("");
StringBuffer pids = new StringBuffer("");
StringBuffer pid = new StringBuffer();
StringBuffer pids = new StringBuffer();
agencyList.forEach(ag -> {
if (m.getAgencyId().equals(ag.getId())) {
bl.set(true);

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java

@ -122,7 +122,7 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
Date now = new Date();
Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);;//初始化至当季
Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);//初始化至当季
Date startQMonth;//从该季开始初始化,不包含该季
if (latestDimEntity == null) {
@ -199,4 +199,4 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
return yyyy.concat("年").concat(quarterName);
}
}
}

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java

@ -159,10 +159,7 @@ public abstract class ScoreCalculator<T> {
* @return
*/
protected <T> boolean validSourceArray(T[] sourceArray) {
if (sourceArray == null || sourceArray.length == 0) {
return false;
}
return true;
return sourceArray != null && sourceArray.length != 0;
}
/**

4
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java

@ -25,9 +25,9 @@ public class CategoryAnalysisFormDTO implements Serializable {
@NotBlank(message = "组织:agency,网格:grid", groups = AddUserShowGroup.class)
private String orgType;
@NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class)
@NotBlank(message = "起止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
private String startDateId;
@NotBlank(message = "截止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class)
@NotBlank(message = "截止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
private String endDateId;
@NotBlank(message = "先选择组织或网格", groups = AddUserInternalGroup.class)

14
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java

@ -23,7 +23,7 @@ public class DemandResearchAnalysisFormDTO implements Serializable {
@NotBlank(message = "firstCategoryCode不能为空",groups = AddUserInternalGroup.class)
private String firstCategoryCode;
@NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
//@NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
private String icResiUserId;
private List<String> epmetUserIdList;
@ -31,4 +31,16 @@ public class DemandResearchAnalysisFormDTO implements Serializable {
@NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
private String customerId;
/**
* 个人档案personal-data
* 服务措施分析demand-analysis
*/
@NotBlank(message = "queryOrigin不能为空:个人档案:personal-data;服务措施分析:demand-analysis",groups = AddUserInternalGroup.class)
private String queryOrigin;
/**
* 当前查看的需求详情的需求id
*/
private String demandRecId;
}

6
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java

@ -41,4 +41,10 @@ public class IcResiUserDemandFromDTO implements Serializable {
* epmetUserIdList+userId
*/
private List<String> userIds;
/**
* 当前查看的需求详情的需求id 可空
*/
private String demandRecId;
}

4
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java

@ -35,9 +35,9 @@ public class PageListAnalysisFormDTO implements Serializable {
@NotBlank(message = "分类编码不能为空", groups = AddUserInternalGroup.class)
private String categoryCode;
@NotBlank(message = "上报时间起始日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class)
@NotBlank(message = "上报时间起始日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
private String startDateId;
@NotBlank(message = "上报时间截止日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class)
@NotBlank(message = "上报时间截止日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
private String endDateId;
@NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)

7
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java

@ -88,6 +88,10 @@ public class DemandRecResultDTO implements Serializable {
* XXX(区域化党建单位)
*/
private String serviceShowName;
/**
* 只要有服务方就显示
*/
private Boolean serviceShowFlag;
/**
* 服务方类型志愿者volunteer社会组织social_org社区自组织community_org区域党建单位party_unit
*/
@ -114,4 +118,7 @@ public class DemandRecResultDTO implements Serializable {
* 完成情况
*/
private String finishDesc;
private String icResiUserId;
private String epmetUserId;
}

10
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java

@ -1,6 +1,5 @@
package com.epmet.dto.result.demand;
import com.epmet.dto.result.HouseUserDTO;
import lombok.Data;
import java.io.Serializable;
@ -10,15 +9,8 @@ import java.util.List;
* 数据分析-个人档案-需求详情研判分析
*/
@Data
public class DemandResearchAnalysisResultDTO implements Serializable {
public class DemandResearchAnalysisResultDTO extends HouseMemResDTO implements Serializable {
private static final long serialVersionUID = -1024304149893118204L;
/**
* 居民信息及家属列表
*/
private String icResiUserId;
private String icUserName;
private String houseId;
private List<HouseUserDTO> houseUserList;
private List<DemandDataDTO> demandData;
/**

22
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.result.demand;
import com.epmet.dto.result.HouseUserDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 数据分析-个人档案-需求详情研判分析
* 案件居民家属
*/
@Data
public class HouseMemResDTO implements Serializable {
/**
* 居民信息及家属列表
*/
private String icResiUserId;
private String icUserName;
private String houseId;
private List<HouseUserDTO> houseUserList;
}

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java

@ -26,7 +26,7 @@ public class IcResiUserReportDemandRes implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date wantServiceTime;
@JsonIgnore
//@JsonIgnore
private String status;
private String statusName;

8
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java

@ -50,4 +50,12 @@ public interface UserDemandConstant {
String SOCIAL_ORG="social_org";
String COMMUNITY_ORG="community_org";
String PARTY_UNIT="party_unit";
/**
* 个人档案personal-data
* 服务措施分析demand-analysis
*/
String PERSONAL_DATA="personal-data";
String DEMAND_ANALYSIS="demand-analysis";
}

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

@ -154,6 +154,9 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
@Override
public IcPartyActivityDTO get(String id) {
IcPartyActivityEntity entity = baseDao.selectById(id);
if (null == entity) {
return null;
}
//获取服务事项名称
SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
codeFormDTO.setCustomerId(entity.getCustomerId());

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

@ -36,11 +36,13 @@ import com.epmet.service.IcResiDemandDictService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -203,7 +205,11 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
@Override
public List<OptionDTO> querySubCodeList(SubCodeFormDTO formDTO) {
return baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName());
List<OptionDTO> list = baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName());
if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList();
}
return list;
}
@Override

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

@ -42,10 +42,10 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.IcUserDemandRecDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.FindIcUserFormDTO;
import com.epmet.dto.form.ResiUserFormDTO;
import com.epmet.dto.form.demand.*;
import com.epmet.dto.result.AllGridsByUserIdResultDTO;
import com.epmet.dto.result.IcResiUserBriefDTO;
import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.result.demand.*;
import com.epmet.entity.*;
import com.epmet.feign.EpmetAdminOpenFeignClient;
@ -323,6 +323,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
res.setServiceShowName(res.getServiceName().concat("(区域化党建单位)"));
break;
}*/
res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()) ? true : false);
}
}
return new PageData<>(list, pageInfo.getTotal());
@ -563,6 +564,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
//服务方类型:志愿者:volunteer;社会组织:social_org;社区自组织:community_org;区域党建单位:party_unit;
res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR);
res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
}
return res;
}
@ -577,13 +579,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
@Override
public DemandResearchAnalysisResultDTO queryDemandResearchAnalysis(DemandResearchAnalysisFormDTO formDTO) {
//获取案件居民和及家属列表
Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
if (!userRes.success() || null == userRes.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
}
IcResiUserBriefDTO icResiUserDTO = userRes.getData();
DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, DemandResearchAnalysisResultDTO.class);
resultDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList());
HouseMemResDTO houseMemResDTO=queryDemandUserFamily(formDTO);
DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(houseMemResDTO, DemandResearchAnalysisResultDTO.class);
//log.info(JSON.toJSONString(formDTO));
//返参格式套一层类别和类别名称
List<DemandDataDTO> demandData=new ArrayList<>();
@ -593,15 +591,39 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
demandDataDTO.setDemandList(new ArrayList<>());
demandData.add(demandDataDTO);
//如果是服务措施分析来的,并且是pc录入的需求,需要先去找epmetUserIdList
if (UserDemandConstant.DEMAND_ANALYSIS.equals(formDTO.getQueryOrigin())
&& StringUtils.isNotBlank(formDTO.getIcResiUserId())
&& CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
ResiUserFormDTO resiUserFormDTO = new ResiUserFormDTO();
resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
resiUserFormDTO.setIcResiUserId(formDTO.getIcResiUserId());
Result<ResiUserResDTO> resiRes = epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO);
if (!resiRes.success()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询小程序用户异常");
}
if (null != resiRes.getData() && CollectionUtils.isNotEmpty(resiRes.getData().getEpmetUserIdList())) {
formDTO.setEpmetUserIdList(resiRes.getData().getEpmetUserIdList());
}
}
//获取当前需求人,相同分类的需求列表。不分页,直接返回所有
List<String> userIds=new ArrayList<>();
userIds.add(formDTO.getIcResiUserId());
if(StringUtils.isNotBlank(formDTO.getIcResiUserId())){
userIds.add(formDTO.getIcResiUserId());
}
if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
userIds.addAll(formDTO.getEpmetUserIdList());
}
if(StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
//需求人不能为空
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "需求人不能为空,icResiUserId与epmetUserIdList不能同时为空");
}
IcResiUserDemandFromDTO icResiUserDemandFromDTO=new IcResiUserDemandFromDTO();
icResiUserDemandFromDTO.setUserIds(userIds);
icResiUserDemandFromDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode());
icResiUserDemandFromDTO.setDemandRecId(formDTO.getDemandRecId());
List<IcResiUserReportDemandRes> demandList = baseDao.selectUserDemand(icResiUserDemandFromDTO);
if(CollectionUtils.isNotEmpty(demandList)){
@ -625,10 +647,51 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
}
demandData.get(NumConstant.ZERO).setDemandList(CollectionUtils.isNotEmpty(demandList) ? demandList : Collections.emptyList());
}
resultDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList());
resultDTO.setDemandData(demandData);
return resultDTO;
}
/**
* 数据分析-个人档案-需求详情研判分析
* 获取案件居民和及家属列表
*
*
* @param formDTO
* @return
*/
private HouseMemResDTO queryDemandUserFamily(DemandResearchAnalysisFormDTO formDTO) {
HouseMemResDTO houseMemResDTO=new HouseMemResDTO();
if(StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
//需求人不能为空
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "需求人不能为空,icResiUserId与epmetUserIdList不能同时为空");
}
//服务措施分析点击了PC录入的需求,或者个人档案进来的(这两种情况肯定会有icResiUserId)
if(StringUtils.isNotBlank(formDTO.getIcResiUserId())){
Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
if (!userRes.success() || null == userRes.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
}
houseMemResDTO=ConvertUtils.sourceToTarget(userRes.getData(),HouseMemResDTO.class);
}
//服务措施点击了,小程序用户上报的需求
if (StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())) {
//需要找到当前这个epmetUserIdList相同身份证号的人,
//以及这个身份证号所对应的居民的家属
FindIcUserFormDTO findIcUserFormDTO=new FindIcUserFormDTO();
findIcUserFormDTO.setCustomerId(formDTO.getCustomerId());
findIcUserFormDTO.setEpmetUserId(formDTO.getEpmetUserIdList().get(NumConstant.ZERO));
Result<EpmetUserFamilyDTO> epmetUserFamilyDTOResult=epmetUserOpenFeignClient.findIcUser(findIcUserFormDTO);
if (!epmetUserFamilyDTOResult.success() || null == epmetUserFamilyDTOResult.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据小程序用户id,获取ic居民信息接口异常");
}
houseMemResDTO=ConvertUtils.sourceToTarget(epmetUserFamilyDTOResult.getData(),HouseMemResDTO.class);
formDTO.setEpmetUserIdList(epmetUserFamilyDTOResult.getData().getEpmetUserIdList());
}
return houseMemResDTO;
}
/**
* 数分析-服务措施分析-分页查询
*
@ -712,6 +775,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
res.setStatusName(statusMap.containsKey(res.getStatus())?statusMap.get(res.getStatus()):StrConstant.EPMETY_STR);
//服务方类型:志愿者:volunteer;社会组织:social_org;社区自组织:community_org;区域党建单位:party_unit;
res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR);
res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
}
}
return new PageData<>(list, total);

3
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml

@ -138,10 +138,9 @@
</appender>
<!-- 开发、测试环境 -->
<springProfile name="dev,test">
<springProfile name="local,dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<logger name="com.epmet.dao" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>

57
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@ -75,7 +75,17 @@
case when r.PARENT_CODE !='0' then r.PARENT_CODE
ELSE R.CATEGORY_CODE
END
) as firstCategoryCode
) as firstCategoryCode,
(
CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
ELSE ''
END
) as icResiUserId,
(
CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
ELSE ''
END
) as epmetUserId
FROM
ic_user_demand_rec r
left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
@ -90,7 +100,7 @@
AND r.GRID_PIDS LIKE concat('%',#{gridPids},'%')
</if>
<if test="null != level and level ==1">
and r.PARENT_CODE=#{categoryCode}
and (r.PARENT_CODE=#{categoryCode} or r.CATEGORY_CODE=#{categoryCode})
</if>
<if test="null != level and level ==2">
and r.CATEGORY_CODE=#{categoryCode}
@ -142,6 +152,9 @@
<if test="null !=firstCategoryCode and firstCategoryCode!=''">
and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
</if>
<if test="null !=demandRecId and demandRecId!=''">
and r.id !=#{demandRecId}
</if>
ORDER BY
r.WANT_SERVICE_TIME DESC
</select>
@ -182,7 +195,17 @@
IFNULL(s.FINISH_DESC,'') as finishDesc,
'' AS serviceShowName,
s.id as serviceId,
left(r.CATEGORY_CODE,4) as firstCategoryCode
left(r.CATEGORY_CODE,4) as firstCategoryCode,
(
CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
ELSE ''
END
) as icResiUserId,
(
CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
ELSE ''
END
) as epmetUserId
FROM
ic_user_demand_rec r
left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
@ -235,7 +258,17 @@
case when r.PARENT_CODE !='0' then r.PARENT_CODE
ELSE R.CATEGORY_CODE
END
) as firstCategoryCode
) as firstCategoryCode,
(
CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
ELSE ''
END
) as icResiUserId,
(
CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
ELSE ''
END
) as epmetUserId
FROM
ic_user_demand_rec r
left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
@ -254,10 +287,10 @@
</if>
<if test=" null != startDateId and startDateId != '' ">
AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') <![CDATA[ >= ]]> #{startDateId}
AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{startDateId}
</if>
<if test="null != endDateId and endDateId != '' ">
AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDateId}
AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDateId}
</if>
order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc
</select>
@ -295,8 +328,8 @@
<if test="null != orgType and orgType == 'agency' ">
and m.GRID_PIDS like concat(#{gridPids},'%')
</if>
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
and m.CATEGORY_CODE like concat(#{category.value},'%')
and m.status !='canceled'
</foreach>
@ -328,8 +361,8 @@
<if test="null != orgType and orgType == 'agency' ">
and m.GRID_PIDS like concat(#{gridPids},'%')
</if>
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
and m.CATEGORY_CODE like concat(#{categoryCode},'%')
group by s.SERVICE_TYPE
@ -352,8 +385,8 @@
<if test="null != orgType and orgType == 'agency' ">
and m.GRID_PIDS like concat(#{gridPids},'%')
</if>
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
and m.CATEGORY_CODE like concat(#{categoryCode},'%')
</select>

6
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@ -621,7 +621,7 @@
AND i.GRID_ID = #{orgId}
</if>
<if test='orgType == "agency" '>
AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50
</select>
@ -653,10 +653,10 @@
AND i.GRID_ID = #{orgId}
</if>
<if test='orgType == "agency" '>
AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp
GROUP BY categoryCode
GROUP BY categoryName
</select>
<!-- 查询组织下每个网格的项目数 -->

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

@ -88,7 +88,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setBuildingId(entity.getId());
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit);
}
@ -103,7 +103,7 @@ public class BuildingServiceImpl implements BuildingService {
log.error("com.epmet.service.impl.BuildingServiceImpl.treeList,没有找到工作人员所属的机关信息,用户Id:{}",staffId);
return new ArrayList<>();
}
// agency = new CustomerStaffAgencyDTO();
// agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c");
//1.获取所在组织及下级组织
@ -275,7 +275,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setBuildingId(uuid);
icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit);
}
@ -464,7 +464,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setBuildingId(icBuilding.getId());
icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit);
}

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

@ -139,7 +139,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
}
}
//分队成员
StringBuffer inspectorsNames = new StringBuffer("");
StringBuffer inspectorsNames = new StringBuffer();
for (String str : resultDTO.getInspectors().split(",")) {
teamDTOList.forEach(r -> {
if (str.equals(r.getId())) {
@ -188,7 +188,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
}
});
//分队成员
StringBuffer inspectorsNames = new StringBuffer("");
StringBuffer inspectorsNames = new StringBuffer();
for (String str : dto.getInspectors().split(",")) {
teamDTOList.forEach(r -> {
if (str.equals(r.getId())) {
@ -202,4 +202,4 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
resultDTO.setList(result.getList());
return resultDTO;
}
}
}

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

@ -159,7 +159,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
//2.查询所有分队下人员名单
List<IcPlacePatrolTeamStaffDTO> teamDTOList = icPlacePatrolTeamStaffDao.getByTeamId(resultDTO.getPlacePatrolTeamId());
//3.封装九小场所数据
StringBuffer inspectorsNames = new StringBuffer("");
StringBuffer inspectorsNames = new StringBuffer();
for (String str : resultDTO.getInspectors().split(",")) {
teamDTOList.forEach(r -> {
if (str.equals(r.getId())) {
@ -195,7 +195,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
//3.封装各分队人员数据
for (PlacePatrolReviewRecordDetailResultDTO dto : result.getList()) {
//分队成员
StringBuffer inspectorsNames = new StringBuffer("");
StringBuffer inspectorsNames = new StringBuffer();
for (String str : dto.getInspectors().split(",")) {
teamDTOList.forEach(r -> {
if (str.equals(r.getId())) {
@ -218,4 +218,4 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
public int delByPatrolRecordId(String staffId, String placePatrolRecordId) {
return baseDao.delByPatrolRecordId(staffId, placePatrolRecordId);
}
}
}

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

@ -190,7 +190,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
//4.分别封装网格。九小场所数据
//网格
StringBuffer gridNames = new StringBuffer("");
StringBuffer gridNames = new StringBuffer();
for (String str : resultDTO.getGridIds().split(",")) {
gridList.forEach(r -> {
if (str.equals(r.getId())) {
@ -200,7 +200,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
}
resultDTO.setGridNames(gridNames.toString());
//九小场所
StringBuffer ninePlaceNames = new StringBuffer("");
StringBuffer ninePlaceNames = new StringBuffer();
for (String str : resultDTO.getNinePlaceVals().split(",")) {
nineList.getData().forEach(r -> {
if (str.equals(r.getValue())) {
@ -248,7 +248,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
//4.封装网格、九小场所数据
for (PlacePatrolTeamDetailResultDTO dto : result.getList()) {
StringBuffer gridNames = new StringBuffer("");
StringBuffer gridNames = new StringBuffer();
for (String str : dto.getGridIds().split(",")) {
gridList.forEach(r -> {
if (str.equals(r.getId())) {
@ -257,7 +257,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
});
}
dto.setGridNames(gridNames.toString());
StringBuffer ninePlaceNames = new StringBuffer("");
StringBuffer ninePlaceNames = new StringBuffer();
for (String str : dto.getNinePlaceVals().split(",")) {
nineList.getData().forEach(r -> {
if (str.equals(r.getValue())) {
@ -272,4 +272,4 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
return resultDTO;
}
}
}

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@ -301,6 +301,7 @@ public class ProjectController {
/**
* 个人档案-话题详情-研判分析
* 只看来源于议题的项目
* @param tokenDto
* @param formDTO
* @return

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@ -243,6 +243,7 @@ public class ResiEventController {
/**
* 数据分析-个人档案-上报事件列表-事件详情研判分析
* 只看来源于需求上报的项目
*
* @param formDTO
* @return

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -2958,6 +2958,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
@Override
public TopicResearchAnalysisResDTO topicResearchAnalysis(TopicResearchAnalysisFormDTO formDTO) {
//获取案件居民和及家属列表
//因为是从个人档案来,所以icResiUserId不会为空
Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
if (!userRes.success() || null == userRes.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
@ -3149,3 +3150,4 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
return simpleDateFormat.format(date);
}
}

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@ -688,6 +688,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
@Override
public ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO) {
//获取案件居民和及家属列表
//因为是从个人档案来,所以icResiUserId不会为空
Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
if (!userRes.success() || null == userRes.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");

6
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@ -402,12 +402,12 @@
<select id="selectProjectCategoryByDate" resultType="com.epmet.dto.result.ProjectCategoryByDateDTO">
SELECT
DISTINCT p.ID AS projectId,
CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%h:%i:%s')) AS createdTime,
CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%H:%i:%s')) AS createdTime,
LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode
FROM project p
INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0)
WHERE p.DEL_FLAG = 0
AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate}
AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
ORDER BY projectId
@ -478,7 +478,7 @@
COUNT(ID) AS count
FROM project
WHERE DEL_FLAG = '0'
AND ORG_ID_PATH LIKE CONCAT('%',#{orgId})
AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
</foreach>

19
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java

@ -0,0 +1,19 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@Data
public class FindIcUserFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
@NotBlank(message = "epmetUserId不能为空", groups = AddUserInternalGroup.class)
private String epmetUserId;
@NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
private String customerId;
}

35
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java

@ -0,0 +1,35 @@
package com.epmet.dto.result;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class EpmetUserFamilyDTO implements Serializable {
/**
* 当前客户下与自己相同身份证号的所有账号
*/
private List<String> epmetUserIdList;
/**
* 同身份证号对应的ic里的居民
*/
private String icResiUserId;
/**
* ic里的姓名
*/
private String icUserName;
/**
* ic里的房子id
*/
private String houseId;
/**
* 同屋的其他人
*/
private List<HouseUserDTO> houseUserList;
}

9
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@ -672,4 +672,13 @@ public interface EpmetUserOpenFeignClient {
@GetMapping("/epmetuser/icresiuser/findfamilymem/{icResiUserId}")
Result<IcResiUserBriefDTO> findFamilyMem(@PathVariable("icResiUserId") String icResiUserId);
/**
* 查找居民端小程序里的用户对应ic里的人以及家属们
*
* @param formDTO
* @return
*/
@PostMapping(value = "/epmetuser/user/findicuser")
Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO formDTO);
}

11
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@ -495,4 +495,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result<IcResiUserBriefDTO> findFamilyMem(String icResiUserId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMem", icResiUserId);
}
/**
* 查找居民端小程序里的用户对应ic里的人以及家属们
*
* @param epmetUserIdList
* @return
*/
@Override
public Result<EpmetUserFamilyDTO> findIcUser(FindIcUserFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO);
}
}

12
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@ -198,4 +198,16 @@ public class UserController {
ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class);
return new Result<ResiUserResDTO>().ok(userService.findEpmetUser(formDTO));
}
/**
* 查找居民端小程序里的用户对应ic里的人以及家属们
*
* @param findIcUserFormDTO
* @return
*/
@PostMapping(value = "findicuser")
public Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO findIcUserFormDTO){
ValidatorUtils.validateEntity(findIcUserFormDTO,FindIcUserFormDTO.AddUserInternalGroup.class);
return new Result<EpmetUserFamilyDTO>().ok(userService.findIcUser(findIcUserFormDTO));
}
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java

@ -12,6 +12,8 @@ import com.epmet.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description 用户DAO
* @IntefaceName UserDao
@ -63,4 +65,8 @@ public interface UserDao extends BaseDao<UserEntity> {
* @date 2021/9/10 8:51 上午
*/
UserDTO selectByUserId(String userId);
String selectIdNum(@Param("customerId") String customerId,@Param("epmetUserId") String epmetUserId);
List<String> selectCommonEpmetUser(@Param("idNum") String idNum, @Param("customerId") String customerId);
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java

@ -113,4 +113,12 @@ public interface UserService extends BaseService<UserEntity> {
* @return
*/
ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO);
/**
* 查找居民端小程序里的用户对应ic里的人以及家属们
*
* @param findIcUserFormDTO
* @return
*/
EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO);
}

29
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -385,4 +386,32 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
return resiUserResDTO;
}
/**
* 查找居民端小程序里的用户对应ic里的人以及家属们
*
* @param findIcUserFormDTO
* @return
*/
@Override
public EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO) {
EpmetUserFamilyDTO result=new EpmetUserFamilyDTO();
String idNum=baseDao.selectIdNum(findIcUserFormDTO.getCustomerId(),findIcUserFormDTO.getEpmetUserId());
if(StringUtils.isNotBlank(idNum)){
//同客户下,相同身份证号的,epmetuser
List<String> epmetUserIdList=baseDao.selectCommonEpmetUser(idNum,findIcUserFormDTO.getCustomerId());
result.setEpmetUserIdList(epmetUserIdList);
//找到该身份证号的居民
IcResiUserDTO icResiUserDTO=icResiUserService.getByIdCard(findIcUserFormDTO.getCustomerId(),idNum,null);
if(null!=icResiUserDTO){
result.setIcResiUserId(icResiUserDTO.getId());
result.setIcUserName(icResiUserDTO.getName());
result.setHouseId(icResiUserDTO.getHomeId());
IcResiUserBriefDTO icResiUserBriefDTO=icResiUserService.findFamilyMem(icResiUserDTO.getId());
result.setHouseUserList(null!=icResiUserBriefDTO&&CollectionUtils.isNotEmpty(icResiUserBriefDTO.getHouseUserList())?icResiUserBriefDTO.getHouseUserList():new ArrayList<>());
}
}
result.setEpmetUserIdList(Arrays.asList(findIcUserFormDTO.getEpmetUserId()));
return result;
}
}

22
epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@ -82,4 +82,26 @@
u.DEL_FLAG = '0'
AND u.id = #{userId}
</select>
<select id="selectIdNum" parameterType="map" resultType="java.lang.String">
SELECT
uri.ID_NUM
FROM
user_resi_info uri
WHERE
uri.DEL_FLAG = '0'
AND uri.USER_ID = #{epmetUserId}
AND uri.CUSTOMER_ID = #{customerId}
</select>
<select id="selectCommonEpmetUser" parameterType="map" resultType="java.lang.String">
SELECT DISTINCT
uri.user_id
FROM
user_resi_info uri
WHERE
uri.DEL_FLAG = '0'
AND uri.CUSTOMER_ID = #{customerId}
AND uri.ID_NUM = #{idNum}
</select>
</mapper>

Loading…
Cancel
Save