日常报销-审批-搜索

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

@@ -55,6 +55,7 @@ public class ExpenseApprovalController extends BaseController {
     @Anonymous
     @GetMapping("/dailyExpenseList")
     public TableDataInfo getDailyExpenseList(DailyBaoXiaoApprovalVo dailyBaoXiaoApprovalVo) {
+        System.out.println("参数 = " + dailyBaoXiaoApprovalVo);
         startPage();
         return getDataTable(expenseApprovalService.getDailyBaoXiaoApproval(dailyBaoXiaoApprovalVo));
     }

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

@@ -9,5 +9,6 @@ public class DailyBaoXiaoApprovalVo{
     private Integer id;
     private String projectName;
     private Integer approvalStatus;
-
+    private String reimbursementMonth;
+    private String approvalUser;
  }

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

@@ -119,6 +119,12 @@
                 left join project_manage p on p.id = r.project_id
                 left join sys_user u1 on u1.user_id = p.department_leader_id
                 left join sys_user u2 on u2.user_id = p.project_manager_id
+        <where>
+            <if test="projectName != null  and projectName != ''">p.project_name = #{projectName}</if>
+            <if test="approvalStatus != null  and approvalStatus != ''"> and r.`status` = #{approvalStatus}</if>
+            <if test="reimbursementMonth != null  and reimbursementMonth != ''"> and r.reimbursement = #{reimbursementMonth}</if>
+            <if test="approvalUser != null and approvalUser != ''">and r.create_by LIKE CONCAT('%',#{approvalUser},'%')</if>
+        </where>
         GROUP BY
             r.id,
             r.registration_time,