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 14:43:21 +08:00
parent 399a70c564
commit 008cd430ef
29 changed files with 748 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtLeaveController.java Normal file
View File

@ -0,0 +1,52 @@
package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.domain.dto.BgtLeaveUpdateDTO;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.wgz.domain.WgzLeave;
import com.ruoyi.wgz.service.IWgzLeaveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
/**
* 请假Controller
*
* @author ruoyi
* @date 2025-02-19
*/
@Api(value = "App包工头请假控制器", tags = {"App包工头请假管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/bgt/leave")
public class AppBgtLeaveController extends BaseController {
private final IWgzLeaveService iWgzLeaveService;
/**
* 获取请假详细信息
*/
@ApiOperation("获取请假详细信息")
@GetMapping("/{id}")
public AjaxResult<WgzLeave> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iWgzLeaveService.queryById(id));
}
@ApiOperation("请假审核")
@Log(title = "请假审核", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Boolean> edit(@Validated @RequestBody BgtLeaveUpdateDTO dto) {
return AjaxResult.success(iWgzLeaveService.bgtAudit(dto));
}
}

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java
View File

@ -3,9 +3,9 @@ package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.bo.BgtMessageQueryBo;
import com.ruoyi.bgt.domain.BgtMessage;
import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO;
import com.ruoyi.bgt.domain.dto.BgtMessageOtherDTO;
import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO;
import com.ruoyi.bgt.domain.vo.BgtMessageCountVO;
import com.ruoyi.bgt.domain.vo.BgtMessageOtherVO;
import com.ruoyi.bgt.domain.vo.BgtMessageDetailVO;
import com.ruoyi.bgt.domain.vo.BgtMessageVO;
import com.ruoyi.bgt.service.IBgtMessageService;
import com.ruoyi.common.annotation.Log;
@ -54,10 +54,10 @@ public class AppBgtMessageController extends BaseController {
return iBgtMessageService.queryMyPageList(dto);
}
@ApiOperation("其他消息列表")
@GetMapping("/otherList")
public TableDataInfo<BgtMessageOtherVO> otherList(BgtMessageOtherDTO dto) {
return iBgtMessageService.queryOtherPageList(dto);
@ApiOperation("消息详情列表")
@GetMapping("/detailList")
public TableDataInfo<BgtMessageDetailVO> otherList(BgtMessageDetailDTO dto) {
return iBgtMessageService.queryDetailPageList(dto);
}

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java
View File

@ -47,7 +47,8 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
*
*
*/
@ApiOperation("App务工者列表(分页)")
@ApiOperation(value = "App务工者列表(分页)"
,notes = "务工者申请列表 状态 为报名-未选择(0)和通过-已选择(1)")
@GetMapping("/list")
public TableDataInfo<BgtProjectRecruitApplyVO> listPage(@Validated BgtProjectRecruitApplyQueryDTO dto) {
return iBgtProjectRecruitApplyService.appQueryPageList(dto);

19
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.domain.BgtProjectRecruit;
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitDetailVO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitDetailWgzListVO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.annotation.Log;
@ -37,7 +38,7 @@ public class AppBgtProjectRecruitController extends BaseController {
/**
* 查询包工头招工列表 状态为通过和报名
*/
@ApiOperation("我的招工")
@ApiOperation(value = "我的招工",notes = "1.查询包工头招工列表 状态为通过(1)和报名(0)")
@GetMapping("/list")
public TableDataInfo<BgtProjectRecruitVO> list(@Validated BgtProjectRecruitQueryDTO dto) {
return iBgtProjectRecruitService.appQueryPageList(dto);
@ -53,6 +54,22 @@ public class AppBgtProjectRecruitController extends BaseController {
return AjaxResult.success(iBgtProjectRecruitService.appQueryById(id));
}
@ApiOperation("我的招工任务详情-务工者申请列表")
@GetMapping("/wgzList/{id}")
public AjaxResult<BgtProjectRecruitDetailWgzListVO> wgzList(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iBgtProjectRecruitService.wgzList(id));
}
@ApiOperation("务工者申请列表数量统计")
@GetMapping("/wgzCount/{id}")
public AjaxResult<BgtProjectRecruitDetailWgzListVO> wgzCount(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
BgtProjectRecruitDetailWgzListVO bgtProjectRecruitDetailWgzListVO = iBgtProjectRecruitService.wgzList(id);
bgtProjectRecruitDetailWgzListVO.setApplyList(null);
return AjaxResult.success(bgtProjectRecruitDetailWgzListVO);
}
/**
* 新增包工头招工
*/

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java
View File

@ -61,8 +61,8 @@ public class AppBgtProjectTaskProgressController extends BaseController {
@Log(title = "App上传任务进度", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody BgtProjectTaskProgress bo) {
return toAjax(iBgtProjectTaskProgressService.insert(bo) ? 1 : 0);
public AjaxResult<Boolean> add(@Validated @RequestBody BgtProjectTaskProgress bo) {
return AjaxResult.success(iBgtProjectTaskProgressService.insert(bo));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java
View File

@ -38,7 +38,9 @@ public class AppFbsProjectTaskController extends BaseController {
* 我的任务列表 任务状态 申请(0) 进行(1) 完成(2) 是否我的任务 true
*
*/
@ApiOperation("App包工头任务列表/我的任务")
@ApiOperation(value = "App包工头任务列表/我的任务"
,notes = "1.首页任务列表 任务状态(status) 申请(0) 是否我的任务(myTask) false\n"+
"2.我的任务列表 任务状态(status) 申请(0) 进行(1) 完成(2) 是否我的任务(myTask) true")
@GetMapping("/list")
public TableDataInfo<AppTaskVO> list(@Validated AppTaskDTO dto) {
return iFbsProjectTaskService.appQueryPageList(dto);