From 0c36f27726f8387b22ab03f1aecab94291df7a89 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 27 Feb 2025 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/bgt/AppBgtProjectTaskApplyController.java | 2 +-
 .../web/controller/bgt/AppBgtProjectTaskController.java      | 2 +-
 .../ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java | 3 +++
 .../bgt/service/impl/BgtProjectTaskProgressServiceImpl.java  | 1 +
 .../main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java   | 3 +++
 .../resources/mapper/bgt/BgtProjectTaskProgressMapper.xml    | 5 ++++-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java
index bc46fe0..2f636cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "App包工头项目任务申请控制器", tags = {"App包工头项目任务申请管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/bgt/apply")
+@RequestMapping("/app/bgt/task/apply")
 public class AppBgtProjectTaskApplyController extends BaseController {
 
     private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java
index ab82faa..29dd757 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java
@@ -28,7 +28,7 @@ import java.util.List;
 @Api(value = "App包工头项目任务控制器", tags = {"App包工头项目任务管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/fbs/task")
+@RequestMapping("/app/bgt/task")
 public class AppBgtProjectTaskController extends BaseController {
 
     private final IFbsProjectTaskService iFbsProjectTaskService;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java
index a208b95..a172b58 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java
@@ -29,4 +29,7 @@ public class BgtProjectTaskProgressQueryDTO {
 	@ApiModelProperty(value = "上传人Id",hidden = true)
 	private Long uploaderId;
 
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java
index 657a687..42b289a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java
@@ -93,6 +93,7 @@ public class BgtProjectTaskProgressServiceImpl extends ServicePlusImpl<BgtProjec
 			//批量退场
 			recruitApplyService.quitBatch(bo.getTaskId());
 		}
+		bo.setUploaderId(SecurityUtils.getAppUserId());
         return save(bo);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java
index a308599..d6ab804 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java
@@ -76,6 +76,9 @@ public class AppTaskDetailVO {
 	@ApiModelProperty("资质要求")
 	private String qualification;
 
+	@ApiModelProperty("任务状态（1进行中 2已完成）")
+	private String status;
+
 	/** 备注 */
 	@ApiModelProperty("备注")
 	private String remark;
diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml
index 0a13aee..9609e68 100644
--- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml
@@ -37,10 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bptp.task_name,
                bptp.project_name
         from bgt_project_task_progress bptp
-        where bptp.uploader_id = #{dto.createBy}
+        where bptp.uploader_id = #{dto.uploaderId}
         <if test="dto.auditStatus != null and dto.auditStatus != '' ">
             and  bptp.audit_status = #{dto.auditStatus}
         </if>
+        <if test="dto.taskId != null">
+            and  bptp.task_id = #{dto.taskId}
+        </if>
     </select>
 
 </mapper>