审批-驳回完毕

ruoyi-psa/src/main/java/com/ruoyi/controller/ExpenseApprovalController.java

@@ -3,6 +3,7 @@ package com.ruoyi.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.ProjectCostRequestApproval;
+import com.ruoyi.domain.ProjectCostRequestApprovalReject;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +28,12 @@ public class ExpenseApprovalController extends BaseController {
     //项目费用申请-审批通过
     @PostMapping("/projectCostRequestApproval")
     public AjaxResult projectCostRequestApproval(@RequestBody List<ProjectCostRequestApproval> fyglProjectCostDTO) {
-        System.out.println("审批 = " + fyglProjectCostDTO);
         return AjaxResult.success(expenseApprovalService.updateStatus(fyglProjectCostDTO));
     }
+
+    //项目费用申请-驳回
+    @PostMapping("/projectCostRequestApprovalReject")
+    public AjaxResult projectCostRequestApprovalReject(@RequestBody List<ProjectCostRequestApprovalReject> fyglProjectCostDTO) {
+        return AjaxResult.success(expenseApprovalService.updateStatusReject(fyglProjectCostDTO));
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/ProjectCostRequestApprovalReject.java

+package com.ruoyi.domain;
+
+import lombok.Data;
+
+
+//项目费用审批-驳回实体
+@Data
+public class ProjectCostRequestApprovalReject {
+    //项目费用id
+    private Integer projectCostId;
+
+    private Integer approveStatus;
+
+    //驳回理由
+    private String  groundsForRejection;
+}

ruoyi-psa/src/main/java/com/ruoyi/mapper/ExpenseApprovalMapper.java

 package com.ruoyi.mapper;
 
 import com.ruoyi.domain.ProjectCostRequestApproval;
+import com.ruoyi.domain.ProjectCostRequestApprovalReject;
 import com.ruoyi.domain.RoleNameAndId;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,4 +16,7 @@ public interface ExpenseApprovalMapper{
 
     //修改项目费用申请的审核状态
     int updateStatus(ProjectCostRequestApproval projectCostRequestApproval);
+
+    //项目费用审批-审核驳回
+    int updateStatusReject(ProjectCostRequestApprovalReject projectCostRequestApprovalRejects);
 }

ruoyi-psa/src/main/java/com/ruoyi/service/IExpenseApprovalService.java

 package com.ruoyi.service;
 
 import com.ruoyi.domain.ProjectCostRequestApproval;
+import com.ruoyi.domain.ProjectCostRequestApprovalReject;
 import com.ruoyi.domain.RoleNameAndId;
 
 import java.util.List;
@@ -11,6 +12,9 @@ public interface IExpenseApprovalService {
     List<RoleNameAndId> getExpenseApproval();
 
 
-    //修改项目费用申请的审核状态
+    //项目费用审批-审核通过
     int updateStatus(List<ProjectCostRequestApproval> projectCostRequestApproval);
+
+    //项目费用审批-审核驳回
+    int updateStatusReject(List<ProjectCostRequestApprovalReject> projectCostRequestApprovalRejects);
 }

ruoyi-psa/src/main/java/com/ruoyi/service/impl/IExpenseApprovalServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.service.impl;
 
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.ProjectCostRequestApproval;
+import com.ruoyi.domain.ProjectCostRequestApprovalReject;
 import com.ruoyi.domain.RoleNameAndId;
 import com.ruoyi.mapper.ExpenseApprovalMapper;
 import com.ruoyi.service.IExpenseApprovalService;
@@ -36,4 +37,15 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         }
         return 1;
     }
+
+    @Override
+    @Transactional
+    public int updateStatusReject(List<ProjectCostRequestApprovalReject> projectCostRequestApprovalRejects) {
+        for(ProjectCostRequestApprovalReject p : projectCostRequestApprovalRejects){
+            //设置状态为未通过
+            p.setApproveStatus(1);
+            expenseApprovalMapper.updateStatusReject(p);
+        }
+        return 1;
+    }
 }

ruoyi-psa/src/main/resources/mapper/ExpenseApprovalMapper/ExpenseApprovalMapper.xml

@@ -12,6 +12,14 @@
         </trim>
         where id = #{projectCostId}
     </update>
+    <update id="updateStatusReject" parameterType="com.ruoyi.domain.ProjectCostRequestApprovalReject">
+        update fygl_project_cost_request
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="groundsForRejection != null">grounds_for_rejection = #{groundsForRejection}</if>
+        </trim>
+        where id = #{projectCostId}
+    </update>
 
 
     <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">