日常报销-审批-驳回

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

@@ -70,6 +70,18 @@ public class ExpenseApprovalController extends BaseController {
     public AjaxResult tripApplicationApprovalReject(@RequestBody List<TripApplicationApprovalReject> FyglTripApplicationDTO) {
         return AjaxResult.success(expenseApprovalService.updatetripApplicationStatusReject(FyglTripApplicationDTO));
     }
+    
+    //出差申请-审批通过
+    @PostMapping("/dailyReimburseApproval")
+    public AjaxResult dailyReimburseApproval(@RequestBody List<DailyReimburseApproval> fyglDailyReimburseDTO) {
+        return AjaxResult.success(expenseApprovalService.updateDailyReimburseStatus(fyglDailyReimburseDTO));
+    }
+    
+    //出差申请-驳回
+    @PostMapping("/dailyReimburseApprovalReject")
+    public AjaxResult dailyReimburseApprovalReject(@RequestBody List<DailyReimburseApprovalReject> fyglTripApplicationDTO) {
+        return AjaxResult.success(expenseApprovalService.updateDailyReimburseStatusReject(fyglTripApplicationDTO));
+    }
 
     //差旅报销-审批通过
     @PostMapping("/travelOnBusinessApproval")

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

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

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

+package com.ruoyi.domain;
+
+import lombok.Data;
+
+//日常报销审批-驳回实体
+@Data
+public class DailyReimburseApprovalReject {
+    //日常报销id
+    private Integer dailyReimburseId;
+    
+    private Integer approveStatus;
+    
+    //驳回理由
+    private String  groundsForRejection;
+}

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

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

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

@@ -34,4 +34,10 @@ public interface IExpenseApprovalService {
 
     //差旅报销审批-审核通过
     int updatetravelOnBusinessStatus(List<TravelOnBusinessApproval> fyglTravelOnBusinessDTO);
+    
+    //日常报销审批-审核通过
+    int updateDailyReimburseStatus(List<DailyReimburseApproval> fyglDailyReimburseDTO);
+    
+    //日常报销审批-审核驳回
+    int updateDailyReimburseStatusReject(List<DailyReimburseApprovalReject> fyglDailyReimburseDTO);
 }

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

@@ -103,7 +103,30 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         //应该获取当前用户角色，然后根据当前角色关联的项目id来筛选
         return expenseApprovalMapper.getDailyBaoXiaoApproval(dailyBaoXiaoApprovalVo);
     }
-
+    
+    @Override
+    @Transactional
+    public int updateDailyReimburseStatus(List<DailyReimburseApproval> fyglDailyReimburseDTO) {
+        for(DailyReimburseApproval p : fyglDailyReimburseDTO){
+            //如果是最终审批，那么项目整体审批状态为已通过
+            if(p.getIsEndApproval()){
+                p.setApproveStatus(3);
+            }
+            expenseApprovalMapper.updateDailyReimburseStatus(p);
+        }
+        return 1;
+    }
+    
+    @Override
+    @Transactional
+    public int updateDailyReimburseStatusReject(List<DailyReimburseApprovalReject> fyglDailyReimburseDTO) {
+        for(DailyReimburseApprovalReject p : fyglDailyReimburseDTO){
+            //设置状态为未通过
+            p.setApproveStatus(1);
+            expenseApprovalMapper.updateDailyReimburseStatusReject(p);
+        }
+        return 1;
+    }
     @Override
     public int updatetravelOnBusinessStatus(List<TravelOnBusinessApproval> fyglTravelOnBusinessDTO) {
         for(TravelOnBusinessApproval p : fyglTravelOnBusinessDTO){

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

@@ -117,5 +117,23 @@
 
     </select>
 
+    <!--    日常报销审批-通过-->
+    <update id="updateDailyReimburseStatus" parameterType="com.ruoyi.domain.DailyReimburseApproval">
+        update fygl_daily_rembursement_relevancy_r
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">status = #{approveStatus},</if>
+            <if test="nextNodeId != null">current_audit_role_id = #{nextNodeId}</if>
+        </trim>
+        where id = #{dailyReimburseId}
+    </update>
+    <!--    日朝报销审批-驳回-->
+    <update id="updateDailyReimburseStatusReject" parameterType="com.ruoyi.domain.DailyReimburseApprovalReject">
+        update fygl_daily_rembursement_relevancy_r
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="approveStatus != null">status = #{approveStatus},</if>
+            <if test="groundsForRejection != null">grounds_for_rejection = #{groundsForRejection}</if>
+        </trim>
+        where id = #{dailyReimburseId}
+    </update>
 
 </mapper>
\ No newline at end of file