出差申请审批-通过驳回

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

@@ -2,10 +2,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.domain.*;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,4 +47,17 @@ public class ExpenseApprovalController extends BaseController {
     public AjaxResult projectCostReimbursementApprovalReject(@RequestBody List<ProjectCostReimbursementApprovalReject> FyglProjectCostReimbursementDTO) {
         return AjaxResult.success(expenseApprovalService.updateReimbursementStatusReject(FyglProjectCostReimbursementDTO));
     }
+
+    //出差申请-审批通过
+    @PostMapping("/tripApplicationApproval")
+    public AjaxResult tripApplicationApproval(@RequestBody List<TripApplicationApproval> FyglTripApplicationDTO) {
+        return AjaxResult.success(expenseApprovalService.updatetripApplicationStatus(FyglTripApplicationDTO));
+    }
+
+    //出差申请-驳回
+    @PostMapping("/tripApplicationApprovalReject")
+    public AjaxResult tripApplicationApprovalReject(@RequestBody List<TripApplicationApprovalReject> FyglTripApplicationDTO) {
+        return AjaxResult.success(expenseApprovalService.updatetripApplicationStatusReject(FyglTripApplicationDTO));
+    }
+
 }

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

+package com.ruoyi.domain;
+
+
+import lombok.Data;
+
+//出差申请审批实体
+@Data
+public class TripApplicationApproval {
+    //出差申请id
+    private Integer tripApplicationId;
+    //下一个节点nodeId
+    private Integer nextNodeId;
+    //是否终审
+    private Boolean isEndApproval;
+    //整体审核状态
+    private Integer approveStatus;
+}

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

+package com.ruoyi.domain;
+
+import lombok.Data;
+
+
+//项目费用报销审批-驳回实体
+@Data
+public class TripApplicationApprovalReject {
+    //出差申请id
+    private Integer tripApplicationId;
+
+    private Integer approveStatus;
+
+    //驳回理由
+    private String  groundsForRejection;
+}

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

@@ -24,4 +24,9 @@ public interface ExpenseApprovalMapper{
     //项目费用报销审批-审核驳回
     int updateReimbursementStatusReject(ProjectCostReimbursementApprovalReject ProjectCostReimbursementApprovalReject);
 
+    //修改出差申请的审核状态
+    int updatetripApplicationStatus(TripApplicationApproval fyglTripApplicationDTO);
+
+    //出差申请审批-审核驳回
+    int updatetripApplicationStatusReject(TripApplicationApprovalReject fyglTripApplicationDTO);
 }

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

@@ -22,4 +22,9 @@ public interface IExpenseApprovalService {
     //项目费用报销审批-审核驳回
     int updateReimbursementStatusReject(List<ProjectCostReimbursementApprovalReject> projectCostReimbursementApprovalRejects);
 
+    //出差申请审批-审核通过
+    int updatetripApplicationStatus(List<TripApplicationApproval> fyglTripApplicationDTO);
+
+    //出差申请审批-审核驳回
+    int updatetripApplicationStatusReject(List<TripApplicationApprovalReject> fyglTripApplicationDTO);
 }

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

@@ -72,4 +72,28 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return 1;
     }
 
+    @Override
+    @Transactional
+    public int updatetripApplicationStatus(List<TripApplicationApproval> fyglTripApplicationDTO) {
+        for(TripApplicationApproval p : fyglTripApplicationDTO){
+            //如果是最终审批，那么项目整体审批状态为已通过
+            if(p.getIsEndApproval()){
+                p.setApproveStatus(3);
+            }
+            expenseApprovalMapper.updatetripApplicationStatus(p);
+        }
+        return 1;
+    }
+
+    @Override
+    @Transactional
+    public int updatetripApplicationStatusReject(List<TripApplicationApprovalReject> fyglTripApplicationDTO) {
+        for(TripApplicationApprovalReject p : fyglTripApplicationDTO){
+            //设置状态为未通过
+            p.setApproveStatus(1);
+            expenseApprovalMapper.updatetripApplicationStatusReject(p);
+        }
+        return 1;
+    }
+
 }

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

@@ -4,6 +4,20 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.mapper.ExpenseApprovalMapper">
 
+
+    <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">
+        SELECT
+            ru.role_id as roleId,
+            r.role_name as roleName
+        FROM
+            sys_user_role ru,
+            sys_role r
+        WHERE
+            ru.user_id = #{userId}
+          AND ru.role_id = r.role_id
+    </select>
+
+
     <!--    项目费用申请审批-通过-->
     <update id="updateStatus" parameterType="com.ruoyi.domain.ProjectCostRequestApproval">
         update fygl_project_cost_request
@@ -44,18 +58,24 @@
     </update>
 
 
-
-    <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">
-        SELECT
-            ru.role_id as roleId,
-            r.role_name as roleName
-        FROM
-            sys_user_role ru,
-            sys_role r
-        WHERE
-            ru.user_id = #{userId}
-          AND ru.role_id = r.role_id
-    </select>
+    <!--    出差申请审批-通过-->
+    <update id="updatetripApplicationStatus" parameterType="com.ruoyi.domain.TripApplicationApproval">
+        update fygl_travel_request
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">status = #{approveStatus},</if>
+            <if test="nextNodeId != null">current_audit_role_id = #{nextNodeId}</if>
+        </trim>
+        where id = #{tripApplicationId}
+    </update>
+    <!--    出差申请审批-驳回-->
+    <update id="updatetripApplicationStatusReject" parameterType="com.ruoyi.domain.TripApplicationApprovalReject">
+        update fygl_travel_request
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">status = #{approveStatus},</if>
+            <if test="groundsForRejection != null">grounds_for_rejection = #{groundsForRejection}</if>
+        </trim>
+        where id = #{tripApplicationId}
+    </update>
 
 
 </mapper>
\ No newline at end of file