日常报销-审批-列表

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

@@ -6,7 +6,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.domain.dto.ApprovalConfigurationDTO;
 import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
+import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.service.IApprovalConfigurationService;
+import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 public class ApprovalConfigurationController extends BaseController {
 
 
+
     @Autowired
     private IApprovalConfigurationService approvalConfigurationService;
 
@@ -26,6 +29,8 @@ public class ApprovalConfigurationController extends BaseController {
         return getDataTable(approvalConfigurationService.getALLList(configurationDTO));
     }
 
+
+
     //获取全部角色
     @GetMapping("/getAllRoleList")
     public AjaxResult getAllRoleList(){

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

 package com.ruoyi.controller;
 
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.domain.*;
+import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -53,8 +54,9 @@ public class ExpenseApprovalController extends BaseController {
     //日常报销-列表
     @Anonymous
     @GetMapping("/dailyExpenseList")
-    public AjaxResult getDailyExpenseList() {
-        return AjaxResult.success(expenseApprovalService.getDailyBaoXiaoApproval());
+    public TableDataInfo getDailyExpenseList(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo) {
+        startPage();
+        return getDataTable(expenseApprovalService.getDailyBaoXiaoApproval(dailyBaoXiaoApprovalVo));
     }
 
     //出差申请-审批通过

ruoyi-psa/src/main/java/com/ruoyi/domain/vo/DailyBaoXiaoApprovalVo.java

+package com.ruoyi.domain.vo;
+
+import lombok.Data;
+
+//日常报销的审批的vo
+
+@Data
+public class DailyBaoXiaoApprovalVo{
+    private Integer id;
+    private String projectName;
+    private Integer approvalStatus;
+
+ }

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

@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
+import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -31,5 +32,5 @@ public interface ExpenseApprovalMapper{
     //出差申请审批-审核驳回
     int updatetripApplicationStatusReject(TripApplicationApprovalReject fyglTripApplicationDTO);
     //日常报销的列表
-    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval();
+    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.service;
 
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
+import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 
 import java.util.List;
 
@@ -29,5 +30,5 @@ public interface IExpenseApprovalService {
     //出差申请审批-审核驳回
     int updatetripApplicationStatusReject(List<TripApplicationApprovalReject> fyglTripApplicationDTO);
     //日常报销的列表
-    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval();
+    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.service.impl;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
+import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.mapper.ExpenseApprovalMapper;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,9 +99,9 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
     }
 
     @Override
-    public List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval() {
+    public List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo) {
         //应该获取当前用户角色，然后根据当前角色关联的项目id来筛选
-        return expenseApprovalMapper.getDailyBaoXiaoApproval();
+        return expenseApprovalMapper.getDailyBaoXiaoApproval(dailyBaoXiaoApprovalVo);
     }
 
 }

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

@@ -103,7 +103,8 @@
         GROUP BY
             r.id,
             r.registration_time,
-            r.`status`;
+            r.`status`
+
     </select>