Merge remote-tracking branch 'origin/master'

src/main/java/com/xdap/self_development/controller/YcTaskResultController.java

@@ -2,15 +2,20 @@ package com.xdap.self_development.controller;
 
 
 import com.definesys.mpaas.common.http.Response;
+import com.xdap.self_development.controller.request.YcGetTodoTaskRequest;
 import com.xdap.self_development.pojo.TodoTaskPojo;
 import com.xdap.self_development.pojo.dto.YcCompletedResultDTO;
 import com.xdap.self_development.pojo.dto.YcInitiatorResultDTO;
 import com.xdap.self_development.pojo.dto.YcTodoTaskResultDTO;
 import com.xdap.self_development.service.TodoTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/custom/YcTaskResult")
 public class YcTaskResultController {
@@ -19,17 +24,22 @@ public class YcTaskResultController {
     TodoTaskService todoTaskService;
 
     //返回待办给玉柴云
-    Response returnTodoTask(){
+    @PostMapping("/returnTodoTask")
-        YcTodoTaskResultDTO dto = new YcTodoTaskResultDTO();
+    public Response returnTodoTask(@RequestBody String userName) {
-        return Response.ok().data(dto);
+        List<YcTodoTaskResultDTO> dtos = todoTaskService.returnTodoTask(userName);
+        return Response.ok().data(dtos);
     }
+
     //返回经办(已办)给玉柴云
-    Response returnCompleted(){
+    @PostMapping("/returnCompleted")
+    public Response returnCompleted(@RequestBody YcGetTodoTaskRequest ycGetTodoTaskRequest) {
         YcCompletedResultDTO dto = new YcCompletedResultDTO();
         return Response.ok().data(dto);
     }
+
     //返回申请人所发起的给玉柴云
-    Response returnInitiator(){
+    @PostMapping("/returnInitiator")
+    public Response returnInitiator(@RequestBody YcGetTodoTaskRequest ycGetTodoTaskRequest) {
         YcInitiatorResultDTO dto = new YcInitiatorResultDTO();
         return Response.ok().data(dto);
     }

src/main/java/com/xdap/self_development/controller/request/YcGetTodoTaskRequest.java

@@ -0,0 +1,14 @@
+package com.xdap.self_development.controller.request;
+
+import lombok.Data;
+
+@Data
+public class YcGetTodoTaskRequest {
+    private String username;         //非必须员工编号，如果留空则返回所有员工的
+    private String title;//非必须流程主题
+    private String createDateStart;//必须创建时间开始，格式：yyyy-MM-dd hh:mm:ss
+    private String createDateEnd;//非必须创建时间结束，如果为空则此条件不起作用
+    private String page;//非必须页码。如果员工编号为空，则“页码”和“每页数量”将不起作用，可以留空
+    private String pageSize;//非必须每页数量。如果员工编号为空，则“页码”和“每页数量”将不起作用，可以留空
+
+}

src/main/java/com/xdap/self_development/service/TodoTaskService.java

@@ -5,6 +5,7 @@ import com.xdap.self_development.controller.request.TodoTaskRequest;
 import com.xdap.self_development.pojo.TodoTaskPojo;
 import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
 import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.pojo.dto.YcTodoTaskResultDTO;
 
 import java.util.List;
 
@@ -24,4 +25,6 @@ public interface TodoTaskService  {
    void createResPerson(List<EngineParamDetailDTO> paramDetailPojos, String userID);
 
     void todoReturn(TodoReturnRequest todoReturnRequest);
+//---------------------------------玉柴调用接口--------------------------------
+    List<YcTodoTaskResultDTO> returnTodoTask(String userName);
 }