朋友圈

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

@@ -288,18 +288,6 @@ public class QwMomentController {
     }
 
     /**
-     * 活动列表-导出
-     * @param qo
-     * @return
-     */
-    @RequestMapping("plan-list-excel")
-    public RestResponse<String> planListExcel(@RequestBody PlanListQO qo) {
-        QwMomentPlanQDTO qdto = new QwMomentPlanQDTO() ;
-        ServiceResponse<Page<QwMomentPlanDTO>> resp = this.qwMomentApiService.planList(qdto) ;
-        return RestResponse.successResult(null);
-    }
-
-    /**
      * 活动详情
      */
     @RequestMapping("detail")
@@ -340,18 +328,6 @@ public class QwMomentController {
     }
 
     /**
-     * 执行导购列表-导出
-     * @param qo
-     * @return
-     */
-    @RequestMapping("clerk-list-excel")
-    public RestResponse<String> clerkListExcel(@RequestBody PlanClerkListQO qo) {
-        PlanClerkListQDTO qdto = EntityUtil.changeEntityByJSON(PlanClerkListQDTO.class,qo) ;
-        ServiceResponse<Page<QwMomentPlanAttendDTO>> resp = this.qwMomentApiService.attendList(qdto) ;
-        return RestResponse.successResult(null);
-    }
-
-    /**
      * 统计
      */
     @RequestMapping("data-list")
@@ -373,4 +349,30 @@ public class QwMomentController {
         return RestResponse.successResult(null);
     }
 
+
+    /**
+     * 活动列表-导出
+     * @param qo
+     * @return
+     */
+    @RequestMapping("plan-list-excel")
+    public RestResponse<String> planListExcel(@RequestBody PlanListQO qo) {
+        QwMomentPlanQDTO qdto = new QwMomentPlanQDTO() ;
+        ServiceResponse<Page<QwMomentPlanDTO>> resp = this.qwMomentApiService.planList(qdto) ;
+        return RestResponse.successResult(null);
+    }
+
+
+    /**
+     * 执行导购列表-导出
+     * @param qo
+     * @return
+     */
+    @RequestMapping("clerk-list-excel")
+    public RestResponse<String> clerkListExcel(@RequestBody PlanClerkListQO qo) {
+        PlanClerkListQDTO qdto = EntityUtil.changeEntityByJSON(PlanClerkListQDTO.class,qo) ;
+        ServiceResponse<Page<QwMomentPlanAttendDTO>> resp = this.qwMomentApiService.attendList(qdto) ;
+        return RestResponse.successResult(null);
+    }
+
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/moment/TaskDetailVO.java

@@ -60,7 +60,13 @@ public class TaskDetailVO implements Serializable {
     // 0已失效1待执行 2已执行
     private Integer taskStatus ;
 
+    public Integer getTaskStatus() {
+        return taskStatus;
+    }
 
+    public void setTaskStatus(Integer taskStatus) {
+        this.taskStatus = taskStatus;
+    }
 
     public Long getPlanId() {
         return planId;