项目费用申请-列表

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

@@ -8,7 +8,7 @@ import com.ruoyi.domain.FyglDailyReimbursement;
 import com.ruoyi.domain.dto.FyglDailyReimbursementDTO;
 import com.ruoyi.domain.dto.FyglProjectDTO;
 import com.ruoyi.domain.dto.FyglProjectList;
-import com.ruoyi.domain.vo.FyglDailyReimbursementVO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import com.ruoyi.service.IFyglDailyReimbursementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,7 +35,7 @@ public class FyglDailyReimbursementController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('dailyReimbursement:dailyReimbursement:list')")
     @GetMapping("/list")
-    public AjaxResult list(FyglDailyReimbursementVO fyglDailyReimbursementVO)
+    public AjaxResult list(FyglDailyReimbursementVo fyglDailyReimbursementVO)
     {
 
 

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

 package com.ruoyi.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.service.IFyglProjectCostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,5 +14,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/projectCostRequest")
 public class FyglProjectCostRequest extends BaseController {
 
+    @Autowired
+    private IFyglProjectCostService costService;
 
+
+    @GetMapping("/list")
+    public AjaxResult getProjectCostList(){
+        return AjaxResult.success(costService.getList());
+    }
 }

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

+package com.ruoyi.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class FyglProjectCostListDTO {
+    private Integer id;
+    private String projectNumber;
+    private String projectName;
+    private String projectType;
+    private String userName;
+    private String projectStatus;
+    private Integer approveStatus;
+    private String  waterNumber;
+    private String costType;
+    private String timeOfExpense;
+    private Double sumMoney;
+
+}

ruoyi-psa/src/main/java/com/ruoyi/domain/vo/FyglDailyReimbursementVO.java → ruoyi-psa/src/main/java/com/ruoyi/domain/vo/FyglDailyReimbursementVo.java

@@ -3,7 +3,7 @@ package com.ruoyi.domain.vo;
 import lombok.Data;
 
 @Data
-public class FyglDailyReimbursementVO {
+public class FyglDailyReimbursementVo {
     //项目名称
     private String projectName;
 

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

+package com.ruoyi.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class FyglProjectCostVo {
+    private Integer id;
+    private Integer projectId;
+    private Integer status;
+    private String  waterNumber;
+    private String costType;
+    private String timeOfExpense;
+    private String description;
+    private Double unitPrice;
+    private Integer amount;
+    private Double sumMoney;
+    private String createBy;
+    private String createTime;
+    private String updateBy;
+    private String updateTime;
+    private String remark;
+}

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

@@ -2,7 +2,7 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.domain.FyglDailyReimbursement;
 import com.ruoyi.domain.dto.*;
-import com.ruoyi.domain.vo.FyglDailyReimbursementVO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,7 +38,7 @@ public interface FyglDailyReimbursementMapper
      * 
      * @return 日常报销集合
      */
-    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVO fyglDailyReimbursementVO);
+    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVo fyglDailyReimbursementVO);
 
     List<FyglProjectList> getProjectList();
 

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

+package com.ruoyi.mapper;
+
+import com.ruoyi.domain.dto.FyglProjectCostListDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface FyglProjectCostMapper {
+
+    //列表接口
+    public List<FyglProjectCostListDTO> getList();
+}

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

@@ -5,7 +5,7 @@ import com.ruoyi.domain.dto.FyglDailyReimbursementDTO;
 import com.ruoyi.domain.dto.FyglDailyReimbursementDetailDTO;
 import com.ruoyi.domain.dto.FyglProjectDTO;
 import com.ruoyi.domain.dto.FyglProjectList;
-import com.ruoyi.domain.vo.FyglDailyReimbursementVO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 
 import java.util.List;
 
@@ -30,7 +30,7 @@ public interface IFyglDailyReimbursementService
      * 
      * @return 日常报销集合
      */
-    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVO fyglDailyReimbursementVO);
+    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVo fyglDailyReimbursementVO);
     FyglProjectDTO getProjectDetail(Long pid);
     /**
      * 新增日常报销

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

+package com.ruoyi.service;
+
+import com.ruoyi.domain.dto.FyglProjectCostListDTO;
+
+import java.util.List;
+
+public interface IFyglProjectCostService {
+    public List<FyglProjectCostListDTO> getList();
+}

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

@@ -5,7 +5,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.FyglDailyReimbursement;
 import com.ruoyi.domain.dto.*;
-import com.ruoyi.domain.vo.FyglDailyReimbursementVO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import com.ruoyi.mapper.FyglDailyReimbursementMapper;
 import com.ruoyi.service.IFyglDailyReimbursementService;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -58,7 +58,7 @@ public class FyglDailyReimbursementServiceImpl implements IFyglDailyReimbursemen
      * @return 日常报销
      */
     @Override
-    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVO fvo)
+    public List<FyglDailyReimbursementDTO> selectFyglDailyReimbursementList(FyglDailyReimbursementVo fvo)
     {
         if (!(fvo.getUserName() == null || fvo.getUserName().isEmpty())) {
             SysUser sysUser = sysUserMapper.selectUserByUserName(fvo.getUserName());

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

+package com.ruoyi.service.impl;
+
+import com.ruoyi.domain.dto.FyglProjectCostListDTO;
+import com.ruoyi.mapper.FyglProjectCostMapper;
+import com.ruoyi.service.IFyglProjectCostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class IFyglProjectCostServiceImpl implements IFyglProjectCostService {
+    @Autowired
+    private FyglProjectCostMapper projectCostMapper;
+
+    @Override
+    public List<FyglProjectCostListDTO> getList() {
+        return projectCostMapper.getList();
+    }
+}

ruoyi-psa/src/main/resources/mapper/dailyReimbursement/FyglDailyReimbursementMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, project_id, create_by, create_time, update_by, update_time, remark from fygl_daily_reimbursement
     </sql>
 
-    <select id="selectFyglDailyReimbursementList" parameterType="com.ruoyi.domain.vo.FyglDailyReimbursementVO" resultMap="FyglDailyReimbursementDTOResult">
+    <select id="selectFyglDailyReimbursementList" parameterType="com.ruoyi.domain.vo.FyglDailyReimbursementVo" resultMap="FyglDailyReimbursementDTOResult">
         SELECT
         fd.id,
         p.project_name,

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.FyglProjectCostMapper">
+
+    <resultMap type="com.ruoyi.domain.dto.FyglProjectCostListDTO" id="listDTO">
+        <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="waterNumber"    column="water_number"    />
+
+
+        <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"    />
+
+
+    </resultMap>
+
+    <select id="getList" resultMap="listDTO">
+        SELECT
+            fp.id,
+            p.project_number,
+            p.project_name,
+            p.project_type,
+            u.user_name,
+            p.project_status,
+            fp.water_number,
+            fp.time_of_expense,
+            fp.cost_type,
+            fp.sum_money,
+            fp.approve_status
+        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
+    </select>
+</mapper>
\ No newline at end of file