From 2d434403b8d47ece255cf0f726a89f4abf0ee565 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 22 Jun 2020 10:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=87=E7=AB=A0=E6=A0=87=E7=AD=BE=E6=97=B6=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E4=B8=8E=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=EF=BC=8C=E4=BE=BF=E4=BA=8E=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E8=B7=A8=E5=A4=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/AddArticleTagsFormDTO.java |  6 ++++++
 .../com/epmet/service/impl/ArticleServiceImpl.java     | 10 ++++++----
 .../src/main/resources/mapper/ArticleTagsDao.xml       |  5 +++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
index 06c5b49ab8..da5f4c1504 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -53,6 +54,11 @@ public class AddArticleTagsFormDTO implements Serializable {
      */
     private String createdBy;
 
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
     /**
      * 更新人
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 10c59c6450..2e3d296122 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -1058,13 +1058,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		try {
 			//审核通过
 			this.updateAuditStatusFailById(draftId, syncScanResult);
-			this.publishDraftToArticle(draft);
+			ArticleEntity articleEntity = this.publishDraftToArticle(draft);
 			UpdateCustomerTagCacheDTO updateCustomerTagCacheDTO = this.updateCustomerTag(tokenDto, draftId);
 			if (updateCustomerTagCacheDTO == null) {
 				return;
 			}
 			List<UpdateGridTagCacheDTO> updateGridTagCacheDTOS = this.updateGridTag(tokenDto, draftId, updateCustomerTagCacheDTO);
-			this.addArticleTags(updateCustomerTagCacheDTO, draftId, tokenDto);
+			this.addArticleTags(updateCustomerTagCacheDTO, draftId, tokenDto, articleEntity.getCreatedTime());
 
 			//更新redis
 			try {
@@ -1279,10 +1279,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	/**
 	 * @param formDto
-	 * @Description 给文章挂标签  article_tags
+	 * @param createdTime
+	 * @Description 给文章挂标签  article_tags,创建时间与文章保持一致
 	 * @author zxc
 	 */
-	public void addArticleTags(UpdateCustomerTagCacheDTO formDto, String draftId, TokenDto tokenDto) {
+	public void addArticleTags(UpdateCustomerTagCacheDTO formDto, String draftId, TokenDto tokenDto, Date createdTime) {
 		List<AddArticleTagsFormDTO> addArticleTags = new ArrayList<>();
 		List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo();
 		DraftDTO draft = draftService.get(draftId);
@@ -1296,6 +1297,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			addArticleTag.setCustomerId(customerId);
 			addArticleTag.setArticleId(articleId);
 			BeanUtils.copyProperties(resultDTO, addArticleTag);
+			addArticleTag.setCreatedTime(createdTime);
 			addArticleTags.add(addArticleTag);
 		});
 		articleTagsDao.addArticleTags(addArticleTags);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
index 4995354629..92c4fb67f6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
@@ -8,8 +8,9 @@
         INSERT INTO article_tags ( ID, CUSTOMER_ID, ARTICLE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="addArticleTags" item="tag" separator=",">
-            ( REPLACE ( UUID(), '-', '' ),#{tag.customerId}, #{tag.articleId}, #{tag.tagId}, #{tag.tagName}, #{tag.delFlag},
-            #{tag.revision}, #{tag.createdBy}, NOW(),#{tag.updatedBy}, NOW())
+            ( REPLACE ( UUID(), '-', '' ),#{tag.customerId}, #{tag.articleId}, #{tag.tagId}, #{tag.tagName},
+            #{tag.delFlag},
+            #{tag.revision}, #{tag.createdBy}, #{tag.createdTime,jdbcType=TIMESTAMP},#{tag.updatedBy}, NOW())
         </foreach>
     </select>
     <select id="selectInitData" resultType="com.epmet.entity.ArticleTagsEntity">