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 14:21:41 +08:00
parent 081f1f23d8
commit c8c7606703
26 changed files with 1723 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzAttendanceService.java
View File

@ -115,7 +115,8 @@ public interface IWgzAttendanceService extends IServicePlus<WgzAttendance> {
BgtAttendanceVO attendanceDetail(BgtAttendanceDTO dto);
/**
* 考勤详情,查询指定用户指定项目的指定天数考勤情况统计（如若用户输入20，但实际只有2天出勤）
* 考勤详情,查询指定用户指定项目的指定天数考勤情况统计（如若用户输入20，但实际只有2天出勤）；
* 如若num为0,那么表示查询所有天数的考勤情况统计；
*/
Integer attendanceDetail(Long userId,Long recruitId, Integer num);

55
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationFilesService.java Normal file
View File

@ -0,0 +1,55 @@
package com.ruoyi.wgz.service;
import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
import com.ruoyi.wgz.bo.WgzPayCalculationFilesQueryBo;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.Collection;
import java.util.List;
/**
* 工资结算附件Service接口
*
* @author ruoyi
* @date 2025-02-22
*/
public interface IWgzPayCalculationFilesService extends IServicePlus<WgzPayCalculationFiles> {
/**
* 查询单个
* @return
*/
WgzPayCalculationFiles queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<WgzPayCalculationFiles> queryPageList(WgzPayCalculationFilesQueryBo bo);
/**
* 查询列表
*/
List<WgzPayCalculationFiles> queryList(WgzPayCalculationFilesQueryBo bo);
/**
* 根据新增业务对象插入工资结算附件
* @param bo 工资结算附件新增业务对象
* @return
*/
Boolean insert(WgzPayCalculationFiles bo);
/**
* 根据编辑业务对象修改工资结算附件
* @param bo 工资结算附件编辑业务对象
* @return
*/
Boolean update(WgzPayCalculationFiles bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

82
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java Normal file
View File

@ -0,0 +1,82 @@
package com.ruoyi.wgz.service;
import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq;
import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
import com.ruoyi.wgz.domain.WgzPayCalculation;
import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.validation.annotation.Validated;
import java.util.Collection;
import java.util.List;
/**
* 工资结算Service接口
*
* @author ruoyi
* @date 2025-02-21
*/
public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculation> {
/**
* 查询单个
* @return
*/
WgzPayCalculation queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<WgzPayCalculation> queryPageList(WgzPayCalculationQueryBo bo);
/**
* 查询列表
*/
List<WgzPayCalculation> queryList(WgzPayCalculationQueryBo bo);
/**
* 根据新增业务对象插入工资结算
* @param bo 工资结算新增业务对象
* @return
*/
Boolean insert(WgzPayCalculation bo);
/**
* 根据编辑业务对象修改工资结算
* @param bo 工资结算编辑业务对象
* @return
*/
Boolean update(WgzPayCalculation bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* APP相关
* =================================================================================================================
* =================================================================================================================
* =================================================================================================================
*/
/**
* 用户申请结算（新增）
*/
Boolean userApplyForPayrollSettlementAdd(@Validated WgzApplyForPayrollSettlementAddReq req);
/**
* 申请工资结算（列表·分页）
*/
TableDataInfo<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList(@Validated WgzAppApplyForPayrollSettlementListReq req);
/**
* 根据务工者id和招工id，得到最新的数据
*/
WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId);
}

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

@ -319,7 +319,9 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
.isNotNull(WgzAttendance::getClockOutTime)
);
apply.orderByAsc(WgzAttendance::getDate);
apply.last("LIMIT " + num);
if (num!=null && num>0) { //表示查询指定天数的打卡记录,否则查询所有
apply.last("LIMIT " + num);
}
return baseMapper.selectCount(apply);
}

88
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationFilesServiceImpl.java Normal file
View File

@ -0,0 +1,88 @@
package com.ruoyi.wgz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.wgz.bo.WgzPayCalculationFilesQueryBo;
import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
import com.ruoyi.wgz.mapper.WgzPayCalculationFilesMapper;
import com.ruoyi.wgz.service.IWgzPayCalculationFilesService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工资结算附件Service业务层处理
*
* @author ruoyi
* @date 2025-02-22
*/
@Service
public class WgzPayCalculationFilesServiceImpl extends ServicePlusImpl<WgzPayCalculationFilesMapper, WgzPayCalculationFiles> implements IWgzPayCalculationFilesService {
@Override
public WgzPayCalculationFiles queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<WgzPayCalculationFiles> queryPageList(WgzPayCalculationFilesQueryBo bo) {
Page<WgzPayCalculationFiles> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<WgzPayCalculationFiles> queryList(WgzPayCalculationFilesQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<WgzPayCalculationFiles> buildQueryWrapper(WgzPayCalculationFilesQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WgzPayCalculationFiles> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getCalculationId() != null, WgzPayCalculationFiles::getCalculationId, bo.getCalculationId());
lqw.eq(StrUtil.isNotBlank(bo.getTypeOfAttachment()), WgzPayCalculationFiles::getTypeOfAttachment, bo.getTypeOfAttachment());
lqw.like(StrUtil.isNotBlank(bo.getName()), WgzPayCalculationFiles::getName, bo.getName());
lqw.eq(StrUtil.isNotBlank(bo.getType()), WgzPayCalculationFiles::getType, bo.getType());
lqw.eq(StrUtil.isNotBlank(bo.getAddress()), WgzPayCalculationFiles::getAddress, bo.getAddress());
return lqw;
}
@Override
public Boolean insert(WgzPayCalculationFiles bo) {
WgzPayCalculationFiles add = BeanUtil.toBean(bo, WgzPayCalculationFiles.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(WgzPayCalculationFiles bo) {
WgzPayCalculationFiles update = BeanUtil.toBean(bo, WgzPayCalculationFiles.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(WgzPayCalculationFiles entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
}

175
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java Normal file
View File

@ -0,0 +1,175 @@
package com.ruoyi.wgz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.bgt.domain.BgtProjectRecruit;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.domain.Annex;
import com.ruoyi.common.domain.dto.AnnexDTO;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
import com.ruoyi.wgz.bo.req.WgzApplyForPayrollSettlementAddReq;
import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
import com.ruoyi.wgz.service.IWgzPayCalculationFilesService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
import com.ruoyi.wgz.domain.WgzPayCalculation;
import com.ruoyi.wgz.mapper.WgzPayCalculationMapper;
import com.ruoyi.wgz.service.IWgzPayCalculationService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.reactive.TransactionalOperator;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工资结算Service业务层处理
*
* @author ruoyi
* @date 2025-02-21
*/
@Service
public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculationMapper, WgzPayCalculation> implements IWgzPayCalculationService {
@Autowired
private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
@Autowired
private IBgtProjectRecruitService iBgtProjectRecruitService;
@Autowired
private IWgzPayCalculationFilesService iWgzPayCalculationFilesService;
@Override
public WgzPayCalculation queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<WgzPayCalculation> queryPageList(WgzPayCalculationQueryBo bo) {
Page<WgzPayCalculation> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<WgzPayCalculation> queryList(WgzPayCalculationQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<WgzPayCalculation> buildQueryWrapper(WgzPayCalculationQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WgzPayCalculation> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getTaskId() != null, WgzPayCalculation::getTaskId, bo.getTaskId());
lqw.eq(bo.getRecruitId() != null, WgzPayCalculation::getRecruitId, bo.getRecruitId());
lqw.eq(bo.getUserId() != null, WgzPayCalculation::getUserId, bo.getUserId());
lqw.like(StrUtil.isNotBlank(bo.getTaskName()), WgzPayCalculation::getTaskName, bo.getTaskName());
lqw.eq(StrUtil.isNotBlank(bo.getTaskAddress()), WgzPayCalculation::getTaskAddress, bo.getTaskAddress());
lqw.like(StrUtil.isNotBlank(bo.getRecruitName()), WgzPayCalculation::getRecruitName, bo.getRecruitName());
lqw.like(StrUtil.isNotBlank(bo.getUserName()), WgzPayCalculation::getUserName, bo.getUserName());
lqw.eq(bo.getEntryTime() != null, WgzPayCalculation::getEntryTime, bo.getEntryTime());
lqw.eq(bo.getRecruitAmount() != null, WgzPayCalculation::getRecruitAmount, bo.getRecruitAmount());
lqw.eq(bo.getNum() != null, WgzPayCalculation::getNum, bo.getNum());
lqw.eq(StrUtil.isNotBlank(bo.getWorkingState()), WgzPayCalculation::getWorkingState, bo.getWorkingState());
lqw.eq(StrUtil.isNotBlank(bo.getPhone()), WgzPayCalculation::getPhone, bo.getPhone());
lqw.eq(StrUtil.isNotBlank(bo.getBank()), WgzPayCalculation::getBank, bo.getBank());
lqw.eq(StrUtil.isNotBlank(bo.getCardNo()), WgzPayCalculation::getCardNo, bo.getCardNo());
lqw.eq(bo.getAuditorUserId() != null, WgzPayCalculation::getAuditorUserId, bo.getAuditorUserId());
lqw.eq(StrUtil.isNotBlank(bo.getAuditorType()), WgzPayCalculation::getAuditorType, bo.getAuditorType());
lqw.eq(StrUtil.isNotBlank(bo.getAuditorOpinion()), WgzPayCalculation::getAuditorOpinion, bo.getAuditorOpinion());
lqw.eq(bo.getAuditorTime() != null, WgzPayCalculation::getAuditorTime, bo.getAuditorTime());
return lqw;
}
@Override
public Boolean insert(WgzPayCalculation bo) {
WgzPayCalculation add = BeanUtil.toBean(bo, WgzPayCalculation.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(WgzPayCalculation bo) {
WgzPayCalculation update = BeanUtil.toBean(bo, WgzPayCalculation.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(WgzPayCalculation entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
/**
* APP相关
* =================================================================================================================
* =================================================================================================================
* =================================================================================================================
*/
@Override
@Transactional
public Boolean userApplyForPayrollSettlementAdd(WgzApplyForPayrollSettlementAddReq req) {
//1、获取当前人
SysUser user = SecurityUtils.getLoginUser().getUser();
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(user.getUserId());
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
//2、组装数据
WgzPayCalculation wgzPayCalculation = new WgzPayCalculation();
BeanUtils.copyProperties(req,wgzPayCalculation);
wgzPayCalculation.
setUserId(user.getUserId()).
setUserName(user.getUserName()).
setAuditorUserId(appById.getUserId());
//3、获取附件信息并插入
iWgzPayCalculationFilesService.saveBatch(req.getPayCalculation());
return save(wgzPayCalculation);
}
@Override
public TableDataInfo<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList(WgzAppApplyForPayrollSettlementListReq req) {
Page<WgzAppApplyForPayrollSettlementListReq> pe = new Page<>();
pe.setCurrent(req.getPageNum());
pe.setSize(req.getPageSize());
return PageUtils.buildDataInfo(baseMapper.userApplyForPayrollSettlementList(pe));
}
@Override
public WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId) {
LambdaQueryWrapper<WgzPayCalculation> eq = new LambdaQueryWrapper<WgzPayCalculation>().
eq(WgzPayCalculation::getUserId, userId).
eq(WgzPayCalculation::getRecruitId, recruitId).
orderByDesc(WgzPayCalculation::getCreateTime).
last("limit 1");
return baseMapper.selectOne(eq);
}
}

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

@ -163,10 +163,11 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
@Override
public TableDataInfo<WgzReplacementCardRecordRes> userReplacementCardRecord(WgzAppReplacementCardRecordReq req) {
Long userId = SecurityUtils.getAppUserId();
Page<WgzAppReplacementCardRecordReq> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(req.getPageNum());
queryDTOPage.setSize(req.getPageSize());
return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage));
return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage,userId));
}
}