审核通过、驳回接口合并

src/main/java/com/migao/config/constant/ExamineStatus.java

@@ -0,0 +1,20 @@
+package com.migao.config.constant;
+
+public enum ExamineStatus {
+    PASS("审核通过"),
+    TURN("已驳回"),
+    ;
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    ExamineStatus(String name) {
+        this.name = name;
+    }
+}

src/main/java/com/migao/controller/FinancesController.java

@@ -1,6 +1,8 @@
 package com.migao.controller;
 
 
+import com.migao.config.constant.ExamineStatus;
+import com.migao.config.constant.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.config.validation.Insert;
@@ -12,6 +14,7 @@ import com.migao.service.FinancesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiParam;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -35,22 +38,15 @@ public class FinancesController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation("审批通过")
+    @ApiOperation("审批通过PASS/拒绝TURN")
     @PostMapping(value = "/approve")
     public ResponseBean<?> approve(
-            @RequestParam Integer id
+            @RequestParam Integer id,
+            @ApiParam("审批通过PASS/拒绝TURN")  @RequestParam ExamineStatus status
     ) {
-        return financesService.approve(id);
+        return financesService.approve(id,status);
     }
 
-    @ApiOperationSupport(order = 4)
-    @ApiOperation("审批拒绝")
-    @PostMapping(value = "/reject")
-    public ResponseBean<?> reject(
-            @RequestParam Integer id
-    ) {
-        return financesService.reject(id);
-    }
     @ApiOperationSupport(order = 5)
     @ApiOperation("删")
     @PostMapping(value = "/deleteById")

src/main/java/com/migao/controller/ProjectStoreController.java

@@ -1,6 +1,8 @@
 package com.migao.controller;
 
 
+import com.migao.config.constant.ExamineStatus;
+import com.migao.config.constant.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.config.validation.Insert;
@@ -13,6 +15,7 @@ import com.migao.service.ProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiParam;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -65,21 +68,13 @@ public class ProjectStoreController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation("审批通过")
+    @ApiOperation("审批通过PASS/拒绝TURN")
     @PostMapping(value = "/approve")
     public ResponseBean<?> approve(
-            @RequestParam Integer id
-    ) {
-        return projectService.approve(id);
-    }
-
-    @ApiOperationSupport(order = 4)
-    @ApiOperation("审批拒绝")
-    @PostMapping(value = "/reject")
-    public ResponseBean<?> reject(
-            @RequestParam Integer id
+            @RequestParam Integer id,
+            @ApiParam("审批通过PASS/拒绝TURN") @RequestParam ExamineStatus status
     ) {
-        return projectService.reject(id);
+        return projectService.approve(id,status);
     }
 
 

src/main/java/com/migao/entity/vo/req/ProjectStageInsertReq.java

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import javax.validation.constraints.NotNull;
@@ -22,23 +23,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class ProjectStageInsertReq {
 
-        @ApiModelProperty(value = "主键")
-            //@NotNull(message = "主键不能为空")
-        private Integer id;
-        @ApiModelProperty(value = "储备年份")
-            //@NotNull(message = "储备年份不能为空")
-        private LocalDateTime createTime;
-        @ApiModelProperty(value = "")
-            //@NotNull(message = "不能为空")
-        private Integer createUserId;
-        @ApiModelProperty(value = "逻辑删除 0未删除 1已删除")
-            //@NotNull(message = "逻辑删除 0未删除 1已删除不能为空")
-        private Integer deleted;
-        @ApiModelProperty(value = "项目名称")
-            //@NotEmpty(message = "项目名称不能为空")
-        private String name;
-        @ApiModelProperty(value = "排序")
-            //@NotNull(message = "排序不能为空")
-        private Integer sort;
-
+    @ApiModelProperty(value = "项目名称")
+    @NotEmpty(message = "项目名称不能为空")
+    private String name;
 }

src/main/java/com/migao/service/FinancesService.java

@@ -1,6 +1,8 @@
 package com.migao.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.migao.config.constant.ExamineStatus;
+import com.migao.config.constant.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.entity.po.Finances;
@@ -27,7 +29,5 @@ public interface FinancesService {
 
     ResponseBean<Finances> findById(Integer id);
 
-    ResponseBean<?> approve(Integer id);
-
-    ResponseBean<?> reject(Integer id);
+    ResponseBean<?> approve(Integer id, ExamineStatus status);
 }

