日常报销搜索

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

@@ -48,9 +48,9 @@ public class FyglDailyReimbursementController extends BaseController
 
     //根据当前用户角色id，查询所有项目关联的项目-最新
     @GetMapping("/getProjectListByUserId")
-    public AjaxResult getProjectListByUserId()
+    public AjaxResult getProjectListByUserId(FyglDailyReimbursementVo fyglDailyReimbursementVO)
     {
-        List<FyglDailyReimbursementDTO> projectList = fyglDailyReimbursementService.getProjectListByUserId();
+        List<FyglDailyReimbursementDTO> projectList = fyglDailyReimbursementService.getProjectListByUserId(fyglDailyReimbursementVO);
         return AjaxResult.success(projectList);
     }
 

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

@@ -10,6 +10,9 @@ public class FyglDailyReimbursementVo extends BaseEntity {
     //项目名称
     private String projectName;
 
+    //当前用户id
+    private Long currentUserId;
+
     //报销类型
     private Integer reimbursementType;
 
@@ -20,7 +23,7 @@ public class FyglDailyReimbursementVo extends BaseEntity {
     private String reimbursement;
     //审批状态
     private Integer status;
-    //项目负责人
+    //项目经理
     private String userName;
     //项目负责人id
     private Long userId;
@@ -32,6 +35,12 @@ public class FyglDailyReimbursementVo extends BaseEntity {
     //项目id
     private Integer projectId;
 
+    //用于子列表的卡片id
+    private Integer cardItemProjectId;
+
+    //项目名字-用于搜索
+    private String searchProjectName;
+
     //删除标志 0未删除1已删除
     private Integer delFlag;
 

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

@@ -28,7 +28,7 @@ public interface FyglDailyReimbursementMapper
     //根据rid删除所有数据
     int delDataByRid(Long rid);
 
-    List<FyglDailyReimbursementDTO> getProjectListByUserId(Long userId);
+    List<FyglDailyReimbursementDTO> getProjectListByUserId(FyglDailyReimbursementVo fyglDailyReimbursementVO);
     
     public List<FyglDailyReimbursementDetailitemListDTO> selectFyglDailyReimbursementItemListById(@Param("rid") Long rid);
 //    查找日常报销每个项目的所有报销

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

@@ -5,7 +5,6 @@ import com.ruoyi.domain.dto.FyglProjectCostDTO;
 import com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO;
 import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import org.apache.ibatis.annotations.Mapper;
-
 import java.util.List;
 
 @Mapper

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

@@ -65,5 +65,5 @@ public interface IFyglDailyReimbursementService
      */
     public int deleteFyglDailyReimbursementById(Long id);
 
-    List<FyglDailyReimbursementDTO> getProjectListByUserId();
+    List<FyglDailyReimbursementDTO> getProjectListByUserId(FyglDailyReimbursementVo fyglDailyReimbursementVO);
 }

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

@@ -181,20 +181,23 @@ public class FyglDailyReimbursementServiceImpl implements IFyglDailyReimbursemen
     }
 
     @Override
-    public List<FyglDailyReimbursementDTO> getProjectListByUserId() {
-        List<FyglDailyReimbursementDTO> projectListByUserId = fyglDailyReimbursementMapper.getProjectListByUserId(SecurityUtils.getUserId());
-        System.out.println("结果 = " + projectListByUserId);
+    public List<FyglDailyReimbursementDTO> getProjectListByUserId(FyglDailyReimbursementVo fyglDailyReimbursementVO) {
+        //获取每个人关联的项目
+        fyglDailyReimbursementVO.setCurrentUserId(SecurityUtils.getUserId());
+        List<FyglDailyReimbursementDTO> projectListByUserId = fyglDailyReimbursementMapper.getProjectListByUserId(fyglDailyReimbursementVO);
 
         for(FyglDailyReimbursementDTO item:projectListByUserId){
             Integer passNumber = 0;
             Integer notPassNumber = 0;
             FyglDailyReimbursementVo fyglDailyReimbursementVo = new FyglDailyReimbursementVo();
-            fyglDailyReimbursementVo.setProjectId(item.getProjectId());
-            List<FyglDailyReimbursementTableItemDTO> itemList = fyglDailyReimbursementMapper.getItemList(fyglDailyReimbursementVo);
+
+            fyglDailyReimbursementVO.setCardItemProjectId(item.getProjectId());
+            List<FyglDailyReimbursementTableItemDTO> itemList = fyglDailyReimbursementMapper.getItemList(fyglDailyReimbursementVO);
 
             item.setTableItemList(itemList);
 
         }
+        System.out.println("参数 = " + fyglDailyReimbursementVO);
         return projectListByUserId;
     }
 }

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

@@ -121,8 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fygl_daily_rembursement_relevancy_r r
                 LEFT JOIN fygl_daily_reimbursement_relevancy re ON re.rid = r.id
         <where>
-            r.project_id= #{projectId}
-            <if test="status != null  and status != ''"> and r.status = #{status}</if>
+            r.project_id= #{cardItemProjectId}
+            <if test="reimbursmentApproveStatus != null  and reimbursmentApproveStatus != ''"> and r.status = #{reimbursmentApproveStatus}</if>
             <if test="reimbursement != null and reimbursement != ''">and r.reimbursement = #{reimbursement}</if>
         </where>
 
@@ -167,8 +167,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         project_manage p
         LEFT JOIN sys_user u1 ON u1.user_id = p.department_leader_id
         LEFT JOIN sys_user u2 ON u2.user_id = p.project_manager_id
+        <where>
+            p.id in (select project_id from project_member where user_id = #{currentUserId})
+            <if test="projectName != null  and projectName != ''"> and p.project_name = #{projectName}</if>
+            <if test="userName != null  and userName != ''"> and p.project_manager_id = (select u5.user_id from sys_user u5 where u5.nick_name = #{userName})</if>
+            <if test="departmentUserName != null  and departmentUserName != ''"> and p.department_leader_id = (select u6.user_id from sys_user u6 where u6.nick_name = #{departmentUserName})</if>
+        </where>
 
-        where p.id in (select project_id from project_member where user_id = #{id})
 
     </select>