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

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

@@ -5,6 +5,7 @@ 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.dto.FyglProjectCostDTO;
 import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
 import com.ruoyi.domain.dto.FyglTripApplicationDTO;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
@@ -64,7 +65,7 @@ public class ExpenseApprovalController extends BaseController {
     
     //出差报销-列表
     @GetMapping("/tripExpenseList")
-    public TableDataInfo list(FyglTripApplicationVo fyglTripApplicationVO)
+    public TableDataInfo getTripExpenseList(FyglTripApplicationVo fyglTripApplicationVO)
     {
         startPage();
         List<FyglTripApplicationDTO> list = expenseApprovalService.getFyglTripApplicationList(fyglTripApplicationVO);
@@ -72,12 +73,18 @@ public class ExpenseApprovalController extends BaseController {
     }
     
     //差旅报销-列表
-    @Anonymous
     @GetMapping("/travelExpenseList")
-    public TableDataInfo getProjectCostList(FyglTravelOnBusinessDTO fyglProjectCostDTO){
+    public TableDataInfo getTravelExpenseList(FyglTravelOnBusinessDTO fyglProjectCostDTO){
         startPage();
         return getDataTable(expenseApprovalService.getFyglTravelOnBusinessList(fyglProjectCostDTO));
     }
+    
+    //项目费用申请-列表
+    @GetMapping("/costExpenseList")
+    public TableDataInfo getCostExpenseList(FyglProjectCostDTO fyglProjectCostDTO){
+        startPage();
+        return getDataTable(expenseApprovalService.getProjectCostList(fyglProjectCostDTO));
+    }
 
     //出差申请-审批通过
     @PostMapping("/tripApplicationApproval")

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.dto.FyglProjectCostDTO;
 import com.ruoyi.domain.dto.FyglTravelOnBusinessDTO;
 import com.ruoyi.domain.dto.FyglTripApplicationDTO;
 import com.ruoyi.domain.vo.DailyBaoXiaoApprovalVo;
@@ -43,6 +44,9 @@ public interface ExpenseApprovalMapper{
     //差旅报销的列表
     List<FyglTravelOnBusinessDTO> getFyglTravelOnBusinessList(FyglTravelOnBusinessDTO fyg);
     
+    //项目费用申请的列表
+    List<FyglProjectCostDTO> getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO);
+    
     //修改日常报销的审核状态
     int updateDailyReimburseStatus(DailyReimburseApproval fyglDailyReimburseDTO);
     

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

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

 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.vo.DailyBaoXiaoApprovalVo;
@@ -120,6 +122,12 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
         return expenseApprovalMapper.getFyglTravelOnBusinessList(fyg);
     }
     
+    @Override
+    public List<FyglProjectCostDTO> getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO) {
+        fyglProjectCostDTO.setCurrentUserId(SecurityUtils.getUserId());
+        return expenseApprovalMapper.getProjectCostList(fyglProjectCostDTO);
+    }
+    
     @Override
     @Transactional
     public int updateDailyReimburseStatus(List<DailyReimburseApproval> fyglDailyReimburseDTO) {

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

@@ -7,6 +7,7 @@ import com.ruoyi.mapper.IFyglTravelOnBusinessMapper;
 import com.ruoyi.service.IFyglTravelOnBusinessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -37,6 +38,7 @@ public class IFyglTravelOnBusinessServiceImpl implements IFyglTravelOnBusinessSe
     }
     
     @Override
+    @Transactional
     public int insertFyglTravelOnBusiness(FyglTravelOnBusinessDTO fyglTravelOnBusinessDTO) {
         fyglTravelOnBusinessDTO.setCreateBy(SecurityUtils.getUsername());
         Date nowDate = DateUtils.getNowDate();

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

@@ -21,7 +21,7 @@
         <result property="updateBy"  column="update_by"/>
     </resultMap>
 
-    <resultMap type="com.ruoyi.domain.dto.FyglTravelOnBusinessDTO" id="listDTO">
+    <resultMap type="com.ruoyi.domain.dto.FyglTravelOnBusinessDTO" id="travelListDTO">
         <result property="id"    column="id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
@@ -35,6 +35,28 @@
         <result property="updateBy"    column="update_by"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.domain.dto.FyglProjectCostDTO" id="projectCostListDTO">
+        <result property="id"    column="id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="userName"    column="user_name"    />
+        <result property="projectStatus"    column="project_status"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="timeOfExpense"    column="time_of_expense"    />
+        <result property="costType"    column="cost_type"    />
+        <result property="sumMoney"    column="sum_money"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="amount"    column="amount"    />
+        <result property="unitPrice"    column="unit_price"    />
+        <result property="description"    column="description"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
     <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">
         SELECT
             ru.role_id as roleId,
@@ -196,7 +218,7 @@
     </select>
 
 <!--  差旅报销列表  -->
-    <select id="getFyglTravelOnBusinessList" resultMap="listDTO">
+    <select id="getFyglTravelOnBusinessList" resultMap="travelListDTO">
         SELECT
         f.id,
         f.current_audit_role_id as currentAuditRoleId,
@@ -226,6 +248,41 @@
         GROUP BY f.id
     </select>
 
+<!--  项目费用申请列表  -->
+    <select parameterType="com.ruoyi.domain.dto.FyglProjectCostDTO" id="getProjectCostList" resultMap="projectCostListDTO">
+        SELECT
+        fp.id,
+        fp.current_audit_role_id as currentAuditRoleId,
+        p.project_number,
+        p.project_name,
+        p.project_type,
+        u.user_name,
+        p.project_status,
+        fp.time_of_expense,
+        fp.cost_type,
+        fp.sum_money,
+        fp.approve_status,
+        fp.create_time,
+        fp.create_by,
+        fp.update_time,
+        fp.update_by
+        FROM
+        fygl_project_cost_request fp
+        LEFT JOIN project_manage p ON p.id = fp.project_id
+        LEFT JOIN sys_user u ON u.user_id = p.department_leader_id
+
+        <where>
+            p.id in (select project_id from project_member where user_id = #{currentUserId})
+            and fp.approve_status != -1
+            <if test="approveStatus != null  and approveStatus != ''"> and fp.approve_status = #{approveStatus}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name LIKE CONCAT('%',#{projectName},'%') </if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number = #{projectNumber}</if>
+            <if test="userId != null  and userId != ''"> and u.user_id = #{userId}</if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
+        </where>
+
+    </select>
+
     <!--    日常报销审批-通过-->
     <update id="updateDailyReimburseStatus" parameterType="com.ruoyi.domain.DailyReimburseApproval">
         update fygl_daily_rembursement_relevancy_r

ruoyi-psa/src/main/resources/mapper/projectCost/FyglProjectCostMapper.xml

@@ -11,28 +11,19 @@
         <result property="projectType"    column="project_type"    />
         <result property="userName"    column="user_name"    />
         <result property="projectStatus"    column="project_status"    />
-
         <result property="projectId"    column="project_id"    />
         <result property="timeOfExpense"    column="time_of_expense"    />
-
         <result property="costType"    column="cost_type"    />
-
         <result property="sumMoney"    column="sum_money"    />
-
         <result property="approveStatus"    column="approve_status"    />
-
         <result property="amount"    column="amount"    />
-
         <result property="unitPrice"    column="unit_price"    />
-
         <result property="description"    column="description"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-
         <result property="remark"    column="remark"    />
-
     </resultMap>
 
     <insert id="insertProjectCost" parameterType="com.ruoyi.domain.dto.FyglProjectCostDTO">