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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * 组织相关api
@@ -508,7 +505,7 @@ public class AgencyServiceImpl implements AgencyService {
             //todo 暂不处理 有时间再说
         }else {
             ScreenCustomerAgencyDTO parentAgencyDTO = null;
-            String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode();
+            String parentAreaCode = staffAgencyDTO.getParentAreaCode();
             List<OrgTreeNode> nodeList = new ArrayList<>();
 
             /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO();
@@ -524,7 +521,7 @@ public class AgencyServiceImpl implements AgencyService {
             convertOrgTreeNode(nodeList, currentAgency);*/
             //多客户 获取所有直线上级
             do {
-                parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode);
+                parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode);
                 if (parentAgencyDTO == null){
                     break;
                 }
@@ -532,20 +529,29 @@ public class AgencyServiceImpl implements AgencyService {
                 if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){
                     break;
                 }
-                subAgencyAreaCode = parentAgencyDTO.getAreaCode();
+                parentAreaCode = parentAgencyDTO.getAreaCode();
             } while (true);
+            log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList));
             //多客户 获取所有下级
             List<ScreenCustomerAgencyDTO> agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode());
-            //孔村降级处理
+            //孔村降级处理 且移除掉 党总支级别
             String KONG_CUN_AGENCY_ID = "1234085031077498881";
-            agencyNodeDTOS.forEach(e->{
+            Iterator<ScreenCustomerAgencyDTO> iterator = agencyNodeDTOS.iterator();
+            while (iterator.hasNext()){
+                ScreenCustomerAgencyDTO e = iterator.next();
                 if (e.getPids().contains(KONG_CUN_AGENCY_ID)){
-                    e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel()));
+                    if (OrgLevelEnum.STREET.getCode().equals(e.getLevel())){
+                        iterator.remove();
+                    }
+                    if (KONG_CUN_AGENCY_ID.equals(e.getAgencyId())){
+                        e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel()));
+                    }
                 }
                 convertOrgTreeNode(nodeList, e);
-            });
+            }
             nodes = TreeUtils.buildTreeByAreaCode(nodeList);
         }
+        log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes));
         //只有一个根节点的树 所以返回一个
         return nodes.get(0);
     }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java

@@ -52,4 +52,10 @@ public class UserMentionResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date showTime;
+
+    /**
+     * true:显示回复；false：不显示回复按钮
+     */
+    private String replyButtonFlag;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java

@@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 17:41
      */
     int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
+
+    ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId);
 }

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

@@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if (null == eventEntity) {
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
-        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
-            log.warn("报事人查看详情不需要调用此接口");
+        ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
+            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
             return;
         }
         // 这个事件已经被查看了
@@ -296,8 +297,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());
             mentionEntity.setReadFlag(EventConstant.UN_READ);
-            //默认不展示，因为此时在未读列表中
-            mentionEntity.setRedDot(false);
+            //默认展示，但是此时在未读列表中，个人中心页面应该展示红点
+            mentionEntity.setRedDot(true);
             list.add(mentionEntity);
         });
         return list;
@@ -506,6 +507,14 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         PageInfo<UserMentionResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(),
                 formDTO.getReadFlag()));
+        result.getList().forEach(dto->{
+            if(dto.getShiftProject()||dto.getStatus().equals(EventConstant.EVENT_STATUS_CLOSED_CASE)){
+                // 立项和办结了不能回复哈。
+                dto.setReplyButtonFlag("false");
+            }else{
+                dto.setReplyButtonFlag("true");
+            }
+        });
         return result.getList();
     }
 

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

@@ -78,4 +78,11 @@
                 </if>
                 AND DEL_FLAG = '0'
     </update>
+
+    <select id="selectUser" parameterType="map" resultType="com.epmet.entity.ResiEventMentionEntity">
+        select rem.* from resi_event_mention rem
+        where rem.del_flag='0'
+        and rem.RESI_EVENT_ID=#{eventId}
+        and rem.user_id=#{userId}
+    </select>
 </mapper>

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

@@ -6,7 +6,7 @@
 
     <update id="updateReadFlag" parameterType="map">
         UPDATE resi_event_report_org
-        SET READ_FLAG = 'read',
+        SET ORG_READ = 'read',
         UPDATED_BY = #{userId},
         UPDATED_TIME = NOW()
         WHERE