[task-1451]-子-新首页开发/首页消息接口调整

ibps-common-root/modules/msg-biz/src/main/java/com/lc/ibps/common/msg/persistence/dao/InnerMessageQueryDao.java

@@ -28,5 +28,5 @@ public interface InnerMessageQueryDao extends IQueryDao<String,InnerMessagePo>{
 
 	List<InnerMessagePo> queryMsg(QueryFilter queryFilter);
 
-	List<InnerMessagePo> findByPosition(String userId,String positionId);
+	List<InnerMessagePo> findByPosition(String userId,String positionId,int status);
 }

ibps-common-root/modules/msg-biz/src/main/java/com/lc/ibps/common/msg/persistence/dao/impl/InnerMessageQueryDaoImpl.java

@@ -66,7 +66,7 @@ public class InnerMessageQueryDaoImpl extends MyBatisQueryDaoImpl<String, InnerM
 	}
 
 	 @Override
-	 public List<InnerMessagePo> findByPosition(String userId,String positionId) {
+	 public List<InnerMessagePo> findByPosition(String userId,String positionId,int status) {
 		 HashMap<String,Object> params = new HashMap<>();
 		// params.put("userId",userId);
 		 //遍历岗位查询
@@ -82,6 +82,7 @@ public class InnerMessageQueryDaoImpl extends MyBatisQueryDaoImpl<String, InnerM
 //		 }
 //		 params.put("position",buffer);
 //		 System.out.println(params);
+		 params.put("isRead",status);
 		 return this.findByKey("findByPosition",params);
 	 }
  }

ibps-common-root/modules/msg-biz/src/main/java/com/lc/ibps/common/msg/repository/InnerMessageRepository.java

@@ -22,7 +22,7 @@ public interface InnerMessageRepository extends IRepository<String, InnerMessage
 
 
 
-	List<InnerMessagePo> findByPosition(String userId);
+	List<InnerMessagePo> findByPosition(String userId,int status);
 	/**
 	 * 获得未读消息数
 	 *

ibps-common-root/modules/msg-biz/src/main/java/com/lc/ibps/common/msg/repository/impl/InnerMessageRepositoryImpl.java

@@ -106,7 +106,7 @@ public class InnerMessageRepositoryImpl extends AbstractRepository<String, Inner
 	}
 
 	@Override
-	public List<InnerMessagePo> findByPosition(String userId) {
+	public List<InnerMessagePo> findByPosition(String userId,int status) {
 		String id = ContextUtil.getCurrentUserId();
 		//根据id查询所以的岗位
 		APIResult<List<PartyPositionPo>> byUserId = partyPositionService.findByUserId(id);
@@ -119,7 +119,7 @@ public class InnerMessageRepositoryImpl extends AbstractRepository<String, Inner
 				positionId=positionId + data.get(i).getId()+",";
 			}
 		}
-		return innerMessageQueryDao.findByPosition(userId,positionId);
+		return innerMessageQueryDao.findByPosition(userId,positionId,status);
 	}
 
 	@Override

ibps-comp-root/modules/comp-message-server/src/main/java/com/lc/ibps/cloud/message/provider/InnerMessageProvider.java

@@ -211,7 +211,7 @@ public class InnerMessageProvider  extends GenericProvider implements IInnerMess
 //			params.put("isRead", InnerMessagePo.IS_NOT_READ);
 			params.put("isRead", status);
 			List<InnerMessagePo> messageList = innerMessageRepository.queryMsgByUserId(ContextUtil.getCurrentUserId(), params, page);
-			List<InnerMessagePo> mess =innerMessageRepository.findByPosition(ContextUtil.getCurrentUserId());
+			List<InnerMessagePo> mess =innerMessageRepository.findByPosition(ContextUtil.getCurrentUserId(),status);
 			messageList.addAll(mess);
 			for (InnerMessagePo po : messageList) {
 				po.setDurationTime(	DateUtil.timeAgo(po.getCreateTime()));

ibps-model-root/modules/msg-model/src/main/resources/com/lc/ibps/msg/persistence/mapping/InnerMessage.map.xml

@@ -149,12 +149,15 @@
 		a.id_ id,SUBJECT_ SUBJECT ,OWNER_ID_ ownerId,OWNER_ ownerName ,MESSAGE_TYPE_  messageType,CREATE_TIME_ createTime,CANREPLY_ canreply,
 		IS_PUBLIC_  isPublic,FILE_MSG_ fileMsg,RECEIVER_TIME_  receiverTime ,TABLE_ID_ tableId , TABLE_NAME_ tableName , TASK_ID_ taskId, CONTENT_ content
 		FROM ibps_msg_inner a JOIN ibps_msg_receiver b ON a.id_ = b.MSG_ID_ LEFT JOIN ibps_msg_read c ON a.id_ = c.msg_id_
+		<where>
 		<if test="split !=null and split.length>0 ">
-		where
 			<foreach collection="split" item="item" index="index" separator="OR">
 				b.receiver_id_ LIKE CONCAT('%',#{item},'%')
 		</foreach>
 		</if>
+		<if test="isRead == 0"> AND c.RECEIVER_TIME_ is null  </if>
+		<if test="isRead == 1"> AND c.RECEIVER_TIME_ is not null </if>
+		</where>
 		ORDER BY a.create_time_ DESC
 	</select>