项目费用报销-搜索

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

@@ -23,15 +23,15 @@ public class FyglProjectCostReimbursementController extends BaseController {
     private IFyglProjectCostReimbursementService reimbursementService;
 
     //获取报销列表
+    @Anonymous
     @GetMapping("/getList")
-    public TableDataInfo list() {
+    public TableDataInfo list(FyglProjectCostReimbursementDTO ReimbursementDTO) {
         startPage();
-        List<FyglProjectCostReimbursementDTO> list = reimbursementService.getList();
+        List<FyglProjectCostReimbursementDTO> list = reimbursementService.getList(ReimbursementDTO);
         return getDataTable(list);
     }
 
     //获取待报销列表
-    @Anonymous
     @GetMapping("/approvestatus3List")
     public TableDataInfo approvestatus3List(FyglProjectCostDTO fyglProjectCostDTO) {
         startPage();
@@ -41,7 +41,6 @@ public class FyglProjectCostReimbursementController extends BaseController {
 
 
     //根据项目id获取报销详情
-    @Anonymous
     @GetMapping("/reimbursementDetail/{id}")
     public AjaxResult getDetail(@PathVariable("id") Integer id)
     {

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface FyglProjectCostReimbursementMapper {
 
     //列表
-    List<FyglProjectCostReimbursementDTO> getList();
+    List<FyglProjectCostReimbursementDTO> getList(FyglProjectCostReimbursementDTO ReimbursementDTO);
 
     //获取详情
     public FyglProjectCostReimbursementDTO getDetail(Integer id);

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

@@ -7,7 +7,7 @@ import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import java.util.List;
 
 public interface IFyglProjectCostReimbursementService {
-    List<FyglProjectCostReimbursementDTO> getList();
+    List<FyglProjectCostReimbursementDTO> getList(FyglProjectCostReimbursementDTO ReimbursementDTO);
 
     //获取详情
     public FyglProjectCostReimbursementDTO getDetail(Integer id);

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

@@ -29,8 +29,8 @@ public class IFyglProjectCostReimbursementServiceImpl implements IFyglProjectCos
     private SerialNumberGenerator serialNumberGenerator;
 
    @Override
-    public List<FyglProjectCostReimbursementDTO> getList() {
-        return reimbursementMapper.getList();
+    public List<FyglProjectCostReimbursementDTO> getList(FyglProjectCostReimbursementDTO ReimbursementDTO) {
+        return reimbursementMapper.getList(ReimbursementDTO);
     }
 
     //获取报销详情

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

@@ -53,7 +53,7 @@
     </insert>
 
 
-    <select id="getList" resultMap="listDTO">
+    <select id="getList" resultMap="listDTO" parameterType="com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO">
         SELECT
             p.project_number,
             r1.id,
@@ -70,6 +70,11 @@
             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>
+            <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 != ''">r1.reimbursment_approve_status = #{reimbursmentApproveStatus}</if>
+        </where>
     </select>