朋友圈

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/SendResultQDTO.java

+package com.gic.haoban.manage.api.qdto.moment;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SendResultQDTO implements Serializable {
+
+    private String wxEnterpriseId ;
+    private String staffId  ;
+    private String clerkId ;
+    private Long planId  ;
+    /**
+     * 发送时间
+     */
+    private Date sendTime ;
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Date getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(Date sendTime) {
+        this.sendTime = sendTime;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/moment/QwMomentApiService.java

@@ -63,4 +63,11 @@ public interface QwMomentApiService {
      * @return
      */
     ServiceResponse<TaskDetailDTO> taskDetail(Long planId, String execClerkId);
+
+    /**
+     * 完成任务
+     * @param qdto
+     * @return
+     */
+    ServiceResponse<Void> finishTask(SendResultQDTO qdto);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/QwMomentPlanAttendService.java

@@ -6,6 +6,7 @@ import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskDetailDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskListWxaDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO;
+import com.gic.haoban.manage.api.qdto.moment.SendResultQDTO;
 import com.gic.haoban.manage.api.qdto.moment.TaskListWxaQDTO;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface QwMomentPlanAttendService {
     ServiceResponse<TaskDetailDTO> taskDetail(Long planId, String execClerkId);
 
     ServiceResponse<Page<TaskListWxaDTO>> taskListWxa(TaskListWxaQDTO qdto);
+
+    ServiceResponse<Void> finishTask(SendResultQDTO qdto);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanAttendServiceImpl.java

@@ -10,6 +10,7 @@ import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskDetailDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskListWxaDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO;
+import com.gic.haoban.manage.api.qdto.moment.SendResultQDTO;
 import com.gic.haoban.manage.api.qdto.moment.TaskListWxaQDTO;
 import com.gic.haoban.manage.service.dao.mapper.moment.QwMomentPlanAttendMapper;
 import com.gic.haoban.manage.service.entity.moment.TabQwMomentPlanAttend;
@@ -97,4 +98,9 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         Page<TaskListWxaDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, TaskListWxaDTO.class);
         return ServiceResponse.success(retPage);
     }
+
+    @Override
+    public ServiceResponse<Void> finishTask(SendResultQDTO qdto) {
+        return null;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/moment/QwMomentApiServiceImpl.java

@@ -85,4 +85,8 @@ public class QwMomentApiServiceImpl implements QwMomentApiService {
         return this.qwMomentPlanAttendService.taskDetail(planId,execClerkId) ;
     }
 
+    @Override
+    public ServiceResponse<Void> finishTask(SendResultQDTO qdto) {
+        return this.qwMomentPlanAttendService.finishTask(qdto) ;
+    }
 }

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

@@ -8,10 +8,12 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanWxaDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskDetailDTO;
 import com.gic.haoban.manage.api.dto.moment.TaskListWxaDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanListWxaQDTO;
+import com.gic.haoban.manage.api.qdto.moment.SendResultQDTO;
 import com.gic.haoban.manage.api.qdto.moment.TaskListWxaQDTO;
 import com.gic.haoban.manage.api.qdto.moment.TaskNumQDTO;
 import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
@@ -109,6 +111,8 @@ public class QwMomentController {
      */
     @RequestMapping("material-list")
     public RestResponse<List<TaskMaterialVO>> getTaskMaterial(Long planId) {
+        ServiceResponse<QwMomentPlanDTO> detailResp = this.qwMomentApiService.detail(planId) ;
+
         return null ;
     }
 
@@ -117,8 +121,9 @@ public class QwMomentController {
      */
     @RequestMapping("finish-moment-task")
     @ResponseBody
-    public RestResponse<Void> finishTask(Long planId , String wxEnterpriseId , String enterpriseId , String storeId , String clerkId , String staffId) {
-        logger.info("完成任务={}") ;
-        return null ;
+    public RestResponse<Void> finishTask(@RequestBody SendResultQDTO qdto) {
+        logger.info("完成任务={}",JSONObject.toJSONString(qdto)) ;
+        this.qwMomentApiService.finishTask(qdto) ;
+        return RestResponse.successResult();
     }
 }