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-25 17:13:38 +08:00
parent cffc1422b0
commit 293560e4a3
25 changed files with 482 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationDetailBaseVO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationDetailListVO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
import com.ruoyi.common.annotation.Log;
@ -18,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 工资结算Controller
@ -64,4 +67,16 @@ public class AppBgtPayCalculationController extends BaseController {
}
@ApiOperation("总体考勤情况-工资结算-基础信息")
@GetMapping("/baseInfo")
public AjaxResult<BgtPayCalculationDetailBaseVO> baseInfo(Long id, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.baseInfo(id,recruitId));
}
@ApiOperation("总体考勤情况-工资结算-结算记录")
@GetMapping("/{id}")
public AjaxResult<List<BgtPayCalculationDetailListVO>> getInfo(Long id, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.record(id,recruitId));
}
}

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

@ -11,6 +11,7 @@ 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.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq;
import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes;
@ -41,8 +42,14 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
private final IWgzUserService wgzUserService;
@ApiOperation("App务工者列表")
@ApiOperation("App务工者列表(分页)")
@GetMapping("/list")
public TableDataInfo<BgtProjectRecruitApplyVO> listPage(@Validated BgtProjectRecruitApplyQueryDTO dto) {
return iBgtProjectRecruitApplyService.appQueryPageList(dto);
}
@ApiOperation("App务工者列表")
@GetMapping("/listAll")
public AjaxResult<List<BgtProjectRecruitApplyVO>> list(@Validated BgtProjectRecruitApplyQueryDTO dto) {
return AjaxResult.success(iBgtProjectRecruitApplyService.appQueryList(dto));
}
@ -70,7 +77,7 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
}
@ApiOperation("指定日期打卡记录")
@ApiOperation("人员出勤情况")
@GetMapping("/todayAttendanceList")
public AjaxResult<List<BgtProjectRecruitApplyVO>> todayAttendanceList(@Validated BgtAttendanceDayDTO req) {
return AjaxResult.success(iBgtProjectRecruitApplyService.todayAttendanceList(req));

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

@ -4,8 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.fbs.domain.dto.AppTaskDTO;
import com.ruoyi.fbs.domain.vo.AppTaskDetailVO;
import com.ruoyi.fbs.domain.vo.AppTaskVO;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.fbs.service.IFbsProjectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -57,4 +56,34 @@ public class AppFbsProjectTaskController extends BaseController {
return AjaxResult.success(iFbsProjectTaskService.appQueryById(id));
}
@ApiOperation("项目任务详细信息-考勤")
@GetMapping("/attendance/{id}")
public AjaxResult<AppTaskDetailAttendanceVO> getInfoAttendance(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskService.attendance(id));
}
@ApiOperation("项目任务详细信息-进度")
@GetMapping("/progress/{id}")
public AjaxResult<AppTaskDetailProgressVO> getInfoProgress(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskService.progress(id));
}
@ApiOperation("项目任务详细信息-结算")
@GetMapping("/wage/{id}")
public AjaxResult<AppTaskDetailWageVO> getInfoWage(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskService.wage(id));
}
@ApiOperation("项目任务详细信息-务工人员")
@GetMapping("/recruit/{id}")
public AjaxResult<AppTaskDetailRecruitVO> getInfoRecruit(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskService.recruit(id));
}
}