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-20 16:41:38 +08:00
parent 1dc93404b5
commit 21ded5ae19
17 changed files with 174 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,4 +108,9 @@ public interface IWgzDailyClockService extends IServicePlus<WgzDailyClock> {
* 查看和审核
*/
Boolean appUpdate(BgtDailyClockUpdateDTO dto);
/**
* 是否还有在审核的申请
*/
Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId);
}

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

@ -115,6 +115,11 @@ public interface IWgzLeaveService extends IServicePlus<WgzLeave> {
*/
void refuseBatch(Long recruitId,Long userId);
/**
* 是否还有在审核的申请
*/
Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId);
/**
* 包工头审核列表
*/

13
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java
View File

@ -16,9 +16,7 @@ import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
import com.ruoyi.wgz.bo.res.WgzAppUserApplyForPayrollSettlementDetails;
import com.ruoyi.wgz.domain.WgzPayCalculation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PathVariable;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
@ -126,7 +124,18 @@ public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculatio
*/
TableDataInfo<BgtPayCalculationDetailListVO> record(BgtPayCalculationRecordDTO dto);
/**
* 包工头结算
*/
Boolean bgtAdd(BgtApplyForWgzPayAddDTO dto);
/**
* 结算基础信息
*/
BgtApplyForWgzPayAddInfoVO payInfo(Long userId, Long recruitId);
/**
* 是否还有在审核的申请
*/
Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId);
}

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

@ -96,4 +96,9 @@ public interface IWgzReissueacardService extends IServicePlus<WgzReissueacard> {
*/
void refuseBatch(Long recruitId,Long userId);
/**
* 是否还有在审核的申请
*/
Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId);
}

11
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.wgz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -398,4 +399,14 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
}
return updateById(dailyClock);
}
@Override
public Boolean isThereAnyApplicationsInReview(Long recruitId, Long userId) {
List<WgzDailyClock> list = list(Wrappers.<WgzDailyClock>lambdaQuery()
.eq(WgzDailyClock::getRecruitId, recruitId)
.eq(WgzDailyClock::getUserId, userId)
.eq(WgzDailyClock::getStatus, "1")
.in(WgzDailyClock::getAuditorType, AuditStatus.getToAudit()));
return CollectionUtil.isNotEmpty(list);
}
}

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

@ -353,6 +353,15 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
}
}
@Override
public Boolean isThereAnyApplicationsInReview(Long recruitId, Long userId) {
List<WgzLeave> list = list(Wrappers.<WgzLeave>lambdaQuery()
.eq(WgzLeave::getRecruitId, recruitId)
.eq(WgzLeave::getUserId, userId)
.in(WgzLeave::getAuditorType, AuditStatus.getToAudit()));
return CollectionUtil.isNotEmpty(list);
}
@Override
public TableDataInfo<BgtAuditResultVO> bgtLeaveAudit(BgtAuditListDTO dto) {
dto.setAuditorUserId(SecurityUtils.getAppUserId());

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

@ -616,4 +616,13 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
vo.setCardNo(wgzUser.getCardNo());
return vo;
}
@Override
public Boolean isThereAnyApplicationsInReview(Long recruitId, Long userId) {
List<WgzPayCalculation> list = list(Wrappers.<WgzPayCalculation>lambdaQuery()
.eq(WgzPayCalculation::getRecruitId, recruitId)
.eq(WgzPayCalculation::getUserId, userId)
.in(WgzPayCalculation::getAuditorType, AuditStatus.getToAudit()));
return CollectionUtil.isNotEmpty(list);
}
}

10
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.wgz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -317,4 +318,13 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
appUpdate(bgtReissueacardUpdateDTO);
}
}
@Override
public Boolean isThereAnyApplicationsInReview(Long recruitId, Long userId) {
List<WgzReissueacard> list = list(new LambdaQueryWrapper<WgzReissueacard>()
.eq(WgzReissueacard::getRecruitId, recruitId)
.eq(WgzReissueacard::getUserId, userId)
.in(WgzReissueacard::getAuditorType,AuditStatus.getToAudit()));
return CollectionUtil.isNotEmpty(list);
}
}