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

细节修改

Browse Source
This commit is contained in:
罗成
2025-02-22 17:41:00 +08:00
parent 7e423bf296
commit 15209b7243
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
View File

@ -99,7 +99,7 @@ public class WgzAppController {
/**
* 【注册】务工者注册
*/
@ApiOperation("APP务工者-注册")
@ApiOperation("【务工者账号注册】")
@PreAuthorize("@ss.hasPermi('wgzApp:user:register')")
@PostMapping("/wgzRegister")
public AjaxResult<Boolean> userRegister(@Validated @RequestBody WgzAppRegisterReq bo) {
@ -109,7 +109,7 @@ public class WgzAppController {
/**
* 【首页】【首页界面】招工列表
*/
@ApiOperation("首页-招工列表")
@ApiOperation("【首页】【首页界面】招工列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userJobListing')")
@GetMapping("/WgzUserJobListing")
public AjaxResult<WgzAppJobListingRes> userJobListing(@Validated WgzAppJobListingReq req) {
@ -125,9 +125,9 @@ public class WgzAppController {
}
/**
* 【我的】【个人基本信息】修改用户头像
* 【我的】修改用户头像
*/
@ApiOperation("我的-修改用户头像")
@ApiOperation("【我的】修改用户头像")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userModifyingUserProfilePicture')")
@PutMapping("/wgzUserModifyingUserProfilePicture")
public AjaxResult<Boolean> userModifyingUserProfilePicture(@Validated @RequestBody WgzAppModifyingUserProfilePictureReq req) {
@ -137,7 +137,7 @@ public class WgzAppController {
/**
* 【我的】【个人基本信息】查询基础用户信息（还未带附件信息）
*/
@ApiOperation("我的-个人基本信息（还未带附件信息）")
@ApiOperation("【我的】个人基本信息（还未带附件信息）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userPersonalBasicInformation')")
@GetMapping("/wgzUserPersonalBasicInformation")
public AjaxResult<WgzAppPersonalBasicInformationRes> userPersonalBasicInformation(@Validated WgzAppPersonalBasicInformationReq req) {
@ -147,7 +147,7 @@ public class WgzAppController {
/**
* 【我的】【实名认证】实名认证
*/
@ApiOperation("我的-实名认证")
@ApiOperation("【我的】实名认证")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userRealNameAuthentication')")
@PutMapping("/wgzUserRealNameAuthentication")
public AjaxResult<Boolean> userRealNameAuthentication(@Validated @RequestBody WgzAppRealNameAuthenticationReq req) {
@ -157,7 +157,7 @@ public class WgzAppController {
/**
* 【我的】【岗前培训】获取安全教育考试试卷（随机获取）
*/
@ApiOperation("我的-岗前培训·获取随机试卷")
@ApiOperation("【我的】【岗前培训】岗前培训·获取随机试卷")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetTestPaper')")
@GetMapping("/WgzUserGetTestPaper")
public AjaxResult<WgzAppGetTestPaperRes> userGetTestPaper() {
@ -186,7 +186,7 @@ public class WgzAppController {
/**
* 【我的】【岗前培训】提交用户的试卷（只保存最高分的试卷信息）
*/
@ApiOperation("我的-岗前培训·提交试卷")
@ApiOperation("【我的】【岗前培训】岗前培训·提交试卷")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitATestPaper')")
@PostMapping("/WgzUserSubmitATestPaper")
public AjaxResult<WgzAppSubmitATestPaperRes> userSubmitATestPaper(@Validated @RequestBody WgzAppSubmitATestPaperReq req) {
@ -196,7 +196,7 @@ public class WgzAppController {
/**
* 【我的】【请假】 历史请假列表
*/
@ApiOperation("我的-请假·历史请假列表")
@ApiOperation("【我的】【请假】请假·历史请假列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userLeaveHistoryList')")
@GetMapping("/WgzAppUserLeaveHistoryListPage")//PageReq
public TableDataInfo<WgzAppLeaveHistoryListPageRes> userLeaveHistoryListPage(@Validated WgzAppLeaveHistoryListPageReq req) {
@ -206,7 +206,7 @@ public class WgzAppController {
/**
* 【我的】【请假】 提交请假（上下班的时间需要等待zt创建好mysql字段）
*/
@ApiOperation("我的-请假·提交请假（上下班的时间需要等待zt创建好mysql字段）")
@ApiOperation("【我的】【请假】请假·提交请假（上下班的时间需要等待zt创建好mysql字段）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitLeave')")
@PostMapping("/WgzAppSubmitLeave")
public AjaxResult<Boolean> userSubmitLeave(@Validated @RequestBody WgzAppSubmitLeaveReq req) {
@ -216,7 +216,7 @@ public class WgzAppController {
/**
* 【我的】【请假】 取消请假
*/
@ApiOperation("我的-请假·取消请假")
@ApiOperation("【我的】【请假】请假·取消请假")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelLeave')")
@PutMapping("/WgzAppUserCancelLeave")
public AjaxResult<Boolean> userCancelLeave(@Validated @RequestBody WgzAppCancelLeaveReq req) {
@ -226,7 +226,7 @@ public class WgzAppController {
/**
* 【日报】日报日历
*/
@ApiOperation("日报-日报日历")
@ApiOperation("【日报】日报日历")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyCalendar')")
@GetMapping("/WgzUserDailyCalendar")
public AjaxResult<WgzUserDailyCalendarRes> userDailyCalendar(@Validated WgzAppDailyCalendarReq req) {
@ -237,7 +237,7 @@ public class WgzAppController {
/**
* 【日报】日报日历·日报记录
*/
@ApiOperation("日报-日报日历·日报记录")
@ApiOperation("【日报】【日报日历】日报日历·日报记录")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')")
@GetMapping("/WgzUserDailyRecord")
public TableDataInfo<WgzAppUserDailyRecordRes> userDailyRecord(@Validated WgzAppDailyRecordReq req) {
@ -247,7 +247,7 @@ public class WgzAppController {
/**
* 【日报】日报日历·查看日报
*/
@ApiOperation("日报-日报日历·查看日报")
@ApiOperation("【日报】【日报日历】日报日历·查看日报")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')")
@GetMapping("/WgzUserCheckDailyNewspaper/{id}")
public AjaxResult<WgzDailyClock> userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {

21
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.injector.methods.DeleteById;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.bgt.bo.BgtProjectRecruitApplyQueryBo;
import com.ruoyi.bgt.domain.BgtProjectRecruit;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.dto.BgtAttendanceDayDTO;
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyConsentDTO;
@ -15,6 +16,9 @@ import com.ruoyi.bgt.domain.dto.BgtScoreDTO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
import com.ruoyi.bgt.mapper.BgtProjectRecruitApplyMapper;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.RecruitApplyStatus;
@ -22,6 +26,7 @@ import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.wgz.bo.req.WgzAppRegisteredProjectReq;
import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
@ -35,10 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 包工头招工申请Service业务层处理
@ -56,6 +58,10 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
private IWgzScoreRecordService scoreRecordService;
@Autowired
private IWgzUserService wgzUserService;
@Autowired
private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
@Autowired
private IBgtProjectRecruitService iBgtProjectRecruitService;
@Override
public BgtProjectRecruitApply queryById(Long id){
@ -169,16 +175,21 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
public Boolean userApplyForRegistration(Long id) {
//1、获取当前用户
Long appUserId = SecurityUtils.getAppUserId();
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
//2、检查当前用户是否已经有工地了、检查当前用户是否满足对应工种
Integer i = baseMapper.selectCount(
new LambdaQueryWrapper<BgtProjectRecruitApply>().
eq(BgtProjectRecruitApply::getUserId, appUserId).
eq(BgtProjectRecruitApply::getStatus, "3")
// isNotNull(BgtProjectRecruitApply::getEntryTime).ne(BgtProjectRecruitApply::getEntryTime, "")
);
if (i>0){
throw new RuntimeException("已有工地！不可再次申请！");
}
WgzUser byId = wgzUserService.getById(appUserId);
if (!Objects.equals(appById.getTypeOfWork(), byId.getTypeOfWork())){
throw new RuntimeException("工种不匹配！");
}
//2、插入数据
BgtProjectRecruitApply bgtProjectRecruitApply = new BgtProjectRecruitApply();
bgtProjectRecruitApply.setRecruitId(id);