Merge branch 'dev_optimize' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

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

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

@@ -25,6 +25,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -279,6 +281,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 detailResultDTO.setUnitIdList(unitIds);
                 detailResultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    detailResultDTO.setGridId(dto.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        detailResultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
             }
         }
         return new Result<ResiActDetailResultDTO>().ok(detailResultDTO);