Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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;
 
     /**

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<ResiEventReplyDao
         }
         // 回复内容走审核
         scanReplyContent(formDTO.getContent());
-        // 查询当前用户的显示昵称
+        // 查询当前用户的显示昵称   应该是xxx街道-姓/女士or先生  如果没有街道和姓，显示的微信昵称
         List<String> userIdList =new ArrayList<>();
         userIdList.add(formDTO.getUserId());
         Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
@@ -183,7 +183,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setResiEventId(formDTO.getResiEventId());
         resiEventReplyEntity.setFromUserId(formDTO.getUserId());
         resiEventReplyEntity.setContent(formDTO.getContent());
-        resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName());
+        resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getUserShowName());
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         //更新事件最后一次操作时间

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

@@ -266,7 +266,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         //7、插入艾特人表
         List<ResiEventMentionEntity> npcList=getNpcList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getNpcUserList());
         npcList.forEach(npc->{
+            if (StringUtils.isNotBlank(npc.getUserId()) && StringUtils.isNotBlank(npc.getUserShowName())){
                 resiEventMentionDao.insert(npc);
+            }
         });
         //8、插入log日志
         ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();

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

@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )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))
     </select>
 
 
@@ -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')

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<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
         String customerId = input.getCustomerId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId, loginUserUtil.getLoginUserId());
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);

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<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId);
 
     /**
      * @Description 查询上报目标列表

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<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId) {
 
         // 查询网格所属的组织信息
         //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
@@ -59,6 +59,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
 
         List<ResiEventNpcResultDTO> npcResultList = new ArrayList<>();
         npcData.stream().forEach(npc -> {
+                    if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) {
                         OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
                         ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
                                 npc.getUserId(),
@@ -70,6 +71,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
                                 gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
                         npcResultList.add(resiEventNpcInfo);
                     }
+                }
         );
 
         return npcResultList;

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";
 

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;
 }

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 = "";
+
 }

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

@@ -253,9 +253,20 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> 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 {
+            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);

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<UserBaseInfoDao, Us
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
             //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
             //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+            if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                if ("1".equals(baseInfo.getGender())) {
+                    //    男
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
+                } else if ("2".equals(baseInfo.getGender())) {
+                    //   女
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+                } else {
+                    // 0 未知
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                }
+            } else {
+                //    社会为微信昵称
+                baseInfo.setUserShowName(baseInfo.getNickname());
+            }
             userBaseInfoList.add(baseInfo);
             //}
         });

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';