日常报销-审批-列表

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

 package com.ruoyi.controller;
 
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.ProjectCostReimbursementApproval;
@@ -50,4 +51,11 @@ public class ExpenseApprovalController extends BaseController {
     public AjaxResult projectCostReimbursementApprovalReject(@RequestBody List<ProjectCostReimbursementApprovalReject> FyglProjectCostReimbursementDTO) {
         return AjaxResult.success(expenseApprovalService.updateReimbursementStatusReject(FyglProjectCostReimbursementDTO));
     }
+
+    //日常报销-列表
+    @Anonymous
+    @GetMapping("/dailyExpenseList")
+    public AjaxResult getDailyExpenseList() {
+        return AjaxResult.success(expenseApprovalService.getDailyBaoXiaoApproval());
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/DailyBaoXiaoApprovalDTO.java

+package com.ruoyi.domain.dto;
+
+import lombok.Data;
+
+//日常报销的审批列表的dto
+@Data
+public class DailyBaoXiaoApprovalDTO {
+    private Integer id;
+    //申请人
+    private String approvalUser;
+    
+    private String projectNumber;
+
+    private String projectName;
+
+    private String projectManager;
+
+    //当前在哪个审批节点
+    private Integer currentAudiRoleId;
+
+    //事业部负责人
+    private String businessMan;
+
+    private String createTime;
+
+    private String reimbursementMonth;
+
+    //餐饮费用
+    private Double cateringExpenses;
+
+    //交通费用
+    private Double transportExpense;
+
+    //总费用
+    private Double totalMoney;
+
+    //审批状态
+    private Integer approvalStatus;
+
+ }

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

 package com.ruoyi.mapper;
 
 import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface ExpenseApprovalMapper{
     //项目费用报销审批-审核驳回
     int updateReimbursementStatusReject(ProjectCostReimbursementApprovalReject ProjectCostReimbursementApprovalReject);
 
+    //日常报销的列表
+    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval();
 }

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

 package com.ruoyi.service;
 
 import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
 
 import java.util.List;
 
@@ -22,4 +23,6 @@ public interface IExpenseApprovalService {
     //项目费用报销审批-审核驳回
     int updateReimbursementStatusReject(List<ProjectCostReimbursementApprovalReject> projectCostReimbursementApprovalRejects);
 
+    //日常报销的列表
+    List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval();
 }

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

@@ -145,7 +145,7 @@ public class FyglDailyReimbursementServiceImpl implements IFyglDailyReimbursemen
         int i1 = fyglDailyReimbursementMapper.updateFyglDailyReimbursement(fyglDailyReimbursement);
         //再删除所有关联的子表数据
         int i3 = fyglDailyReimbursementMapper.delDataByRid(fyglDailyReimbursement.getId());
-        //再循环插入子表数据 fygl_daily_reimbursement_relevancy
+        //再循环插入子表数据 fygl_daily_reimbursement_relevawncy
         //插入第三层表
         for(FyglDailyReimbursementDetailitemListDTO item:fyglDailyReimbursement.getChildList()){
             item.setRid(fyglDailyReimbursement.getId());

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

@@ -2,6 +2,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.mapper.ExpenseApprovalMapper;
 import com.ruoyi.service.IExpenseApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,4 +73,10 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return 1;
     }
 
+    @Override
+    public List<DailyBaoXiaoApprovalDTO> getDailyBaoXiaoApproval() {
+        //应该获取当前用户角色，然后根据当前角色关联的项目id来筛选
+        return expenseApprovalMapper.getDailyBaoXiaoApproval();
+    }
+
 }

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

@@ -58,4 +58,33 @@
     </select>
 
 
+    <select id="getDailyBaoXiaoApproval" resultType="com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO">
+        SELECT
+            r.id,
+            r.current_audit_role_id as currentAudiRoleId,
+            r.create_by as approvalUser,
+            p.project_number as projectNumber,
+            p.project_name as projectName,
+            u1.user_name as businessMan,
+            u2.user_name as projectManager,
+            r.registration_time AS registrationTime,
+            r.create_time as createTime,
+            r.`status` as approvalStatus,
+            r.reimbursement as reimbursementMonth,
+            SUM(CASE WHEN re.reimbursement_type IN (1) THEN re.money ELSE 0 END) AS transportExpense,
+            SUM(CASE WHEN re.reimbursement_type IN (2) THEN re.money ELSE 0 END) AS cateringExpenses,
+            SUM(re.money) AS totalMoney
+        FROM
+            fygl_daily_rembursement_relevancy_r r
+                LEFT JOIN fygl_daily_reimbursement_relevancy re ON re.rid = r.id
+                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
+        GROUP BY
+            r.id,
+            r.registration_time,
+            r.`status`;
+    </select>
+
+
 </mapper>
\ No newline at end of file