费用审批-项目费用报销根据登录用户显示相关数据

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

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.dto.FyglProjectCostDTO;
+import com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO;
 import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
 import com.ruoyi.domain.dto.FyglTripApplicationDTO;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
@@ -85,6 +86,14 @@ public class ExpenseApprovalController extends BaseController {
         startPage();
         return getDataTable(expenseApprovalService.getProjectCostList(fyglProjectCostDTO));
     }
+    
+    //项目费用报销-列表
+    @GetMapping("/reimburseExpenseList")
+    public TableDataInfo getReimburseExpenseList(FyglProjectCostReimbursementDTO ReimbursementDTO) {
+        startPage();
+        List<FyglProjectCostReimbursementDTO> list = expenseApprovalService.getProjectReimburseList(ReimbursementDTO);
+        return getDataTable(list);
+    }
 
     //出差申请-审批通过
     @PostMapping("/tripApplicationApproval")

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

@@ -25,7 +25,6 @@ public class FyglProjectCostReimbursementController extends BaseController {
     private IFyglProjectCostReimbursementService reimbursementService;
 
     //获取报销列表
-    @Anonymous
     @GetMapping("/getList")
     public TableDataInfo list(FyglProjectCostReimbursementDTO ReimbursementDTO) {
         startPage();

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 com.ruoyi.domain.dto.FyglProjectCostDTO;
-import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
-import com.ruoyi.domain.dto.FyglTripApplicationDTO;
+import com.ruoyi.domain.dto.*;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -47,6 +44,9 @@ public interface ExpenseApprovalMapper{
     //项目费用申请的列表
     List<FyglProjectCostDTO> getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO);
     
+    //项目费用报销的列表
+    List<FyglProjectCostReimbursementDTO> getProjectReimburseList(FyglProjectCostReimbursementDTO ReimbursementDTO);
+    
     //修改日常报销的审核状态
     int updateDailyReimburseStatus(DailyReimburseApproval fyglDailyReimburseDTO);
     

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 com.ruoyi.domain.dto.FyglProjectCostDTO;
-import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
-import com.ruoyi.domain.dto.FyglTripApplicationDTO;
+import com.ruoyi.domain.dto.*;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
 
@@ -41,6 +38,8 @@ public interface IExpenseApprovalService {
     List<FyglTravelOnBusinessDTO> getFyglTravelOnBusinessList(FyglTravelOnBusinessDTO fyg);
     //项目费用申请的列表
     List<FyglProjectCostDTO> getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO);
+    //项目费用报销的列表
+    List<FyglProjectCostReimbursementDTO> getProjectReimburseList(FyglProjectCostReimbursementDTO ReimbursementDTO);
 
     //差旅报销审批-审核通过
     int updatetravelOnBusinessStatus(List<TravelOnBusinessApproval> fyglTravelOnBusinessDTO);

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

@@ -3,10 +3,7 @@ package com.ruoyi.service.impl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.*;
-import com.ruoyi.domain.dto.DailyBaoXiaoApprovalDTO;
-import com.ruoyi.domain.dto.FyglProjectCostDTO;
-import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
-import com.ruoyi.domain.dto.FyglTripApplicationDTO;
+import com.ruoyi.domain.dto.*;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
 import com.ruoyi.mapper.ExpenseApprovalMapper;
@@ -128,6 +125,12 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return expenseApprovalMapper.getProjectCostList(fyglProjectCostDTO);
     }
     
+    @Override
+    public List<FyglProjectCostReimbursementDTO> getProjectReimburseList(FyglProjectCostReimbursementDTO ReimbursementDTO) {
+        ReimbursementDTO.setCurrentUserId(SecurityUtils.getUserId());
+        return expenseApprovalMapper.getProjectReimburseList(ReimbursementDTO);
+    }
+    
     @Override
     @Transactional
     public int updateDailyReimburseStatus(List<DailyReimburseApproval> fyglDailyReimburseDTO) {

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

@@ -57,6 +57,24 @@
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO" id="projectRiemburselistDTO">
+        <result property="id"    column="id"    />
+        <result property="serialNumber"    column="serial_number"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="timeOfExpense"    column="time_of_expense"    />
+        <result property="costType"    column="cost_type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="actualAmount"    column="actual_amount"    />
+        <result property="reimbursmentApproveStatus"    column="reimbursment_approve_status"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectStatus"    column="project_status"    />
+        <result property="remark"    column="remark"    />
+        <result property="description"    column="description"    />
+        <result property="sumMoney"    column="sum_money"    />
+    </resultMap>
+
     <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">
         SELECT
             ru.role_id as roleId,
@@ -283,6 +301,35 @@
 
     </select>
 
+<!--  项目费用报销列表  -->
+    <select id="getProjectReimburseList" resultMap="projectRiemburselistDTO" parameterType="com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO">
+        SELECT
+        p.project_number,
+        r1.id,
+        r1.current_audit_node_id as currentAuditNodeId,
+        r1.update_time as updateTime,
+        r1.create_by,
+        r1.create_time,
+        r1.serial_number,
+        p.project_name,
+        p.project_type,
+        r2.time_of_expense,
+        r2.cost_type,
+        r1.actual_amount,
+        r1.reimbursment_approve_status
+        FROM
+        fygl_project_cost_reimbursement r1
+        LEFT JOIN fygl_project_cost_request r2 ON r2.id = r1.rid
+        LEFT JOIN project_manage p ON p.id = r2.project_id
+        <where>
+            p.id in (select project_id from project_member where user_id = #{currentUserId})
+            and r1.del_flag = 0
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%',#{projectName},'%') </if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
+            <if test="reimbursmentApproveStatus != null  and reimbursmentApproveStatus != ''">and r1.reimbursment_approve_status = #{reimbursmentApproveStatus}</if>
+        </where>
+    </select>
+
     <!--    日常报销审批-通过-->
     <update id="updateDailyReimburseStatus" parameterType="com.ruoyi.domain.DailyReimburseApproval">
         update fygl_daily_rembursement_relevancy_r

ruoyi-psa/src/main/resources/mapper/FyglProjectCostReimbursement/FyglProjectCostReimbursementMapper.xml

@@ -14,10 +14,8 @@
         <result property="timeOfExpense"    column="time_of_expense"    />
         <result property="costType"    column="cost_type"    />
         <result property="createBy"    column="create_by"    />
-
         <result property="actualAmount"    column="actual_amount"    />
         <result property="reimbursmentApproveStatus"    column="reimbursment_approve_status"    />
-
         <result property="projectNumber"    column="project_number"    />
         <result property="projectStatus"    column="project_status"    />
         <result property="remark"    column="remark"    />