填报，审核时标记相应的消息为已读

src/main/java/com/keymobile/indicators/model/mapper/indicators/NoticeInfoMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface NoticeInfoMapper extends BaseMapper<NoticeInfo> {
@@ -55,4 +56,11 @@ public interface NoticeInfoMapper extends BaseMapper<NoticeInfo> {
      * @param ids
      */
     void updateToRead(@Param("ids")List<Integer> ids);
+    /**
+     * 根据用户id，任务id，消息类型标记已读
+     * @Param [enterUsers, taskId, noticeClass]
+     * @Date 2020/12/29 16:02
+     * @Author hzc
+     **/
+    void updateToReadByToUsersAndTaskIdAndNoticeClass(Map<String, Object> params);
 }

src/main/java/com/keymobile/indicators/service/NoticeInfoService.java

@@ -59,4 +59,13 @@ public interface NoticeInfoService {
      * @param ids
      */
     void updateToRead(List<Integer> ids);
+
+
+    /**
+     * 根据用户id，任务id，消息类型标记已读
+     * @Param [enterUsers, taskId, noticeClass]
+     * @Date 2020/12/29 16:02
+     * @Author hzc
+     **/
+    void updateToReadByToUsersAndTaskIdAndNoticeClass(String enterUsers, String taskId, Integer noticeClass);
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -352,6 +352,10 @@ public class TaskServiceImpl implements TaskService {
                     taskAuditRecordMapper.insert(auditRecord);
                     noticeInfoService.createNotices(noticeInfos);
                     result = Result.genOkResult();
+
+                    //填报消息设为已读
+                    noticeInfoService.updateToReadByToUsersAndTaskIdAndNoticeClass(task.getEnterUsers(),taskId,Constants.NOTICEINFO_DATA_ENTER);
+
                     LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}提交任务id:{},name:{}到审核",
                            user, taskId, task.getRuleName());
                 } else {
@@ -439,6 +443,8 @@ public class TaskServiceImpl implements TaskService {
             }
         }
 
+        //标记审核消息为已读 2020-12-19 hzc
+        noticeInfoService.updateToReadByToUsersAndTaskIdAndNoticeClass(task.getEnterUsers(),task.getId(),Constants.NOTICEINFO_DATA_AUDIT);
 
     }
 

src/main/java/com/keymobile/indicators/service/impl/NoticeInfoServiceImpl.java

 package com.keymobile.indicators.service.impl;
 
+import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.NoticeInfo;
 import com.keymobile.indicators.model.mapper.indicators.NoticeInfoMapper;
 import com.keymobile.indicators.service.NoticeInfoService;
@@ -7,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class NoticeInfoServiceImpl implements NoticeInfoService {
@@ -50,4 +53,18 @@ public class NoticeInfoServiceImpl implements NoticeInfoService {
     public void updateToRead(List<Integer> ids) {
         noticeInfoMapper.updateToRead(ids);
     }
+    /**
+     * 根据用户id，任务id，消息类型标记已读
+     * @Param [enterUsers, taskId, noticeClass]
+     * @Date 2020/12/29 16:02
+     * @Author hzc
+     **/
+    @Override
+    public void updateToReadByToUsersAndTaskIdAndNoticeClass(String enterUsers, String taskId, Integer noticeClass) {
+        Map<String,Object> params = new HashMap<>();
+        params.put("toUsers",enterUsers.split(Constants.SEP_COMMA));
+        params.put("taskId",taskId);
+        params.put("noticeClass",noticeClass);
+        noticeInfoMapper.updateToReadByToUsersAndTaskIdAndNoticeClass(params);
+    }
 }

src/main/java/com/keymobile/indicators/utils/ModelPathEnum.java

@@ -8,13 +8,13 @@ public enum ModelPathEnum {
 	LOG_INDICATOR_SCORECARD_API("indicator.scorecard","规则管理/指标计分规则管理"),
 	LOG_INDICATOR_OBJ_SCORERULE_API("indicator.obj.scorerule","规则管理/单位得分规则管理"),
 	LOG_INDICATOR_SHORTBOARD_RULE_API("indicator.shortboardrule","规则管理/短板筛选规则管理"),
-	LOG_INDICATOR_PARAMETER_API("indicator.parameter","台账管理"),
-	LOG_INDICATOR_BASEDATACHECK("indicator.basedatacheck","数据项稽核"),
+	LOG_INDICATOR_PARAMETER_API("indicator.parameter","数据填报/台账管理"),
+	LOG_INDICATOR_BASEDATACHECK("indicator.basedatacheck","数据填报/数据项稽核"),
 	LOG_INDICATOR_SHORTBOARD_UNIT_API("indicator.shortboardunit","短板管理/短板规则"),
 	LOG_INDICATOR_SHORTBOARD_TASK_API("indicator.shortboardtask","短板管理/短板清单"),
 	LOG_INDICATOR_UPLOAD_FILE_API("indicator.uploadfile","文件管理"),
 	LOG_INDICATOR_SHORTBOARD_RECORD_API("indicator.shortboardrecord","短板管理/短板预警池"),
-	LOG_INDICATOR_SHORTBOARD_AUDIT_API("indicator.shortboardaudit","短板管理/检查改善错误");
+	LOG_INDICATOR_SHORTBOARD_AUDIT_API("indicator.shortboardaudit","短板管理/检查改善措施");
 	private String modelName;
 	private String modelPath;
 

src/main/resources/mybatis/mapping/NoticeInfoMapper.xml

@@ -65,4 +65,15 @@
         </foreach>
         )
     </update>
+    <update id="updateToReadByToUsersAndTaskIdAndNoticeClass" parameterType="map">
+        update notice_info
+        set
+        is_read = true
+        where to_user in (
+        <foreach collection="toUsers" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+        and task_id=#{taskId} and notice_class=#{noticeClass}
+    </update>
 </mapper>
\ No newline at end of file