优化

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetAnnexDTO.java

@@ -0,0 +1,23 @@
+package com.ruoyi.bgt.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("App包工头查看附件查询对象")
+public class BgtGetAnnexDTO {
+
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+	@ApiModelProperty("附件类型")
+	private String annexType;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/common/domain/dto/AnnexListDTO.java

@@ -0,0 +1,13 @@
+package com.ruoyi.common.domain.dto;
+
+import com.ruoyi.common.domain.Annex;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("附件对象")
+public class AnnexListDTO {
+	private List<Annex> list;
+}

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskApplyListDTO.java

@@ -19,6 +19,7 @@ public class FbsTaskApplyListDTO {
 	@NotNull(message = "任务id不能为空")
 	private Long taskId;
 
-
+	@ApiModelProperty(value = "申请状态（0=申请中,1=已同意,2=已拒绝,3=已取消）",hidden = true)
+	private String applyStatus;
 
 }

ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.enums.ProjectTaskStatus;
 import com.ruoyi.common.enums.RecruitApplyStatus;
+import com.ruoyi.common.enums.TaskApplyStatus;
 import com.ruoyi.common.util.DataUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
@@ -324,6 +325,10 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 			fbsTaskApplyListDTO.setPageNum(1);
 			fbsTaskApplyListDTO.setPageSize(3);
 			fbsTaskApplyListDTO.setTaskId(task.getId());
+
+			if(task.getUserId()!=null){
+				fbsTaskApplyListDTO.setApplyStatus(TaskApplyStatus.PASS.getCode());
+			}
 			TableDataInfo<FbsProjectTaskApplyListVO> applyList = fbsProjectTaskApplyService.queryPageListByTaskId(fbsTaskApplyListDTO);
 			fbsProjectTaskListVO.setApplyList(applyList.getRows());
 			fbsProjectTaskListVOS.add(fbsProjectTaskListVO);

ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskApplyMapper.xml

@@ -28,6 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from fbs_project_task_apply fpta
                  left join bgt_user bu on fpta.user_id = bu.user_id
         where fpta.task_id = #{dto.taskId}
+        <if test="dto.applyStatus != null and dto.applyStatus != ''">
+            and fpta.apply_status = #{dto.applyStatus}
+        </if>
         order by fpta.id desc
     </select>