From c3c60d039eff5c9d0d80b7a604043b560cfe497c Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 9 Aug 2021 15:24:28 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8A=A5?= =?UTF-8?q?=E4=BA=8B-=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=88=99=E4=B8=8D=E5=88=97?= =?UTF-8?q?=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiEventController.java | 6 ++++- .../com/epmet/service/ResiEventService.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 24 ++++++++++--------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index 57d06b8a0b..3328277513 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ResiEventNpcListFormDTO; @@ -30,6 +31,9 @@ public class ResiEventController { @Autowired private ResiEventService resiEventService; + @Autowired + private LoginUserUtil loginUserUtil; + /** * @return * @Description 查询人大代表列表(客户下的) @@ -40,7 +44,7 @@ public class ResiEventController { public Result>> listNpc(@RequestBody ResiEventNpcListFormDTO input) { ValidatorUtils.validateEntity(input); String customerId = input.getCustomerId(); - List npcs = resiEventService.listNpcByGrid(customerId); + List npcs = resiEventService.listNpcByGrid(customerId, loginUserUtil.getLoginUserId()); HashMap> wrapper = new HashMap<>(); wrapper.put("reportTargets", npcs); diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index 85432f2a18..7b26a10ad5 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -18,7 +18,7 @@ public interface ResiEventService { * @author wxz * @date 2021.08.03 09:29 */ - List listNpcByGrid(String customerId); + List listNpcByGrid(String customerId, String excludeUserId); /** * @Description 查询上报目标列表 diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index b81eb0f47e..bd6a1c4376 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -36,7 +36,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public List listNpcByGrid(String customerId) { + public List listNpcByGrid(String customerId, String excludeUserId) { // 查询网格所属的组织信息 //Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId); @@ -59,16 +59,18 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve List npcResultList = new ArrayList<>(); npcData.stream().forEach(npc -> { - OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); - ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( - npc.getUserId(), - npc.getGridId(), - "人大代表-".concat(npc.getRealName()), - npc.getRealName(), - npc.getHeadImgUrl(), - gridInfo != null ? gridInfo.getAgencyId() : null, - gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); - npcResultList.add(resiEventNpcInfo); + if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) { + OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); + ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( + npc.getUserId(), + npc.getGridId(), + "人大代表-".concat(npc.getRealName()), + npc.getRealName(), + npc.getHeadImgUrl(), + gridInfo != null ? gridInfo.getAgencyId() : null, + gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); + npcResultList.add(resiEventNpcInfo); + } } ); From 908015530d6b6adecc755316d5226752f4474543 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Aug 2021 15:54:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/BadgeConstant.java | 14 ++++++++++++++ .../com/epmet/service/impl/BadgeServiceImpl.java | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index 3be3ce02c3..2a1f89b16c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -42,4 +42,18 @@ public interface BadgeConstant { String DEFAULT = "default"; + /** + * 人大代表的type + */ + String NPC = "npc"; + + /** + * 政协委员的type + */ + String CPPCC = "cppcc"; + + String PARTY_BADGE = "党员徽章"; + String NPC_BADGE = "人大代表徽章"; + String CPPCC_BADGE = "政协委员徽章"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index dcdd39d4f1..bb28900479 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -253,9 +253,20 @@ public class BadgeServiceImpl extends BaseServiceImpl imp badgeEntity.setBadgeName(formDTO.getBadgeName()); badgeEntity.setBadgeIcon(formDTO.getBadgeIcon()); badgeEntity.setBadgeStatus(formDTO.getBadgeStatus()); + if (badgeEntity.getBadgeName().equals(BadgeConstant.PARTY_BADGE)){ + badgeEntity.setFixationBadgeType(BadgeConstant.PARTY); + } + if (badgeEntity.getBadgeName().equals(BadgeConstant.NPC_BADGE)){ + badgeEntity.setFixationBadgeType(BadgeConstant.NPC); + } + if (badgeEntity.getBadgeName().equals(BadgeConstant.CPPCC_BADGE)){ + badgeEntity.setFixationBadgeType(BadgeConstant.CPPCC); + } baseDao.insert(badgeEntity); } else { - badgeEntity.setBadgeName(formDTO.getBadgeName()); + if (!formDTO.getBadgeName().equals(BadgeConstant.PARTY_BADGE) && !formDTO.getBadgeName().equals(BadgeConstant.NPC_BADGE) && !formDTO.getBadgeName().equals(BadgeConstant.CPPCC_BADGE)){ + badgeEntity.setBadgeName(formDTO.getBadgeName()); + } badgeEntity.setBadgeIcon(formDTO.getBadgeIcon()); badgeEntity.setBadgeStatus(formDTO.getBadgeStatus()); baseDao.updateBadge(badgeEntity); From 41e9130165ccb89ed2eb5c6baa0a071273d80253 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Aug 2021 16:05:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?badgeKey=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/BadgeEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java index c36124dd7b..be4411c28e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java @@ -65,4 +65,6 @@ public class BadgeEntity extends BaseEpmetEntity { */ private Integer sort; + private String badgeKey = ""; + } From 346adcef6b7b7bde3f22a77fcf5c2d7f307b8cbe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 9 Aug 2021 16:20:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E8=BD=AC=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E5=86=85=E9=83=A8=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/EventToProjectFormDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java index 758b7acbbb..560ebfe2d8 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java @@ -38,8 +38,9 @@ public class EventToProjectFormDTO implements Serializable { private String publicReply; /** * 内部备注 1000 + * 21.08.09 直接立项的内部备注是必填的，然后议题转项目和我要直报转项目的都是非必填的 */ - @Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class}) + //@Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class}) private String internalRemark; /** From add11558de2172aef8003043a85b886d4b6bcd7a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 10 Aug 2021 09:44:42 +0800 Subject: [PATCH 5/8] bug --- .../src/main/resources/mapper/ResiEventDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 0c1808eae9..336b0c39ed 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -181,7 +181,7 @@ re.id as eventId FROM resi_event_report_org ro LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0') - LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND + inner JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2)) WHERE ro.DEL_FLAG = '0' AND ro.ORG_READ = 'un_read' From 20b7fdc864c9e8582780f5af91466657407136c3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 10 Aug 2021 09:59:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.17__badge_type_update.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql new file mode 100644 index 0000000000..3b1201d8a6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql @@ -0,0 +1,11 @@ +UPDATE badge +SET FIXATION_BADGE_TYPE = 'party' +WHERE ID = '1'; + +UPDATE badge +SET FIXATION_BADGE_TYPE = 'npc' +WHERE ID = '2'; + +UPDATE badge +SET FIXATION_BADGE_TYPE = 'cppcc' +WHERE ID = '3'; \ No newline at end of file From 5e2cc37fe92f222244e943cbf0767978103186b7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 10 Aug 2021 10:33:25 +0800 Subject: [PATCH 7/8] bug --- .../src/main/resources/mapper/ResiEventDao.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 336b0c39ed..c60df2fa6d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -49,7 +49,7 @@ ORDER BY re.CLOSE_CASE_TIME DESC )t - LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2)) + inner JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2)) @@ -132,8 +132,8 @@ (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback, (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject, IFNULL(re.project_id,'') AS projectId, - IFNULL(ea.ATTACHMENT_URL,'') AS eventImg, - concat('人大代表-',IFNULL(em.USER_SHOW_NAME,'')) AS person, + ea.ATTACHMENT_URL AS eventImg, + IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person, re.GRID_ID AS gridId, re.CREATED_BY AS eventUserId, ro.ORG_ID AS orgId @@ -177,11 +177,11 @@ SELECT IFNULL(re.EVENT_CONTENT,'') AS eventContent, DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime, - IFNULL(ea.ATTACHMENT_URL,'') AS img, + ea.ATTACHMENT_URL AS img, re.id as eventId FROM resi_event_report_org ro LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0') - inner JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND + LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2)) WHERE ro.DEL_FLAG = '0' AND ro.ORG_READ = 'un_read' From b5505c4ecdf225945e8d7403862b803fb842a572 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 Aug 2021 10:38:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9@=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=8F=AF?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E6=97=B6=EF=BC=8C=E5=9B=9E=E5=A4=8D=E8=A1=A8=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=98=AFXXX=E8=A1=97=E9=81=93-=E5=A7=93?= =?UTF-8?q?=E5=A5=B3=E5=A3=AB/=E5=85=88=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiEventReplyServiceImpl.java | 4 ++-- .../epmet/service/impl/ResiEventServiceImpl.java | 4 +++- .../epmet/dto/result/UserBaseInfoResultDTO.java | 5 +++++ .../service/impl/UserBaseInfoServiceImpl.java | 16 ++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index 7d1116c60c..0cc50a69b2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -170,7 +170,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl userIdList =new ArrayList<>(); userIdList.add(formDTO.getUserId()); Result> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); @@ -183,7 +183,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl npcList=getNpcList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getNpcUserList()); npcList.forEach(npc->{ - resiEventMentionDao.insert(npc); + if (StringUtils.isNotBlank(npc.getUserId()) && StringUtils.isNotBlank(npc.getUserShowName())){ + resiEventMentionDao.insert(npc); + } }); //8、插入log日志 ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity(); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java index 2c23abe08b..01741a9275 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java @@ -101,4 +101,9 @@ public class UserBaseInfoResultDTO implements Serializable { * 微信基本信息 */ private UserWechatResultDTO userWechatResultDTO; + + /** + * xxx街道-尹女士 + */ + private String userShowName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index c93e6fd99c..1ce80e7e61 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -181,6 +182,21 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl