Merge remote-tracking branch 'origin/master'

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

@@ -71,4 +71,10 @@ public class ExpenseApprovalController extends BaseController {
         return AjaxResult.success(expenseApprovalService.updatetripApplicationStatusReject(FyglTripApplicationDTO));
     }
 
+    //差旅报销-审批通过
+    @PostMapping("/travelOnBusinessApproval")
+    public AjaxResult travelOnBusinessApproval(@RequestBody List<TravelOnBusinessApproval> FyglTravelOnBusinessDTO) {
+        return AjaxResult.success(expenseApprovalService.updatetravelOnBusinessStatus(FyglTravelOnBusinessDTO));
+    }
+
 }

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

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

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

@@ -33,4 +33,7 @@ public interface ExpenseApprovalMapper{
     int updatetripApplicationStatusReject(TripApplicationApprovalReject fyglTripApplicationDTO);
     //日常报销的列表
     List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo);
+
+    //修改差旅报销的审核状态
+    int updatetravelOnBusinessStatusReject(TravelOnBusinessApproval fyglTravelOnBusinessDTO);
 }

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

@@ -31,4 +31,7 @@ public interface IExpenseApprovalService {
     int updatetripApplicationStatusReject(List<TripApplicationApprovalReject> fyglTripApplicationDTO);
     //日常报销的列表
     List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo);
+
+    //差旅报销审批-审核通过
+    int updatetravelOnBusinessStatus(List<TravelOnBusinessApproval> fyglTravelOnBusinessDTO);
 }

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

@@ -104,4 +104,14 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return expenseApprovalMapper.getDailyBaoXiaoApproval(dailyBaoXiaoApprovalVo);
     }
 
+    @Override
+    public int updatetravelOnBusinessStatus(List<TravelOnBusinessApproval> fyglTravelOnBusinessDTO) {
+        for(TravelOnBusinessApproval p : fyglTravelOnBusinessDTO){
+            //设置状态为未通过
+            p.setApproveStatus(1);
+            expenseApprovalMapper.updatetravelOnBusinessStatusReject(p);
+        }
+        return 1;
+    }
+
 }

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

@@ -77,6 +77,16 @@
         where id = #{tripApplicationId}
     </update>
 
+    <!--    差旅报销审批-通过-->
+    <update id="updatetravelOnBusinessStatusReject" parameterType="com.ruoyi.domain.TravelOnBusinessApproval">
+        update fygl_travel_on_business
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">status = #{approveStatus},</if>
+            <if test="nextNodeId != null">current_audit_role_id = #{nextNodeId}</if>
+        </trim>
+        where id = #{travelOnBusinessId}
+    </update>
+
 
     <select id="getDailyBaoXiaoApproval" resultType="com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO">
         SELECT