From a0776cc4426f0152052124040c7472c104f18afe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 11:09:39 +0800 Subject: [PATCH 01/18] yyyy-MM-dd --- .../dto/form/demand/CategoryAnalysisFormDTO.java | 4 ++-- .../dto/form/demand/PageListAnalysisFormDTO.java | 4 ++-- .../main/resources/mapper/IcUserDemandRecDao.xml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java index 30605910cf..2e564db7cc 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java +++ b/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) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java index b48063a722..464d1062a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java +++ b/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) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index ae5a8f6223..69dfd04d84 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -254,10 +254,10 @@ - AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') = ]]> #{startDateId} + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') = ]]> #{startDateId} - AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') #{endDateId} + AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') #{endDateId} order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc @@ -295,8 +295,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{category.value},'%') and m.status !='canceled' @@ -328,8 +328,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{categoryCode},'%') group by s.SERVICE_TYPE @@ -352,8 +352,8 @@ and m.GRID_PIDS like concat(#{gridPids},'%') - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') >= #{startDateId} - and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') <= #{endDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') >= #{startDateId} + and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') <= #{endDateId} and m.CATEGORY_CODE like concat(#{categoryCode},'%') From 78a4b779d9c42fa98b9d69b5123527ed17c00bde Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 11:49:45 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcUserDemandRecDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 69dfd04d84..953db19cb8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -90,7 +90,7 @@ AND r.GRID_PIDS LIKE concat('%',#{gridPids},'%') - and r.PARENT_CODE=#{categoryCode} + and (r.PARENT_CODE=#{categoryCode} or r.CATEGORY_CODE=#{categoryCode}) and r.CATEGORY_CODE=#{categoryCode} From 6404899d130d3e0f3f51941a1fe14555942dcae1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 14 Dec 2021 13:53:13 +0800 Subject: [PATCH 03/18] emm --- .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 3d1d2bde61..27d3b05535 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -656,7 +656,7 @@ AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp - GROUP BY categoryCode + GROUP BY categoryName From e087d1a1f413d68630f434db3d55ac9503c862d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 14:26:26 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E5=88=86=E6=9E=90=E8=BF=94=E5=9B=9EicResiUserId=E6=88=96?= =?UTF-8?q?=E8=80=85epmetUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/DemandResearchAnalysisFormDTO.java | 9 ++++- .../dto/result/demand/DemandRecResultDTO.java | 3 ++ .../epmet/constant/UserDemandConstant.java | 8 +++++ .../impl/IcUserDemandRecServiceImpl.java | 30 ++++++++++++++-- .../resources/mapper/IcUserDemandRecDao.xml | 36 +++++++++++++++++-- 5 files changed, 80 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index d40ed7cb8a..ea3f8bcdcd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/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 epmetUserIdList; @@ -31,4 +31,11 @@ public class DemandResearchAnalysisFormDTO implements Serializable { @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class) private String customerId; + + /** + * 个人档案：personal-data + * 服务措施分析：demand-analysis + */ + @NotBlank(message = "个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) + private String queryOrigin; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java index feb5c70b84..06052f22cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java @@ -114,4 +114,7 @@ public class DemandRecResultDTO implements Serializable { * 完成情况 */ private String finishDesc; + + private String icResiUserId; + private String epmetUserId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java index c28768b30f..85168b8a32 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java +++ b/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"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index b968fe4017..1edd9d20d5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -42,9 +42,11 @@ 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.ResiUserFormDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.IcResiUserBriefDTO; +import com.epmet.dto.result.ResiUserResDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.demand.*; import com.epmet.entity.*; @@ -583,7 +585,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandData=new ArrayList<>(); @@ -593,12 +595,34 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl()); demandData.add(demandDataDTO); + //如果是服务措施分析来的，并且是pc录入的需求，需要先去找epmetUserIdList + if(UserDemandConstant.DEMAND_ANALYSIS.equals(formDTO.getQueryOrigin()) + &&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + ResiUserFormDTO resiUserFormDTO=new ResiUserFormDTO(); + resiUserFormDTO.setCustomerId(formDTO.getCustomerId()); + resiUserFormDTO.setIcResiUserId(formDTO.getIcResiUserId()); + Result 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 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()); @@ -625,6 +649,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Tue, 14 Dec 2021 14:36:08 +0800 Subject: [PATCH 05/18] =?UTF-8?q?heart=20=E6=97=A5=E5=BF=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/src/main/resources/logback-spring.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml index aacc15fdab..df57dd24a6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml @@ -138,10 +138,9 @@ - + - From 40ab38f7bec4a6951919b1d3bd37b9a70bec3ecf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 14 Dec 2021 14:37:20 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcPartyActivityServiceImpl.java | 3 +++ .../epmet/service/impl/IcResiDemandDictServiceImpl.java | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 57fda0e82e..4057d1ba41 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/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 querySubCodeList(SubCodeFormDTO formDTO) { - return baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName()); + List list = baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName()); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list; } @Override From 20f1b885a0d58d538b5fca1dcdd9c2b091453251 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 14:57:12 +0800 Subject: [PATCH 07/18] status --- .../com/epmet/dto/result/demand/IcResiUserReportDemandRes.java | 2 +- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 1 + .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java index 869f1b01e9..19757a671c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java +++ b/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; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index b14d2d6c02..2725a3f9f3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/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 userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (!userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index ed2c5ee690..ab54bfd340 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/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 userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId()); if (!userRes.success() || null == userRes.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常"); From eaed8608f49c4cc3c4986e686eb735996df8e340 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Dec 2021 16:42:35 +0800 Subject: [PATCH 08/18] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovProjectController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 3d70bf2b96..422aa74f4c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/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 projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) { + public Result projectAnalysis(@LoginUser TokenDto tokenDto, @RequestBody ProjectAnalysisFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(govProjectService.projectAnalysis(formDTO)); } From e84ea6189827bff9c9b589fe90c30971ffe93a27 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Dec 2021 16:47:18 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java | 2 +- .../epmet/dataaggre/service/epmetuser/EpmetUserService.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java index 0ac5f211fc..e79c563c0a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java +++ b/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 { * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 * @author sun */ - List getUserBaseList(@Param("userId") String userId); + List getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 8b898f8765..6979f5d8b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/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 getUserBaseList(String userId); + List getUserBaseList(String userId, String customerId); /** * @Description 根据身份证号查询负能平台用户信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ac6ee4a24e..181e037830 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -712,8 +712,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { * @author sun */ @Override - public List getUserBaseList(String userId) { - return userBaseInfoDao.getUserBaseList(userId); + public List getUserBaseList(String userId, String customerId) { + return userBaseInfoDao.getUserBaseList(userId, customerId); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 7c821cffaa..dc84f51bdc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/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 userList = epmetUserService.getUserBaseList(formDTO.getUserId()); + List userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId()); List userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()); //2.查询对应负能平台用户家庭信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 195e586292..6c118e2ce0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/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} \ No newline at end of file From f77aa6e8a26c5222605fef63616a08fc5c101cba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Dec 2021 16:58:15 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demand/DemandResearchAnalysisFormDTO.java | 2 +- .../DemandResearchAnalysisResultDTO.java | 10 +-- .../dto/result/demand/HouseMemResDTO.java | 22 +++++++ .../impl/IcUserDemandRecServiceImpl.java | 66 ++++++++++++++----- .../com/epmet/dto/form/FindIcUserFormDTO.java | 19 ++++++ .../epmet/dto/result/EpmetUserFamilyDTO.java | 35 ++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 9 +++ .../EpmetUserOpenFeignClientFallback.java | 11 ++++ .../com/epmet/controller/UserController.java | 12 ++++ .../src/main/java/com/epmet/dao/UserDao.java | 6 ++ .../java/com/epmet/service/UserService.java | 8 +++ .../epmet/service/impl/UserServiceImpl.java | 29 ++++++++ .../src/main/resources/mapper/UserDao.xml | 22 +++++++ 13 files changed, 225 insertions(+), 26 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index ea3f8bcdcd..a6adc0a695 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -36,6 +36,6 @@ public class DemandResearchAnalysisFormDTO implements Serializable { * 个人档案：personal-data * 服务措施分析：demand-analysis */ - @NotBlank(message = "个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) + @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) private String queryOrigin; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java index 32f0737dc6..4828385812 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java +++ b/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 houseUserList; private List demandData; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java new file mode 100644 index 0000000000..f8126473b5 --- /dev/null +++ b/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 houseUserList; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 1edd9d20d5..e77ff237cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -42,12 +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.ResiUserResDTO; -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; @@ -579,13 +577,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl 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); - + HouseMemResDTO houseMemResDTO=queryDemandUserFamily(formDTO); + DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(houseMemResDTO, DemandResearchAnalysisResultDTO.class); + //log.info(JSON.toJSONString(formDTO)); //返参格式套一层类别和类别名称 List demandData=new ArrayList<>(); @@ -596,13 +590,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl resiRes=epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO); - if(!resiRes.success()){ + Result 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())) { @@ -655,6 +650,45 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl 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 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; + } + /** * 数分析-服务措施分析-分页查询 * diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java new file mode 100644 index 0000000000..c42fdeac01 --- /dev/null +++ b/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; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java new file mode 100644 index 0000000000..9b80c69701 --- /dev/null +++ b/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 epmetUserIdList; + + /** + * 同身份证号对应的ic里的居民 + */ + private String icResiUserId; + /** + * ic里的姓名 + */ + private String icUserName; + + /** + * ic里的房子id + */ + private String houseId; + + /** + * 同屋的其他人 + */ + private List houseUserList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 2fe940ead3..bff8b92a50 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/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 findFamilyMem(@PathVariable("icResiUserId") String icResiUserId); + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param formDTO + * @return + */ + @PostMapping(value = "/epmetuser/user/findicuser") + Result findIcUser(@RequestBody FindIcUserFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index fc6766d255..109c54c0ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/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 findFamilyMem(String icResiUserId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMem", icResiUserId); } + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param epmetUserIdList + * @return + */ + @Override + public Result findIcUser(FindIcUserFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 66d5d15d7a..5d5870439e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/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().ok(userService.findEpmetUser(formDTO)); } + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param findIcUserFormDTO + * @return + */ + @PostMapping(value = "findicuser") + public Result findIcUser(@RequestBody FindIcUserFormDTO findIcUserFormDTO){ + ValidatorUtils.validateEntity(findIcUserFormDTO,FindIcUserFormDTO.AddUserInternalGroup.class); + return new Result().ok(userService.findIcUser(findIcUserFormDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index e4c7a2cec5..0d77ea3ae3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/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 { * @date 2021/9/10 8:51 上午 */ UserDTO selectByUserId(String userId); + + String selectIdNum(@Param("customerId") String customerId,@Param("epmetUserId") String epmetUserId); + + List selectCommonEpmetUser(@Param("idNum") String idNum, @Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 0790655742..132ef019a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -113,4 +113,12 @@ public interface UserService extends BaseService { * @return */ ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO); + + /** + * 查找居民端小程序里的用户对应ic里的人。以及家属们 + * + * @param findIcUserFormDTO + * @return + */ + EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 697fda9582..1d987951bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/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 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 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; + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 6d82e4c200..605350bde2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -82,4 +82,26 @@ u.DEL_FLAG = '0' AND u.id = #{userId} + + + + From 369915a942c5e08b00387ca1bbb4b6ec41680580 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Dec 2021 09:09:57 +0800 Subject: [PATCH 11/18] =?UTF-8?q?org=20=E4=BB=A3=E7=A0=81=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/BuildingServiceImpl.java | 8 ++++---- .../service/impl/IcPlacePatrolRecordServiceImpl.java | 6 +++--- .../impl/IcPlacePatrolReviewRecordServiceImpl.java | 6 +++--- .../service/impl/IcPlacePatrolTeamServiceImpl.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index f1c5d28379..24fe5e520a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/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); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java index 2b205e9ae6..5535988941 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java +++ b/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 { if (str.equals(r.getId())) { @@ -188,7 +188,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -202,4 +202,4 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl 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 { if (str.equals(r.getId())) { @@ -218,4 +218,4 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -200,7 +200,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getValue())) { @@ -248,7 +248,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getId())) { @@ -257,7 +257,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl { if (str.equals(r.getValue())) { @@ -272,4 +272,4 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl Date: Wed, 15 Dec 2021 10:20:59 +0800 Subject: [PATCH 12/18] serviceShowFlag --- .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java | 4 ++++ .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 3 +++ .../src/main/java/com/epmet/controller/ProjectController.java | 1 + .../main/java/com/epmet/controller/ResiEventController.java | 1 + 4 files changed, 9 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java index 06052f22cf..e7b673d22f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java +++ b/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； */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e77ff237cd..7fecdb9e18 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -323,6 +323,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); @@ -563,6 +564,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, total); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index db1af3d7a9..070fc8bba0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/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 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 5ebcafac13..ca48b13304 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/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 From 04f9bb0933b527b7fd6c6f1c82f821e0973ea3a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 15 Dec 2021 11:10:16 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=9A=84=E7=A0=94?= =?UTF-8?q?=E5=88=A4=E5=88=86=E6=9E=90=EF=BC=8C=E6=8E=92=E9=99=A4=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E9=9C=80=E6=B1=82=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/demand/DemandResearchAnalysisFormDTO.java | 5 +++++ .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java | 6 ++++++ .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 1 + .../src/main/resources/mapper/IcUserDemandRecDao.xml | 3 +++ 4 files changed, 15 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java index a6adc0a695..893a383708 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java @@ -38,4 +38,9 @@ public class DemandResearchAnalysisFormDTO implements Serializable { */ @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class) private String queryOrigin; + + /** + * 当前查看的需求详情的需求id + */ + private String demandRecId; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java index 4589bbd9ed..ea0f862854 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java +++ b/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 userIds; + + + /** + * 当前查看的需求详情的需求id 可空 + */ + private String demandRecId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 7fecdb9e18..e66cb7cdc9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -623,6 +623,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl demandList = baseDao.selectUserDemand(icResiUserDemandFromDTO); if(CollectionUtils.isNotEmpty(demandList)){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 9e66aa8abc..11d3190a6c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -152,6 +152,9 @@ and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%') + + and r.id !=#{demandRecId} + ORDER BY r.WANT_SERVICE_TIME DESC From cbd0e286b6c02dc2b01566aa60cb23b299fd0551 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 15 Dec 2021 13:30:36 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?= =?UTF-8?q?=E4=B8=AD=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=AD=A3=E5=9C=A8=E6=9F=A5=E7=9C=8B=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java | 3 +++ .../service/govproject/impl/GovProjectServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java index d3d1a0e9a8..a620667571 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java +++ b/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 categoryCodeList; + //当前查看的项目Id + @NotBlank(message = "当前查看项目Id不能为空", groups = {Analysis.class}) + private String projectId; private String customerId; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index dc84f51bdc..200054ae6d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -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); } From d6f2b17edd026559a7ec8133c1787b933737d794 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Dec 2021 14:13:34 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=20stats=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/DemoController.java | 2 +- .../main/java/com/epmet/model/IndexExcelDataListener.java | 1 - .../service/crm/impl/CustomerRelationServiceImpl.java | 7 ++----- .../todata/impl/FactGridGovernDailyServiceImpl.java | 2 +- .../todata/impl/FactOriginTopicMainDailyServiceImpl.java | 4 ++-- .../screen/impl/ShiBeiScreenCollServiceImpl.java | 1 - .../com/epmet/service/impl/DataReportingServiceImpl.java | 4 ++-- .../java/com/epmet/service/impl/StatsUserServiceImpl.java | 6 +++--- .../epmet/service/stats/impl/DimQuarterServiceImpl.java | 4 ++-- .../com/epmet/support/normalizing/ScoreCalculator.java | 5 +---- 10 files changed, 14 insertions(+), 22 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 191c03bf7e..ef567e92f1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/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 future1 = executorService.submit(() -> demoService.testThreadPool()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java index 690543f0d2..687e04e0a7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java @@ -35,7 +35,6 @@ public class IndexExcelDataListener extends AnalysisEventListener { * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收 */ private static volatile boolean isGroup = false; - ; AtomicInteger total = new AtomicInteger(0); Map indexDicMap = new HashMap<>(); Map indexGroupMap = new HashMap<>(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java index 06d2b580fc..e199d2f46c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java +++ b/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 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= month) { date[NumConstant.ONE] = NumConstant.ZERO_STR + month; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 21a7c06860..82d1a4a0e0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/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 codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());; - //项目ID不为空时，因为只有一条，可以直接处理 + Map codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId()); + //项目ID不为空时，因为只有一条，可以直接处理 Map finalEpmetCodeMap = epmetCodeMap; if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) { list = projectList.stream().map(project -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java index bdc1999ff7..a3ccd6c5a1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java +++ b/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 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 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); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java index 5bad47d7f0..250a54f690 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java +++ b/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 { * @return */ protected boolean validSourceArray(T[] sourceArray) { - if (sourceArray == null || sourceArray.length == 0) { - return false; - } - return true; + return sourceArray != null && sourceArray.length != 0; } /** From 07eac61ef1c53edc3a457f1d5b033119d87d8ff1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 15 Dec 2021 15:27:30 +0800 Subject: [PATCH 16/18] =?UTF-8?q?admin=E6=96=B0=E5=A2=9E=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.7__add_dict_data_V3.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql new file mode 100644 index 0000000000..792aec0c87 --- /dev/null +++ b/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'); From d2379745752fbd11ef859226ccc11e52ca11dc1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 15 Dec 2021 15:44:52 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=8A=A0%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 4 ++-- .../src/main/resources/mapper/ProjectDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 27d3b05535..55648edcad 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -621,7 +621,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50 @@ -653,7 +653,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp GROUP BY categoryName diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 83332f7dfb..04b41b4180 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -407,7 +407,7 @@ 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') #{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') #{endDate} From abb76066cc831c76ceb4e3e47068efc8c833b861 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 15 Dec 2021 16:20:42 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 04b41b4180..2e5d52b4ca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -402,7 +402,7 @@