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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zt
2025-03-27 10:44:32 +08:00
parent 4027127dfd 81cbfd6caf
commit 823d935d2d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -670,7 +670,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
.eq(WgzReissueacard::getUserId, wa.getUserId()) .eq(WgzReissueacard::getUserId, wa.getUserId())
.eq(WgzReissueacard::getAttendanceId, wa.getId()) .eq(WgzReissueacard::getAttendanceId, wa.getId())
.eq(WgzReissueacard::getType, type) .eq(WgzReissueacard::getType, type)
.ne(WgzReissueacard::getAuditorOpinion, "3") .ne(WgzReissueacard::getAuditorType, "3")
.orderByDesc(WgzReissueacard::getId) .orderByDesc(WgzReissueacard::getId)
); );

5
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
View File

@ -242,6 +242,7 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
//获取请假详情 //获取请假详情
WgzLeave we = baseMapper.selectById(req.getId()); WgzLeave we = baseMapper.selectById(req.getId());
BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(we.getApplyKey()); BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(we.getApplyKey());
BgtProjectRecruit recruit = iBgtProjectRecruitService.getById(recruitApply.getRecruitId());
//取消请假 //取消请假
WgzLeave wgzLeave = new WgzLeave(). WgzLeave wgzLeave = new WgzLeave().
setId(req.getId()). setId(req.getId()).
@ -252,10 +253,10 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
//状态取消成功需要把对应消息的状态变更为【不需要操作】 //状态取消成功需要把对应消息的状态变更为【不需要操作】
iBgtMessageService.operation( iBgtMessageService.operation(
USERTYPE_WGZ, USERTYPE_WGZ,
recruitApply.getUserId(), recruit.getUserId(),
USERTYPE_BGT, USERTYPE_BGT,
SecurityUtils.getAppUserId(), SecurityUtils.getAppUserId(),
recruitApply.getId(), we.getId(),
SqlHelper.table(BgtProjectRecruitApply.class).getTableName() SqlHelper.table(BgtProjectRecruitApply.class).getTableName()
); );
return true; return true;