src/main/java/com/migao/service/ProjectService.java

@@ -1,5 +1,7 @@
 package com.migao.service;
 
+import com.migao.config.constant.ExamineStatus;
+import com.migao.config.constant.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.entity.vo.req.*;
@@ -66,9 +68,7 @@ public interface ProjectService {
 
     ResponseBean<ProjectQueryRes> findById(Integer id);
 
-    ResponseBean<?> approve(Integer id);
-
-    ResponseBean<?> reject(Integer id);
+    ResponseBean<?> approve(Integer id, ExamineStatus status);
 
     ResponseBean<?> importData(String fileId);
 

src/main/java/com/migao/service/ProjectStageService.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 public interface ProjectStageService {
 
-    ResponseBean<?> insert(ProjectStageInsertReq projectStageInsertReq);
+    ResponseBean<?>insert(ProjectStageInsertReq projectStageInsertReq);
 
     ResponseBean<?> deleteById(Integer id);
 

src/main/java/com/migao/service/impl/FinancesServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.migao.config.constant.ExamineStatus;
 import com.migao.config.constant.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
@@ -19,6 +20,7 @@ import com.migao.mapper.FinancesRepository;
 import com.migao.service.FinancesService;
 import com.migao.util.EntityUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.el.lang.ELArithmetic;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -65,27 +67,22 @@ public class FinancesServiceImpl implements FinancesService {
     }
 
     @Override
-    public ResponseBean<?> approve(Integer id) {
+    public ResponseBean<?> approve(Integer id, ExamineStatus status) {
         Finances finances = financesMapper.selectById(id);
         if (finances == null) {
             return ResponseBuilder.fail("记录不存在");
         }
-        finances.setStatus(FinancesStatus.PASS);
-        financesMapper.updateById(finances);
-        return ResponseBuilder.ok();
-    }
-
-    @Override
-    public ResponseBean<?> reject(Integer id) {
-        Finances finances = financesMapper.selectById(id);
-        if (finances == null) {
-            return ResponseBuilder.fail("记录不存在");
+        if (status.equals(ExamineStatus.PASS)){
+            finances.setStatus(FinancesStatus.PASS);
+            financesMapper.updateById(finances);
+        }else {
+            finances.setStatus(FinancesStatus.TURN);
+            financesMapper.updateById(finances);
         }
-        finances.setStatus(FinancesStatus.TURN);
-        financesMapper.updateById(finances);
         return ResponseBuilder.ok();
     }
 
+
     /**
      * 分页查
      *

src/main/java/com/migao/service/impl/ProjectServiceImpl.java

@@ -2,6 +2,8 @@ package com.migao.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.migao.config.constant.ExamineStatus;
+import com.migao.config.constant.FinancesStatus;
 import com.migao.config.constant.ProjectStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
@@ -195,25 +197,20 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public ResponseBean<?> approve(Integer id) {
+    public ResponseBean<?> approve(Integer id, ExamineStatus status) {
         Project project = projectMapper.selectById(id);
         if (project == null) {
             ResponseBuilder.fail("项目不存在");
         }
-        project.setOrderStatus(ProjectStatus.RESERVES_ISSUED.getName());
-        project.setReserveStatus(ProjectStatus.APPROVE.getName());
-        projectMapper.updateById(project);
-        return ResponseBuilder.ok();
-    }
-
-    @Override
-    public ResponseBean<?> reject(Integer id) {
-        Project project = projectMapper.selectById(id);
-        if (project == null) {
-            ResponseBuilder.fail("项目不存在");
+        if (status.equals(FinancesStatus.PASS)){
+            project.setOrderStatus(ProjectStatus.RESERVES_ISSUED.getName());
+            project.setReserveStatus(ProjectStatus.APPROVE.getName());
+            projectMapper.updateById(project);
+        }else {
+            project.setReserveStatus(ProjectStatus.REJECT.getName());
+            projectMapper.updateById(project);
         }
-        project.setReserveStatus(ProjectStatus.REJECT.getName());
-        projectMapper.updateById(project);
+
         return ResponseBuilder.ok();
     }