项目相关实体

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

@@ -11,6 +11,7 @@ import com.migao.service.FinancesService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -24,14 +25,30 @@ public class FinancesController {
     @Resource
     private FinancesService financesService;
 
-    @ApiOperation("增")
+    @ApiOperation("新增付款申请")
     @PostMapping(value = "/insert")
     public ResponseBean<?> insert(
             @Validated(value = {Insert.class}) @RequestBody FinancesInsertReq financesInsertReq
     ) {
         return financesService.insert(financesInsertReq);
     }
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("审批通过")
+    @PostMapping(value = "/approve")
+    public ResponseBean<?> approve(
+            @RequestParam Integer id
+    ) {
+        return financesService.approve(id);
+    }
 
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("审批拒绝")
+    @PostMapping(value = "/reject")
+    public ResponseBean<?> reject(
+            @RequestParam Integer id
+    ) {
+        return financesService.reject(id);
+    }
 
     @ApiOperation("删")
     @PostMapping(value = "/deleteById")

src/main/java/com/migao/entity/vo/req/ProjecmemberInsertReq.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,29 +23,22 @@ import javax.validation.constraints.NotNull;
 @Data
 public class ProjecmemberInsertReq {
 
-        @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 departmentName;
-        @ApiModelProperty(value = "是否签署保密协议")
-            //@NotEmpty(message = "是否签署保密协议不能为空")
-        private String isSigned;
-        @ApiModelProperty(value = "项目名称")
-            //@NotEmpty(message = "项目名称不能为空")
-        private String name;
-        @ApiModelProperty(value = "项目编码")
-            //@NotNull(message = "项目编码不能为空")
-        private Integer projectId;
+    @ApiModelProperty(value = "储备年份")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "部门")
+    private String departmentName;
+
+    @ApiModelProperty(value = "是否签署保密协议")
+    //@NotEmpty(message = "是否签署保密协议不能为空")
+    private String isSigned;
+
+    @ApiModelProperty(value = "项目名称")
+    //@NotEmpty(message = "项目名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "项目编码")
+    //@NotNull(message = "项目编码不能为空")
+    private Integer projectId;
 
 }

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

@@ -26,4 +26,8 @@ public interface FinancesService {
     ResponseBean<?> insert(FinancesInsertReq financesInsertReq);
 
     ResponseBean<Finances> findById(Integer id);
+
+    ResponseBean<?> approve(Integer id);
+
+    ResponseBean<?> reject(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.FinancesStatus;
 import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.config.response.ResponseBuilder;
@@ -50,7 +51,11 @@ public class FinancesServiceImpl implements FinancesService {
      */
     @Override
     public ResponseBean<?> insert(FinancesInsertReq financesInsertReq) {
-        return ResponseBuilder.ok(financesRepository.save(EntityUtils.copyProperties(financesInsertReq, Finances.class)));
+        Finances finances = EntityUtils.copyProperties(financesInsertReq, Finances.class);
+        finances.setStatus(FinancesStatus.TO_AUDIT);
+        finances.setDeleted(0);
+        financesRepository.save(finances);
+        return ResponseBuilder.ok();
     }
 
     @Override
@@ -59,6 +64,28 @@ public class FinancesServiceImpl implements FinancesService {
         return ResponseBuilder.ok(finances);
     }
 
+    @Override
+    public ResponseBean<?> approve(Integer id) {
+        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("记录不存在");
+        }
+        finances.setStatus(FinancesStatus.TURN);
+        financesMapper.updateById(finances);
+        return ResponseBuilder.ok();
+    }
+
     /**
      * 分页查
      *
@@ -76,7 +103,7 @@ public class FinancesServiceImpl implements FinancesService {
             queryWrapper.like(Finances::getName, "%" + financesPageQueryReq.getName() + "%");
         }
         if (StringUtils.isNotBlank(financesPageQueryReq.getStatus())) {
-            queryWrapper.eq(Finances::getStatus,financesPageQueryReq.getStatus());
+            queryWrapper.eq(Finances::getStatus, financesPageQueryReq.getStatus());
         }
         Page<Finances> all = financesMapper.selectPage(new Page<>(page, size), queryWrapper);
         return ResponseBuilder.ok(

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

@@ -45,7 +45,10 @@ public class ProjecmemberServiceImpl implements ProjecmemberService {
      */
     @Override
     public ResponseBean<?> insert(ProjecmemberInsertReq projecmemberInsertReq) {
-        return ResponseBuilder.ok(projecmemberRepository.save(EntityUtils.copyProperties(projecmemberInsertReq, ProjectMember.class)));
+        ProjectMember projectMember = EntityUtils.copyProperties(projecmemberInsertReq, ProjectMember.class);
+        projectMember.setDeleted(0);
+        projecmemberRepository.save(projectMember);
+        return ResponseBuilder.ok();
     }
 
     /**