项目费用管理-列表完善

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+                requests.antMatchers("/login", "/register", "/captchaImage","/projectCostRequest/**").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -2,9 +2,12 @@ package com.ruoyi.controller;
 
 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.dto.FyglProjectCostDTO;
 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,7 +22,13 @@ public class FyglProjectCostRequest extends BaseController {
 
 
     @GetMapping("/list")
-    public AjaxResult getProjectCostList(){
-        return AjaxResult.success(costService.getList());
+    public TableDataInfo getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO){
+        startPage();
+       return getDataTable(costService.getList(fyglProjectCostDTO));
+    }
+
+    @GetMapping("/{id}")
+    public AjaxResult getProjectCostList(@PathVariable("id") Integer id){
+        return AjaxResult.success(costService.getDetail(id));
     }
 }

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

 package com.ruoyi.domain.dto;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 @Data
-public class FyglProjectCostListDTO {
+public class FyglProjectCostDTO extends BaseEntity {
     private Integer id;
     private String projectNumber;
     private String projectName;
@@ -15,5 +16,10 @@ public class FyglProjectCostListDTO {
     private String costType;
     private String timeOfExpense;
     private Double sumMoney;
+    private Double unitPrice;
+    private Integer amount;
+    private String description;
 
+    //项目负责人id，用于搜索转换
+    private Long userId;
 }

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

 package com.ruoyi.mapper;
 
-import com.ruoyi.domain.dto.FyglProjectCostListDTO;
+import com.ruoyi.domain.dto.FyglProjectCostDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -9,5 +9,8 @@ import java.util.List;
 public interface FyglProjectCostMapper {
 
     //列表接口
-    public List<FyglProjectCostListDTO> getList();
+    public List<FyglProjectCostDTO> getList(FyglProjectCostDTO fyglProjectCostDTO);
+
+    //获取详情
+    public FyglProjectCostDTO getDetail(Integer id);
 }

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

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

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.common.core.domain.entity.SysUser;
+import com.ruoyi.domain.dto.FyglProjectCostDTO;
 import com.ruoyi.mapper.FyglProjectCostMapper;
 import com.ruoyi.service.IFyglProjectCostService;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,8 +15,22 @@ public class IFyglProjectCostServiceImpl implements IFyglProjectCostService {
     @Autowired
     private FyglProjectCostMapper projectCostMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Override
+    public List<FyglProjectCostDTO> getList(FyglProjectCostDTO fyglProjectCostDTO) {
+        if (!(fyglProjectCostDTO.getUserName() == null || fyglProjectCostDTO.getUserName().isEmpty())) {
+            SysUser sysUser = sysUserMapper.selectUserByUserName(fyglProjectCostDTO.getUserName());
+            if (sysUser != null) {
+                fyglProjectCostDTO.setUserId(sysUser.getUserId());
+            }else fyglProjectCostDTO.setUserId(-9999999L);
+        }
+
+        return projectCostMapper.getList(fyglProjectCostDTO);
+    }
+
     @Override
-    public List<FyglProjectCostListDTO> getList() {
-        return projectCostMapper.getList();
+    public FyglProjectCostDTO getDetail(Integer id) {
+        return projectCostMapper.getDetail(id);
     }
 }

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.mapper.FyglProjectCostMapper">
 
-    <resultMap type="com.ruoyi.domain.dto.FyglProjectCostListDTO" id="listDTO">
+    <resultMap type="com.ruoyi.domain.dto.FyglProjectCostDTO" id="listDTO">
         <result property="id"    column="id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
@@ -22,10 +22,15 @@
 
         <result property="approveStatus"    column="approve_status"    />
 
+        <result property="amount"    column="amount"    />
+
+        <result property="unitPrice"    column="unit_price"    />
+
+        <result property="description"    column="description"    />
 
     </resultMap>
 
-    <select id="getList" resultMap="listDTO">
+    <select parameterType="com.ruoyi.domain.dto.FyglProjectCostDTO" id="getList" resultMap="listDTO">
         SELECT
             fp.id,
             p.project_number,
@@ -42,5 +47,36 @@
             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>
+            <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>
+    <select id="getDetail" resultMap="listDTO">
+        SELECT
+            fp.id,
+            p.project_number,
+            p.project_type,
+            u.user_name,
+            p.project_status,
+            fp.approve_status,
+            fp.create_by,
+            fp.cost_type,
+            fp.time_of_expense,
+            fp.description,
+            fp.unit_price,
+            fp.amount,
+            fp.sum_money,
+            fp.water_number
+        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
+            fp.id = #{id}
     </select>
 </mapper>
\ No newline at end of file