Просмотр исходного кода

[task-1488]-子-新首页开发/为ibps_msg_inner增加字段,修改indexMsgList、msgList和save接口

szjbdgzl 2 лет назад
Родитель
Сommit
3fc55faf7b

+ 11 - 0
ibps-model-root/modules/msg-model/src/main/java/com/lc/ibps/common/msg/persistence/entity/InnerMessageTbl.java

@@ -53,6 +53,17 @@ public class InnerMessageTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "流程任务id")
 	protected String taskId; /*流程任务id*/
 
+	@ApiModelProperty(value = "消息跳转类型")
+	protected String skipTypeMsg; /*消息跳转类型*/
+
+	public String getSkipTypeMsg() {
+		return skipTypeMsg;
+	}
+
+	public void setSkipTypeMsg(String skipTypeMsg) {
+		this.skipTypeMsg = skipTypeMsg;
+	}
+
 	public String getTaskId() {
 		return taskId;
 	}

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

@@ -17,16 +17,17 @@
 		<result property="tableId" column="TABLE_ID_" jdbcType="VARCHAR"/>
 		<result property="tableName" column="TABLE_NAME_" jdbcType="VARCHAR"/>
 		<result property="taskId" column="TASK_ID_" jdbcType="VARCHAR"/>
+		<result property="skipTypeMsg" column="SKIP_TYPE_MSG" jdbcType="BLOB"/>
 	</resultMap>
 	
 	<insert id="create" parameterType="com.lc.ibps.common.msg.persistence.entity.InnerMessagePo">
 		INSERT INTO IBPS_MSG_INNER
-		(ID_,SUBJECT_,OWNER_ID_,OWNER_,MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,CONTENT_,FILE_MSG_,TENANT_ID_,TABLE_ID_,TABLE_NAME_,TASK_ID_)
+		(ID_,SUBJECT_,OWNER_ID_,OWNER_,MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,CONTENT_,FILE_MSG_,TENANT_ID_,TABLE_ID_,TABLE_NAME_,TASK_ID_,SKIP_TYPE_MSG)
 		VALUES 
 		(#{id,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, #{ownerId,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR},
 		#{messageType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{canreply,jdbcType=NUMERIC}, #{isPublic,jdbcType=NUMERIC},
 		 #{content,jdbcType=CLOB}, #{fileMsg,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR},
-		 #{tableName,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR})
+		 #{tableName,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR},#{content,jdbcType=CLOB})
 	</insert>
 	
 	<select id="get"   parameterType="java.lang.String" resultMap="InnerMessage">
@@ -79,12 +80,12 @@
 	<select id="queryReceiveMsgByUserId"  resultType="com.lc.ibps.common.msg.persistence.entity.InnerMessagePo">
 		SELECT 
 			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
+			IS_PUBLIC_  isPublic,FILE_MSG_ fileMsg,RECEIVER_TIME_  receiverTime ,TABLE_ID_ tableId , TABLE_NAME_ tableName , TASK_ID_ taskId, CONTENT_ content,SKIP_TYPE_MSG skipTypeMsg
 			FROM (
 					SELECT 
 						msg.ID_ ID_,SUBJECT_,OWNER_ID_,(case msg.MESSAGE_TYPE_ when 'system' then #{systemOwner} else msg.OWNER_ end) OWNER_,
 						MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,FILE_MSG_,rd.RECEIVER_TIME_ RECEIVER_TIME_  ,
-						msg.TABLE_ID_ TABLE_ID_ , msg.TABLE_NAME_ TABLE_NAME_ , msg.TASK_ID_ TASK_ID_, msg.CONTENT_ CONTENT_
+						msg.TABLE_ID_ TABLE_ID_ , msg.TABLE_NAME_ TABLE_NAME_ , msg.TASK_ID_ TASK_ID_, msg.CONTENT_ CONTENT_,msg.SKIP_TYPE_MSG SKIP_TYPE_MSG
 					FROM IBPS_MSG_INNER msg 
 					LEFT JOIN IBPS_MSG_READ rd on msg.ID_=rd.MSG_ID_ AND rd.RECEIVER_ID_ =#{receiverId}
 					WHERE msg.ID_ IN (
@@ -105,7 +106,7 @@
 					SELECT 
 						msg.ID_ ID_,SUBJECT_,OWNER_ID_,(case msg.MESSAGE_TYPE_ when 'system' then #{systemOwner} else msg.OWNER_ end) OWNER_,
 						MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,FILE_MSG_,rd.RECEIVER_TIME_ RECEIVER_TIME_  ,
-						msg.TABLE_ID_ TABLE_ID_ , msg.TABLE_NAME_ TABLE_NAME_ , msg.TASK_ID_ TASK_ID_ , msg.CONTENT_ CONTENT_
+						msg.TABLE_ID_ TABLE_ID_ , msg.TABLE_NAME_ TABLE_NAME_ , msg.TASK_ID_ TASK_ID_ , msg.CONTENT_ CONTENT_,msg.SKIP_TYPE_MSG SKIP_TYPE_MSG
 					FROM IBPS_MSG_INNER msg 
 					LEFT JOIN IBPS_MSG_READ rd on msg.ID_=rd.MSG_ID_ AND rd.RECEIVER_ID_ =#{receiverId}
 					WHERE msg.IS_PUBLIC_=1 AND msg.SUBJECT_ NOT IN('审批提醒','流程结束通知')
@@ -152,7 +153,7 @@
 	<select id="findByPosition" resultType="com.lc.ibps.common.msg.persistence.entity.InnerMessagePo">
 		SELECT
 		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
+		IS_PUBLIC_  isPublic,FILE_MSG_ fileMsg,RECEIVER_TIME_  receiverTime ,TABLE_ID_ tableId , TABLE_NAME_ tableName , TASK_ID_ taskId, CONTENT_ content,SKIP_TYPE_MSG skipTypeMsg
 		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 ">