项目费用报销-审批-驳回

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.ProjectCostReimbursementApproval;
+import com.ruoyi.domain.ProjectCostReimbursementApprovalReject;
 import com.ruoyi.domain.ProjectCostRequestApproval;
 import com.ruoyi.domain.ProjectCostRequestApprovalReject;
 import com.ruoyi.service.IExpenseApprovalService;
@@ -43,4 +44,10 @@ public class ExpenseApprovalController extends BaseController {
     public AjaxResult projectCostReimbursementApproval(@RequestBody List<ProjectCostReimbursementApproval> FyglProjectCostReimbursementDTO) {
         return AjaxResult.success(expenseApprovalService.updateReimbursementStatus(FyglProjectCostReimbursementDTO));
     }
+
+    //项目费用报销-驳回
+    @PostMapping("/projectCostReimbursementApprovalReject")
+    public AjaxResult projectCostReimbursementApprovalReject(@RequestBody List<ProjectCostReimbursementApprovalReject> FyglProjectCostReimbursementDTO) {
+        return AjaxResult.success(expenseApprovalService.updateReimbursementStatusReject(FyglProjectCostReimbursementDTO));
+    }
 }

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

+package com.ruoyi.domain;
+
+import lombok.Data;
+
+
+//项目费用报销审批-驳回实体
+@Data
+public class ProjectCostReimbursementApprovalReject {
+    //项目费用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.ProjectCostReimbursementApproval;
-import com.ruoyi.domain.ProjectCostRequestApproval;
-import com.ruoyi.domain.ProjectCostRequestApprovalReject;
-import com.ruoyi.domain.RoleNameAndId;
+import com.ruoyi.domain.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,10 +15,13 @@ public interface ExpenseApprovalMapper{
     //修改项目费用申请的审核状态
     int updateStatus(ProjectCostRequestApproval projectCostRequestApproval);
 
-    //项目费用审批-审核驳回
+    //项目费用申请审批-审核驳回
     int updateStatusReject(ProjectCostRequestApprovalReject projectCostRequestApprovalRejects);
 
     //修改项目费用报销的审核状态
     int updateReimbursementStatus(ProjectCostReimbursementApproval ProjectCostReimbursementApproval);
 
+    //项目费用报销审批-审核驳回
+    int updateReimbursementStatusReject(ProjectCostReimbursementApprovalReject ProjectCostReimbursementApprovalReject);
+
 }

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

 package com.ruoyi.service;
 
-import com.ruoyi.domain.ProjectCostReimbursementApproval;
-import com.ruoyi.domain.ProjectCostRequestApproval;
-import com.ruoyi.domain.ProjectCostRequestApprovalReject;
-import com.ruoyi.domain.RoleNameAndId;
+import com.ruoyi.domain.*;
 
 import java.util.List;
 
@@ -13,13 +10,16 @@ public interface IExpenseApprovalService {
     List<RoleNameAndId> getExpenseApproval();
 
 
-    //项目费用审批-审核通过
+    //项目费用申请审批-审核通过
     int updateStatus(List<ProjectCostRequestApproval> projectCostRequestApproval);
 
-    //项目费用审批-审核驳回
+    //项目费用申请审批-审核驳回
     int updateStatusReject(List<ProjectCostRequestApprovalReject> projectCostRequestApprovalRejects);
 
-    //项目于费用报销-审核通过
+    //项目费用报销审批-审核通过
     int updateReimbursementStatus(List<ProjectCostReimbursementApproval> ProjectCostReimbursementApproval);
 
+    //项目费用报销审批-审核驳回
+    int updateReimbursementStatusReject(List<ProjectCostReimbursementApprovalReject> projectCostReimbursementApprovalRejects);
+
 }

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

 package com.ruoyi.service.impl;
 
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.domain.ProjectCostReimbursementApproval;
-import com.ruoyi.domain.ProjectCostRequestApproval;
-import com.ruoyi.domain.ProjectCostRequestApprovalReject;
-import com.ruoyi.domain.RoleNameAndId;
+import com.ruoyi.domain.*;
 import com.ruoyi.mapper.ExpenseApprovalMapper;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +49,7 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
 
 
     @Override
+    @Transactional
     public int updateReimbursementStatus(List<ProjectCostReimbursementApproval> ProjectCostReimbursementApproval) {
         for(ProjectCostReimbursementApproval p : ProjectCostReimbursementApproval){
             //如果是最终审批，那么项目整体审批状态为已通过
@@ -63,4 +61,15 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return 1;
     }
 
+    @Override
+    @Transactional
+    public int updateReimbursementStatusReject(List<ProjectCostReimbursementApprovalReject> projectCostReimbursementApprovalRejects) {
+        for(ProjectCostReimbursementApprovalReject p : projectCostReimbursementApprovalRejects){
+            //设置状态为未通过
+            p.setApproveStatus(1);
+            expenseApprovalMapper.updateReimbursementStatusReject(p);
+        }
+        return 1;
+    }
+
 }

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

@@ -4,6 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.mapper.ExpenseApprovalMapper">
 
+    <!--    项目费用申请审批-通过-->
     <update id="updateStatus" parameterType="com.ruoyi.domain.ProjectCostRequestApproval">
         update fygl_project_cost_request
         <trim prefix="SET" suffixOverrides=",">
@@ -12,6 +13,7 @@
         </trim>
         where id = #{projectCostId}
     </update>
+    <!--    项目费用申请审批-驳回-->
     <update id="updateStatusReject" parameterType="com.ruoyi.domain.ProjectCostRequestApprovalReject">
         update fygl_project_cost_request
         <trim prefix="SET" suffixOverrides=",">
@@ -22,6 +24,26 @@
     </update>
 
 
+    <!--    项目费用报销审批-通过-->
+    <update id="updateReimbursementStatus" parameterType="com.ruoyi.domain.ProjectCostReimbursementApproval">
+        update fygl_project_cost_reimbursement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">reimbursment_approve_status = #{approveStatus},</if>
+            <if test="nextNodeId != null">current_audit_node_id = #{nextNodeId}</if>
+        </trim>
+        where id = #{projectCostId}
+    </update>
+    <!--    项目费用报销审批-驳回-->
+    <update id="updateReimbursementStatusReject" parameterType="com.ruoyi.domain.ProjectCostReimbursementApprovalReject">
+        update fygl_project_cost_reimbursement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">reimbursment_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">
         SELECT
@@ -36,12 +58,4 @@
     </select>
 
 
-    <update id="updateReimbursementStatus" parameterType="com.ruoyi.domain.ProjectCostReimbursementApproval">
-        update fygl_project_cost_reimbursement
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="approveStatus != null">reimbursment_approve_status = #{approveStatus},</if>
-            <if test="nextNodeId != null">current_audit_node_id = #{nextNodeId}</if>
-        </trim>
-        where id = #{projectCostId}
-    </update>
 </mapper>
\ No newline at end of file