朋友圈

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanAttendMapper.java

@@ -41,7 +41,7 @@ public interface QwMomentPlanAttendMapper {
 
     List<TaskListWxaDTO> taskListWxa(TaskListWxaQDTO qdto);
 
-    void finishTask(@Param("planId")Long attendId, @Param("sendTime")Date sendTime);
+    void finishTask(@Param("attendId")Long attendId, @Param("sendTime")Date sendTime );
 
     void updateMomentId(@Param("id") Long id, @Param("momentId") String jobId);
 

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

@@ -12,6 +12,8 @@ import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO;
@@ -75,6 +77,8 @@ public class QwMomentController {
     private MomentClerkExcelHandler momentClerkExcelHandler ;
     @Autowired
     private MomentDataExcelHandler momentDataExcelHandler ;
+    @Autowired
+    private StoreService storeService ;
 
     /**
      * 新建任务
@@ -340,6 +344,18 @@ public class QwMomentController {
         PlanClerkListQDTO qdto = EntityUtil.changeEntityByJSON(PlanClerkListQDTO.class,qo) ;
         ServiceResponse<Page<QwMomentPlanAttendDTO>> resp = this.qwMomentApiService.attendList(qdto) ;
         Page<QwMomentPlanAttendVO> retPage = PageHelperUtils.changePageToCurrentPage(resp.getResult(), QwMomentPlanAttendVO.class);
+        List<QwMomentPlanAttendVO> list = retPage.getResult() ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (QwMomentPlanAttendVO 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);
     }