Merge branch 'feature/1003376zy' into 'master'

feat: [none] 时代大屏增加采集数据更新字段

See merge request rays/pcloud-book!1129

pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml

@@ -45,7 +45,7 @@
 		INSERT INTO BOOK_ADVISER (
 			BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID, SECOND_TEMPLET_ID,
 			GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,pro_label_id, dep_label_id,pur_label_id,is_open_robot_process,
-		vol_label_id
+		vol_label_id,LAST_MODIFIED_DATE
 		)
 		VALUES (
 			#{bookId, jdbcType=VARCHAR}, #{adviserId, jdbcType=VARCHAR}, #{channelId, jdbcType=VARCHAR}, 
@@ -53,10 +53,10 @@
 			#{secondTempletId, jdbcType=BIGINT},#{graLabelId, jdbcType=BIGINT},#{subLabelId, jdbcType=BIGINT},
 			#{verLabelId, jdbcType=BIGINT},#{areaLabelId, jdbcType=BIGINT},#{proLabelId,jdbcType=BIGINT},
 			#{depLabelId,jdbcType=BIGINT},#{purLabelId,jdbcType=BIGINT},#{isOpenRobotProcess,jdbcType=BIT},
-		#{volLabelId}
+		#{volLabelId},now()
 		)
 		ON
-			DUPLICATE KEY UPDATE IS_DELETE = 0, IS_MAIN_EDITOR = #{isMainEditor, jdbcType=BIT}
+			DUPLICATE KEY UPDATE IS_DELETE = 0,LAST_MODIFIED_DATE=now(), IS_MAIN_EDITOR = #{isMainEditor, jdbcType=BIT}
 		  <if test="templetId!=null">
 			,TEMPLET_ID=#{templetId, jdbcType=BIGINT}
 		  </if>
@@ -81,13 +81,13 @@
 	<insert id="batchInsert" parameterType="bookAdviser" useGeneratedKeys="true" keyProperty="bookAdviserId" flushCache="true">
 		<foreach collection="list" item="item" index="index" separator=";">
 		INSERT INTO BOOK_ADVISER (
-			BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID,SECOND_TEMPLET_ID
+			BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID,SECOND_TEMPLET_ID,LAST_MODIFIED_DATE
 		)
 		VALUES 
 		(
 			#{item.bookId, jdbcType=VARCHAR}, #{item.adviserId, jdbcType=VARCHAR}, #{item.channelId, jdbcType=VARCHAR}, 
-			#{item.adviserId, jdbcType=BIGINT}, NOW(),#{item.isMainEditor, jdbcType=BIT},#{item.templetId, jdbcType=BIGINT},#{item.secondTempletId, jdbcType=BIGINT}
-		) ON DUPLICATE KEY UPDATE IS_DELETE = 0,IS_MAIN_EDITOR=#{item.isMainEditor, jdbcType=BIT}
+			#{item.adviserId, jdbcType=BIGINT}, NOW(),#{item.isMainEditor, jdbcType=BIT},#{item.templetId, jdbcType=BIGINT},#{item.secondTempletId, jdbcType=BIGINT},now()
+		) ON DUPLICATE KEY UPDATE IS_DELETE = 0,LAST_MODIFIED_DATE=now(),IS_MAIN_EDITOR=#{item.isMainEditor, jdbcType=BIT}
 		<if test="item.templetId!=null">
 		   ,TEMPLET_ID=#{item.templetId, jdbcType=BIGINT}
 		</if>
@@ -596,7 +596,8 @@
 	  		<if test="secondTempletId!=null">
 		  		SECOND_TEMPLET_ID = #{secondTempletId},
 			</if>
-		  	TEMPLET_ID = #{parentId}
+		  	TEMPLET_ID = #{parentId},
+		LAST_MODIFIED_DATE =  NOW()
 	  	WHERE
 		  	TEMPLET_ID = #{originTempletId}
 	</update>
@@ -670,7 +671,8 @@
         update
             book_adviser
         set
-            IS_PRINT = #{isPrint}
+            IS_PRINT = #{isPrint},
+		LAST_MODIFIED_DATE =  NOW()
         where
             BOOK_ID = #{bookId}
         <if test="channelId != null">