朋友圈

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentDataExcelHandler.java

@@ -7,6 +7,8 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDataDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO;
@@ -17,6 +19,7 @@ import com.gic.haoban.manage.web.vo.moment.MomentPlanExcelVO;
 import com.gic.web.common.download.DownloadHandlerAbstract;
 import com.gic.web.common.download.context.Context;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +33,11 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
 
     @Autowired
     private QwMomentApiService qwMomentApiService ;
+
+    @Autowired
+    private StoreService storeService  ;
+
+
     @Override
     public List<MomentDataExcelVO> getData(Context context, String json, Integer currentPage) {
         PlanDataListQDTO qdto = JSON.parseObject(json, PlanDataListQDTO.class);
@@ -48,6 +56,11 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
                 if(qdto.getType()==2 && null != vo.getCommentTime()) {
                     vo.setTimeExcel(DateUtil.dateToStr(vo.getCommentTime(),"yyyy-MM-dd HH:mm:ss"));
                 }
+                if(StringUtils.isNotBlank(vo.getStoreId())) {
+                    StoreDTO store = this.storeService.getStore(vo.getStoreId());
+                    vo.setStoreName(store.getStoreName());
+                    vo.setStoreCode(store.getStoreCode());
+                }
                 voList.add(vo) ;
             }
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java

@@ -383,6 +383,18 @@ public class QwMomentController {
         PlanDataListQDTO qdto = EntityUtil.changeEntityByJSON(PlanDataListQDTO.class,qo) ;
         ServiceResponse<Page<QwMomentPlanDataDTO>> resp = this.qwMomentApiService.dataList(qdto) ;
         Page<QwMomentPlanDataVO> retPage = PageHelperUtils.changePageToCurrentPage(resp.getResult(), QwMomentPlanDataVO.class);
+        List<QwMomentPlanDataVO> list = retPage.getResult() ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (QwMomentPlanDataVO vo : list) {
+                String storeId = vo.getStoreId() ;
+                if(StringUtils.isNotBlank(storeId)) {
+                    StoreDTO store = this.storeService.getStore(storeId);
+                    vo.setStoreId(storeId);
+                    vo.setStoreName(store.getStoreName());
+                    vo.setStoreCode(store.getStoreCode());
+                }
+            }
+        }
         return RestResponse.successResult(retPage);
     }