朋友圈

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentClerkExcelHandler.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.QwMomentPlanAttendDTO;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO;
@@ -18,6 +20,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;
 
@@ -28,6 +31,9 @@ public class MomentClerkExcelHandler extends DownloadHandlerAbstract<MomentClerk
 
     @Autowired
     private QwMomentApiService qwMomentApiService ;
+    @Autowired
+    private StoreService storeService  ;
+
     @Override
     public List<MomentClerkExcelVO> getData(Context context, String json, Integer currentPage) {
         PlanClerkListQDTO qdto = JSON.parseObject(json, PlanClerkListQDTO.class);
@@ -41,8 +47,8 @@ public class MomentClerkExcelHandler extends DownloadHandlerAbstract<MomentClerk
         if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) {
             for(QwMomentPlanAttendDTO item : pageResp.getResult().getResult()) {
                 MomentClerkExcelVO vo = EntityUtil.changeEntityByJSON(MomentClerkExcelVO.class,item) ;
-                if(StringUtils.isNotBlank(storeId)) {
-                    StoreDTO store = this.storeService.getStore(storeId);
+                if(StringUtils.isNotBlank(vo.getStoreId())) {
+                    StoreDTO store = this.storeService.getStore(vo.getStoreId());
                     vo.setStoreName(store.getStoreName());
                     vo.setStoreCode(store.getStoreCode());
                 }
@@ -59,6 +65,7 @@ public class MomentClerkExcelHandler extends DownloadHandlerAbstract<MomentClerk
                         taskStatusExcel = "已失效" ;
                     }
                 }
+                vo.setTaskStatusExcel(taskStatusExcel);
                 voList.add(vo) ;
             }
         }