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:
罗成
2025-03-25 20:39:46 +08:00
parent 8d23c199fa f8c59e29e7
commit 3d2ac57aca
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
View File

@ -121,9 +121,10 @@ public class AnnexController extends BaseController {
throw new BaseException("信息不存在"); throw new BaseException("信息不存在");
} }
List<String> list = Arrays.asList("1", "2"); List<String> list = Arrays.asList("1", "2");
List<String> notRecruitList = Arrays.asList("0");
String annexType = dto.getAnnexType(); String annexType = dto.getAnnexType();
LambdaQueryWrapper<Annex> wrapper = Wrappers.<Annex>lambdaQuery() LambdaQueryWrapper<Annex> wrapper = Wrappers.<Annex>lambdaQuery()
.eq(Annex::getRecruitId, byId.getRecruitId()) .eq(!notRecruitList.contains(annexType),Annex::getRecruitId, byId.getRecruitId())
.eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserId, dto.getUserId())
.eq(Annex::getUserType, WGZ) .eq(Annex::getUserType, WGZ)
.eq(!"3".equals(annexType), Annex::getAnnexType, annexType) .eq(!"3".equals(annexType), Annex::getAnnexType, annexType)

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

@ -193,7 +193,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
id = byId.getRecruitId(); id = byId.getRecruitId();
} }
BgtProjectRecruit recruit = iBgtProjectRecruitService.getAppById(id); BgtProjectRecruit recruit = iBgtProjectRecruitService.getAppById(id);
BgtUser byId1 = bgtUserService.getById(recruit.getUserId()); BgtUser byId1 = bgtUserService.selectUserByUserId(recruit.getUserId());
//2、查看当前申请结算的天数是否大于剩余天数 //2、查看当前申请结算的天数是否大于剩余天数
LambdaQueryWrapper<WgzAttendance> attWra = new LambdaQueryWrapper<WgzAttendance>(). LambdaQueryWrapper<WgzAttendance> attWra = new LambdaQueryWrapper<WgzAttendance>().
eq(WgzAttendance::getUserId, user.getUserId()). eq(WgzAttendance::getUserId, user.getUserId()).