[决算模块] 增加swagger

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -432,7 +432,7 @@ public class DeviceCheckController {
             // 如果是4流程的，则需要指定核查组成员A接任务
             detailRepo.updateCheckStatus(id, checkStatus);
             if (userAId > 0 && userBId > 0) {
-                taskService.moveToNext(currentTask, checkUserAId);
+                taskService.moveToNext(currentTask, userAId);
             } else {
                 // 如果是2流程的，则直接结束该任务
                 taskService.moveToEnd(currentTask);

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/controller/finalCheckController.java

 package com.tykj.dev.device.finalcheck.controller;
 
+import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.finalcheck.entity.vo.finalReportVo;
 import com.tykj.dev.device.finalcheck.repisotry.finalDetailRepo;
 import com.tykj.dev.device.finalcheck.repisotry.finalReportRepo;
@@ -9,9 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * finalCheckController.
@@ -19,9 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Matrix <xhyrzldf@gmail.com>
  * @since 2020/9/24 at 6:24 下午
  */
+@AutoDocument
 @RestController
 @RequestMapping("/check/final")
-@Api(value = "决算模块", description = "决算模块")
+@Api(tags = "决算模块", description = "决算模块")
 public class finalCheckController {
 
 
@@ -31,22 +31,22 @@ public class finalCheckController {
     @Autowired
     private finalReportRepo reportRepo;
 
-    @RequestMapping("/reports")
+    @GetMapping("/reports")
     @ApiOperation(value = "查询所有决算报告(不附带详情数据)")
-    public ResponseEntity<ResultObj> findAllReports() {
+    public ResponseEntity<ResultObj<finalReportVo>> findAllReports() {
 
         return ResultUtil.success(new finalReportVo());
     }
 
-    @RequestMapping("/{id}")
+    @GetMapping("/{id}")
     @ApiOperation(value = "根据id查询决算报告(附带详情数据)")
-    public ResponseEntity<ResultObj> findReportById(@PathVariable Integer id) {
+    public ResponseEntity<ResultObj<finalReportVo>> findReportById(@PathVariable Integer id) {
         return ResultUtil.success(new finalReportVo());
     }
 
-    @RequestMapping("/excel/{id}")
+    @PostMapping("/excel/{id}")
     @ApiOperation(value = "根据id导出对应的excel数据")
-    public ResponseEntity<ResultObj> exportExcel(@PathVariable Integer id) {
+    public ResponseEntity<ResultObj<finalReportVo>> exportExcel(@PathVariable Integer id) {
 
         return ResultUtil.success(new finalReportVo());
     }

dev-misc/src/main/java/com/tykj/dev/misc/utils/ResultUtil.java

@@ -19,10 +19,8 @@ public class ResultUtil<T> {
      *
      * @param data 获取的数据
      */
-    public static <T> ResponseEntity success(T data) {
-        HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8");
-        return new ResponseEntity<>(new ResultObj(data), httpHeaders, HttpStatus.OK);
+    public static <T> ResponseEntity<ResultObj<T>> success(T data) {
+        return ResponseEntity.ok(new ResultObj<>(data));
     }
 
     /**
@@ -86,5 +84,4 @@ public class ResultUtil<T> {
     }
 
 
-
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -76,7 +76,7 @@ public class StorageBillController {
 
     @ApiOperation(value = "选择入库型号数量",notes = "可以通过这个接口选择入库型号数量")
     @PostMapping(value = "/addStorageDetail")
-    public ResponseEntity<List<PackingLibrary>> addStorageDetail(@RequestBody List<StorageBillDetailVo> list) {
+    public ResponseEntity addStorageDetail(@RequestBody List<StorageBillDetailVo> list) {
         List<PackingLibrary> libraryEntities=new ArrayList<>();
         Map<Integer,Integer> map=new HashMap<>();
         for (StorageBillDetailVo s:list) {

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -99,7 +99,7 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     @Log
-    public TaskBto moveToNext(TaskBto taskBto, Integer userId) {
+    public TaskBto  moveToNext(TaskBto taskBto, Integer userId) {
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add userId,point++