Merge branch 'dev_optimize' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java

@@ -43,7 +43,7 @@ public class LatestActInfoDTO implements Serializable {
      * 客户id
      */
 	private String customerId;
-
+    private String gridId;
     /**
      * 活动标题
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java

@@ -28,7 +28,7 @@ public class DraftActInfoFormDTO implements Serializable {
      * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
      */
     private String actDraftId;
-
+    private String gridId;
 
     /**
      * 如果是重新发布活动，此列是有值的

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java

@@ -101,6 +101,9 @@ public class ActPreviewResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java

@@ -21,6 +21,7 @@ public class LatestDraftActInfoResultDTO implements Serializable {
      * 活动草稿id
      */
     private String actDraftId;
+    private String gridId;
     /**
      * 客户id
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@@ -2,6 +2,8 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ActConstant;
@@ -201,6 +203,13 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 actPreviewResultDTO.setUnitIdList(unitIds);
                 actPreviewResultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(actPreviewResultDTO.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(actPreviewResultDTO.getGridId());
+                    if (null != gridInfo) {
+                        actPreviewResultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
             }
         }
         return actPreviewResultDTO;
@@ -337,7 +346,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
 
         latestActInfoDTO.setActType(formDTO.getActType());
         latestActInfoDTO.setTarget(formDTO.getTarget());
-
+        latestActInfoDTO.setGridId(formDTO.getGridId());
         return latestActInfoDTO;
     }