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

逻辑变更

Browse Source
This commit is contained in:
罗成
2025-03-25 17:54:48 +08:00
parent 8fe084ddb7
commit 1531913a43
75 changed files with 138 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,19 +20,17 @@
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.wgz.bo.req.*;
import com.ruoyi.wgz.bo.res.*;
import com.ruoyi.wgz.bo.rests.WgzAppGetTestPaperThree;
import com.ruoyi.wgz.bo.rests.WgzAppGetTestPaperTwo;
import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo;
import com.ruoyi.wgz.bo.rests.WgzAutonymAnnex;
import com.ruoyi.wgz.bo.req.*;
import com.ruoyi.wgz.domain.WgzAttendance;
import com.ruoyi.wgz.domain.WgzMessage;
import com.ruoyi.wgz.domain.WgzPayCalculation;
import com.ruoyi.wgz.domain.WgzQuestionsConfiguration;
import com.ruoyi.wgz.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -452,6 +450,7 @@
Long appUserId = SecurityUtils.getAppUserId();
// BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.getById(recruitApplyId);
res.setRecruitApplyId(by.getId());
// BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
//1、先获取项目详情基本信息
WgzAppProjectDetailsRes appById = iBgtProjectRecruitService.userProjectDetails(by.getRecruitId());
@ -729,13 +728,19 @@
/**
* 【获取审批人】
*/
@ApiOperation("【通用】获取审批人")
@ApiOperation("【通用】获取审批人(默认0获取当前项目)")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetTheApprover')")
@GetMapping("/WgzAppUserGetTheApprover")
public AjaxResult<WgzAppUserGetTheApproverRes> userGetTheApprover() {
Long appUserId = SecurityUtils.getAppUserId();
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
@GetMapping("/WgzAppUserGetTheApprover/{recruitApplyId}")
public AjaxResult<WgzAppUserGetTheApproverRes> userGetTheApprover(@NotNull(message = "招工申请ID不能为空") @PathVariable("recruitApplyId") Long recruitApplyId) {
Long id = 0L;
if (recruitApplyId == 0){
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(SecurityUtils.getAppUserId());
id = by.getRecruitId();
}else{
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.getById(recruitApplyId);
id = by.getRecruitId();
}
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(id);
BgtUser byId = bgtUserService.selectUserByUserId(appById.getUserId());
return AjaxResult.success(new WgzAppUserGetTheApproverRes().
setUserId(byId.getUserId()).