文章操作记录 添加下线网格Ids

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java

@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,6 +47,11 @@ public class ArticleOperateRecordEntity extends BaseEpmetEntity {
      */
 	private String articleId;
 
+	/**
+	 * 网格ID，下线文章时，多个以英文:隔开
+	 */
+	private String gridIds;
+
     /**
      * 执行人 xx街道-xx中心-姓名
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -551,16 +551,19 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		recordEntity.setOpUser(articleEntity.getPublisherName() + StrConstant.HYPHEN + staffDTO.getRealName());
 		//下线文案，分为全部下线和部分下线
 		String content = "";
+		StringBuffer offLineGridId = new StringBuffer();
 		if (null == publishedList || publishedList.size() < NumConstant.ONE) {
 			content = String.format(ArticleConstant.OFF_LINE_ALL_ARTICLE_MSG, articleEntity.getPublisherName(), staffDTO.getRealName(), articleEntity.getTitle());
 		} else {
 			StringBuffer offLineRangeDesc = new StringBuffer();
 			offLineList.forEach(off -> {
+				offLineGridId.append(StrConstant.COLON).append(off.getGridId());
 				offLineRangeDesc.append(offLineRangeDesc.length() > NumConstant.ZERO ? StrConstant.COMMA_ZH : "");
 				offLineRangeDesc.append(off.getAgencyGridName());
 			});
 			content = String.format(ArticleConstant.OFF_LINE_ARTICLE_MSG, articleEntity.getPublisherName(), staffDTO.getRealName(), articleEntity.getTitle(), offLineRangeDesc);
 		}
+		recordEntity.setGridIds(offLineGridId.toString().replaceFirst(StrConstant.COLON,""));
 		recordEntity.setContent(content);
 		recordEntity.setOpType(ArticleConstant.OFFLINE);
 		recordEntity.setOpTime(date);

epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql

@@ -250,6 +250,7 @@ CREATE TABLE article_operate_record(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID 主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     ARTICLE_ID VARCHAR(64) NOT NULL   COMMENT '文章ID' ,
+    GRID_IDS VARCHAR(1024) NOT NULL   COMMENT '网格ID，下线文章时，多个以英文:隔开' ,
     OP_USER VARCHAR(128) NOT NULL   COMMENT '执行人 xx街道-xx中心-姓名' ,
     CONTENT VARCHAR(512) NOT NULL   COMMENT '操作内容 操作内容，eg：重新编辑文章；' ,
     OP_TYPE VARCHAR(32) NOT NULL   COMMENT '操作类型 发布文章：publish；取消文章置顶：canceltop；设置置顶：settom；下线文章：offline；修改文章发布范围：updatepublishrange' ,