zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-02-27 16:56:13 +08:00
parent 5d1c3b39e2
commit 0c36f27726
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java
View File

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@Api(value = "App包工头项目任务申请控制器", tags = {"App包工头项目任务申请管理"}) @Api(value = "App包工头项目任务申请控制器", tags = {"App包工头项目任务申请管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/app/bgt/apply") @RequestMapping("/app/bgt/task/apply")
public class AppBgtProjectTaskApplyController extends BaseController { public class AppBgtProjectTaskApplyController extends BaseController {
private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService; private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java
View File

@ -28,7 +28,7 @@ import java.util.List;
@Api(value = "App包工头项目任务控制器", tags = {"App包工头项目任务管理"}) @Api(value = "App包工头项目任务控制器", tags = {"App包工头项目任务管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/app/fbs/task") @RequestMapping("/app/bgt/task")
public class AppBgtProjectTaskController extends BaseController { public class AppBgtProjectTaskController extends BaseController {
private final IFbsProjectTaskService iFbsProjectTaskService; private final IFbsProjectTaskService iFbsProjectTaskService;

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java
View File

@ -29,4 +29,7 @@ public class BgtProjectTaskProgressQueryDTO {
@ApiModelProperty(value = "上传人Id",hidden = true) @ApiModelProperty(value = "上传人Id",hidden = true)
private Long uploaderId; private Long uploaderId;
@ApiModelProperty("任务ID")
private Long taskId;
} }

1
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java
View File

@ -93,6 +93,7 @@ public class BgtProjectTaskProgressServiceImpl extends ServicePlusImpl<BgtProjec
//批量退场 //批量退场
recruitApplyService.quitBatch(bo.getTaskId()); recruitApplyService.quitBatch(bo.getTaskId());
} }
bo.setUploaderId(SecurityUtils.getAppUserId());
return save(bo); return save(bo);
} }

3
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java
View File

@ -76,6 +76,9 @@ public class AppTaskDetailVO {
@ApiModelProperty("资质要求") @ApiModelProperty("资质要求")
private String qualification; private String qualification;
@ApiModelProperty("任务状态（1进行中 2已完成）")
private String status;
/** 备注 */ /** 备注 */
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;

5
ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml
View File

@ -37,10 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bptp.task_name, bptp.task_name,
bptp.project_name bptp.project_name
from bgt_project_task_progress bptp 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 != '' "> <if test="dto.auditStatus != null and dto.auditStatus != '' ">
and bptp.audit_status = #{dto.auditStatus} and bptp.audit_status = #{dto.auditStatus}
</if> </if>
<if test="dto.taskId != null">
and bptp.task_id = #{dto.taskId}
</if>
</select> </select>
</mapper> </mapper>