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; /** 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-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..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,7 +177,7 @@ 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') 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); + } } ); 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 c8b52524f2..5295abb0e5 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,6 +42,20 @@ public interface BadgeConstant { String DEFAULT = "default"; + /** + * 人大代表的type + */ + String NPC = "npc"; + + /** + * 政协委员的type + */ + String CPPCC = "cppcc"; + + String PARTY_BADGE = "党员徽章"; + String NPC_BADGE = "人大代表徽章"; + String CPPCC_BADGE = "政协委员徽章"; + // 人大代表徽章KEY String BADGE_KEY_NPC = "NPC"; 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/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 = ""; + } 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 4734770a3a..de2f864ff0 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); 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