Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java

@@ -107,19 +107,6 @@ public class TraceManuOrderController {
         return ResultVOUtils.success("成功");
     }
 
-//任务列表
-    @AuthRuleAnnotation("udi/trace/task/filter")
-    @GetMapping("udi/trace/task/filter")
-    public BaseResponse filterTask(TraceTaskDetailRequest traceTaskDetailRequest) {
-
-        List<TraceTaskDlResponse> traceTaskDlResponses = traceTaskService.queryTraceTaskList(traceTaskDetailRequest);
-        PageInfo<TraceTaskDlResponse> pageInfo = new PageInfo<>(traceTaskDlResponses);
-        PageSimpleResponse<TraceTaskDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(traceTaskDlResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
-
 
 
 

src/main/java/com/glxp/api/controller/trace/TraceTaskController.java

@@ -0,0 +1,73 @@
+package com.glxp.api.controller.trace;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.trace.TraceManuCodeRelEntity;
+import com.glxp.api.entity.trace.TraceManuOrderEntity;
+import com.glxp.api.req.trace.TraceManuDetailRequest;
+import com.glxp.api.req.trace.TraceManuOrderRequest;
+import com.glxp.api.req.trace.TraceManuOrderUploadRequest;
+import com.glxp.api.req.trace.TraceTaskDetailRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.trace.TraceManuCodeRellResponse;
+import com.glxp.api.res.trace.TraceManuOrderResponse;
+import com.glxp.api.res.trace.TraceTaskDlResponse;
+import com.glxp.api.service.trace.TraceManuCodeRelService;
+import com.glxp.api.service.trace.TraceManuOrderService;
+import com.glxp.api.service.trace.TraceTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 追溯查询-任务列表相关接口
+ */
+
+@ApiIgnore
+@RestController
+@Slf4j
+public class TraceTaskController {
+
+    @Resource
+    TraceTaskService traceTaskService;
+
+
+//任务列表
+    @AuthRuleAnnotation("udi/trace/task/filter")
+    @GetMapping("udi/trace/task/filter")
+    public BaseResponse filterTask(TraceTaskDetailRequest traceTaskDetailRequest) {
+
+        List<TraceTaskDlResponse> traceTaskDlResponses = traceTaskService.queryTraceTaskList(traceTaskDetailRequest);
+        PageInfo<TraceTaskDlResponse> pageInfo = new PageInfo<>(traceTaskDlResponses);
+        PageSimpleResponse<TraceTaskDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(traceTaskDlResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+
+
+
+
+
+
+
+
+}