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 and bptp.audit_status = #{dto.auditStatus} + + and bptp.task_id = #{dto.taskId} +