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-03-06 14:30:45 +08:00
parent d3add5b113
commit 4570788d5e
24 changed files with 359 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,14 @@ package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.domain.dto.BgtAttendanceDTO;
import com.ruoyi.bgt.domain.dto.BgtAttendanceDayDTO;
import com.ruoyi.bgt.domain.dto.BgtAttendanceDetailDTO;
import com.ruoyi.bgt.domain.vo.BgtAttendanceDetailVO;
import com.ruoyi.bgt.domain.vo.BgtAttendanceVO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.wgz.service.IWgzAttendanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -24,6 +28,9 @@ public class AppBgtAttendanceController {
private final IWgzAttendanceService attendanceService;
private final IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
@ApiOperation("App包工头总体考勤情况")
@GetMapping("attendance")
public AjaxResult<BgtAttendanceVO> attendanceDetail(@Validated BgtAttendanceDTO dto) {
@ -36,5 +43,10 @@ public class AppBgtAttendanceController {
return AjaxResult.success(attendanceService.bgtAttendanceDetail(dto));
}
@ApiOperation("总体考勤情况-人员出勤情况")
@GetMapping("/todayAttendanceList")
public TableDataInfo<BgtProjectRecruitApplyVO> todayAttendanceList(@Validated BgtAttendanceDayDTO req) {
return iBgtProjectRecruitApplyService.dayAttendanceList(req);
}
}

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

@ -1,7 +1,7 @@
package com.ruoyi.web.controller.bgt;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.dto.BgtAttendanceDayDTO;
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyConsentDTO;
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyQueryDTO;
import com.ruoyi.bgt.domain.dto.BgtScoreDTO;
@ -13,6 +13,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.common.enums.BusinessType;
import com.ruoyi.common.enums.RecruitApplyStatus;
import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq;
import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes;
import com.ruoyi.wgz.service.IWgzUserService;
@ -67,6 +68,19 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
return AjaxResult.success(wgzUserService.userPersonalBasicInformation(req));
}
@ApiOperation("App务工者消息个人详情")
@GetMapping("/userMessageInfo")
public AjaxResult<WgzAppPersonalBasicInformationRes> wgzMessageInformation(Long userId,Long recruitId) {
WgzAppPersonalBasicInformationReq req = new WgzAppPersonalBasicInformationReq();
req.setUserId(userId);
WgzAppPersonalBasicInformationRes res = wgzUserService.userPersonalBasicInformation(req);
BgtProjectRecruitApply one = iBgtProjectRecruitApplyService.getOne(Wrappers.<BgtProjectRecruitApply>lambdaQuery()
.eq(BgtProjectRecruitApply::getUserId, userId)
.eq(BgtProjectRecruitApply::getRecruitId, recruitId));
res.setIsChoose(!one.getStatus().equals(RecruitApplyStatus.SIGN_UP.getCode()));
return AjaxResult.success(res);
}
@ApiOperation("App务工者招工报名")
@Log(title = "App务工者招工报名", businessType = BusinessType.INSERT)
@RepeatSubmit
@ -84,12 +98,6 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
}
@ApiOperation("总体考勤情况-人员出勤情况")
@GetMapping("/todayAttendanceList")
public TableDataInfo<BgtProjectRecruitApplyVO> todayAttendanceList(@Validated BgtAttendanceDayDTO req) {
return iBgtProjectRecruitApplyService.dayAttendanceList(req);
}
@ApiOperation("App务工者退场")
@Log(title = "App务工者退场", businessType = BusinessType.UPDATE)

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -28,7 +28,7 @@ captcha:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 9098
port: 9099
servlet:
# 应用的访问路径
context-path: /ruoyi