工资,日报,补卡
This commit is contained in:
@ -1,9 +1,5 @@
|
||||
package com.ruoyi.wgz.bo.res;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -74,6 +70,9 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable {
|
||||
@ApiModelProperty("审核人ID")
|
||||
private Long auditorUserId;
|
||||
|
||||
@ApiModelProperty("审核人名字")
|
||||
private String auditorUserName;
|
||||
|
||||
@ApiModelProperty("审核状态(0未读 1待审核 2已同意 3已拒绝)")
|
||||
private String auditorType;
|
||||
|
||||
|
@ -17,6 +17,8 @@ import java.time.LocalDateTime;
|
||||
@ApiModel("补卡申请历史记录返回对象")
|
||||
public class WgzReplacementCardRecordRes implements Serializable {
|
||||
|
||||
@ApiModelProperty("主键ID")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("项目ID")
|
||||
private Long recruitId;
|
||||
|
@ -1,21 +1,20 @@
|
||||
package com.ruoyi.wgz.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.Accessors;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 工资结算对象 wgz_pay_calculation
|
||||
@ -77,6 +76,9 @@ public class WgzPayCalculation implements Serializable {
|
||||
@ApiModelProperty("进场时间")
|
||||
private LocalDate entryTime;
|
||||
|
||||
@ApiModelProperty("离场时间")
|
||||
private LocalDate leaveTime;
|
||||
|
||||
/** 工资金额 */
|
||||
@Excel(name = "工资金额")
|
||||
@ApiModelProperty("工资金额")
|
||||
@ -112,6 +114,9 @@ public class WgzPayCalculation implements Serializable {
|
||||
@ApiModelProperty("审核人ID")
|
||||
private Long auditorUserId;
|
||||
|
||||
@ApiModelProperty("审核人名字")
|
||||
private String auditorUserName;
|
||||
|
||||
/** 审核状态(0未读 1待审核 2已同意 3已拒绝) */
|
||||
@Excel(name = "审核状态" , readConverterExp = "0=未读,1=待审核,2=已同意,3=已拒绝")
|
||||
@ApiModelProperty("审核状态(0未读 1待审核 2已同意 3已拒绝)")
|
||||
|
@ -1,13 +1,15 @@
|
||||
package com.ruoyi.wgz.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
|
||||
import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzDailyClock;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import org.apache.ibatis.annotations.CacheNamespace;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 日报打卡Mapper接口
|
||||
@ -24,4 +26,6 @@ public interface WgzDailyClockMapper extends BaseMapperPlus<WgzDailyClock> {
|
||||
* @return 分页查询结果
|
||||
*/
|
||||
Page<WgzAppUserDailyRecordRes> userDailyRecordListPage(Page<WgzAppDailyRecordReq> page);
|
||||
|
||||
Page<BgtDailyClockListVO> appQueryPageList(@Param("page") Page<BgtDailyClockListDTO> page, @Param("dto") BgtDailyClockListDTO dto);
|
||||
}
|
||||
|
@ -1,13 +1,12 @@
|
||||
package com.ruoyi.wgz.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
|
||||
import com.ruoyi.wgz.domain.WgzPayCalculation;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppApplyForPayrollSettlementListReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes;
|
||||
import com.ruoyi.wgz.domain.WgzPayCalculation;
|
||||
import org.apache.ibatis.annotations.CacheNamespace;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@ -21,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
|
||||
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
|
||||
public interface WgzPayCalculationMapper extends BaseMapperPlus<WgzPayCalculation> {
|
||||
Page<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList (@Param("page") Page<WgzAppApplyForPayrollSettlementListReq> page);
|
||||
|
||||
Page<WgzAppApplyForPayrollSettlementListRes> appQueryPageList (@Param("page") Page<BgtPayCalculationListDTO> page, @Param("dto") BgtPayCalculationListDTO dto);
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
package com.ruoyi.wgz.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzReissueacard;
|
||||
@ -24,4 +25,7 @@ public interface WgzReissueacardMapper extends BaseMapperPlus<WgzReissueacard> {
|
||||
* @return 分页查询结果
|
||||
*/
|
||||
Page<WgzReplacementCardRecordRes> userReplacementCardRecordListPage(@Param("page") Page<WgzAppReplacementCardRecordReq> page,@Param("userId") Long userId);
|
||||
|
||||
Page<WgzReplacementCardRecordRes> appQueryPageList(@Param("page") Page<BgtReissueacardListDTO> page,@Param("dto") BgtReissueacardListDTO dto);
|
||||
|
||||
}
|
||||
|
@ -1,13 +1,17 @@
|
||||
package com.ruoyi.wgz.service;
|
||||
|
||||
import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO;
|
||||
import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO;
|
||||
import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
|
||||
import com.ruoyi.wgz.domain.WgzDailyClock;
|
||||
import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
|
||||
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;
|
||||
@ -79,4 +83,22 @@ public interface IWgzDailyClockService extends IServicePlus<WgzDailyClock> {
|
||||
* 日报日历·查看日报
|
||||
*/
|
||||
WgzDailyClock userCheckDailyNewspaper(Long id);
|
||||
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
TableDataInfo<BgtDailyClockListVO> appQueryPageList(BgtDailyClockListDTO dto);
|
||||
|
||||
|
||||
/**
|
||||
* 查询单个
|
||||
* @return
|
||||
*/
|
||||
BgtDailyClockDetailVO appQueryById(Long id);
|
||||
|
||||
/**
|
||||
* 查看和审核
|
||||
*/
|
||||
Boolean appUpdate(BgtDailyClockUpdateDTO dto);
|
||||
}
|
||||
|
@ -1,12 +1,14 @@
|
||||
package com.ruoyi.wgz.service;
|
||||
|
||||
import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
|
||||
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;
|
||||
@ -79,4 +81,20 @@ public interface IWgzPayCalculationService extends IServicePlus<WgzPayCalculatio
|
||||
* 根据务工者id和招工id,得到最新的数据
|
||||
*/
|
||||
WgzPayCalculation findByUserIdRecruitIdNewestData(Long userId, Long recruitId);
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
TableDataInfo<WgzAppApplyForPayrollSettlementListRes> appQueryPageList(BgtPayCalculationListDTO dto);
|
||||
|
||||
/**
|
||||
* 查询单个
|
||||
*/
|
||||
WgzAppApplyForPayrollSettlementListRes appQueryById(Long id);
|
||||
|
||||
/**
|
||||
* 审核工资结算
|
||||
*/
|
||||
Boolean appUpdate(BgtPayCalculationUpdateDTO dto);
|
||||
|
||||
}
|
||||
|
@ -1,13 +1,14 @@
|
||||
package com.ruoyi.wgz.service;
|
||||
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzReissueacard;
|
||||
import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
|
||||
import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO;
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzReissueacard;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
@ -76,4 +77,14 @@ public interface IWgzReissueacardService extends IServicePlus<WgzReissueacard> {
|
||||
*/
|
||||
TableDataInfo<WgzReplacementCardRecordRes> userReplacementCardRecord(@Validated WgzAppReplacementCardRecordReq req);
|
||||
|
||||
/**
|
||||
* 补卡记录审核(分页)
|
||||
*/
|
||||
TableDataInfo<WgzReplacementCardRecordRes> appQueryPageList(BgtReissueacardListDTO dto);
|
||||
|
||||
/**
|
||||
* 审核
|
||||
*/
|
||||
Boolean appUpdate(BgtReissueacardUpdateDTO dto);
|
||||
|
||||
}
|
||||
|
@ -2,27 +2,37 @@ package com.ruoyi.wgz.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
||||
import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtDailyClockUpdateDTO;
|
||||
import com.ruoyi.bgt.domain.vo.BgtDailyClockDetailVO;
|
||||
import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO;
|
||||
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
|
||||
import com.ruoyi.bgt.service.IBgtUserService;
|
||||
import com.ruoyi.common.core.domain.entity.BgtUser;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
|
||||
import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo;
|
||||
import com.ruoyi.wgz.service.IWgzLeaveService;
|
||||
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.WgzDailyClockQueryBo;
|
||||
import com.ruoyi.wgz.domain.WgzDailyClock;
|
||||
import com.ruoyi.wgz.mapper.WgzDailyClockMapper;
|
||||
import com.ruoyi.wgz.service.IWgzDailyClockService;
|
||||
import com.ruoyi.wgz.service.IWgzLeaveService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.temporal.TemporalAdjusters;
|
||||
import java.util.*;
|
||||
|
||||
@ -37,6 +47,12 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
|
||||
@Autowired
|
||||
private IWgzLeaveService iWgzLeaveService;
|
||||
|
||||
@Autowired
|
||||
private IBgtUserService userService;
|
||||
|
||||
@Autowired
|
||||
private IBgtProjectRecruitService recruitService;
|
||||
|
||||
@Override
|
||||
public WgzDailyClock queryById(Long id){
|
||||
return getById(id);
|
||||
@ -163,4 +179,33 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
|
||||
public WgzDailyClock userCheckDailyNewspaper(Long id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<BgtDailyClockListVO> appQueryPageList(BgtDailyClockListDTO dto) {
|
||||
dto.setAuditorUserId(SecurityUtils.getAppUserId());
|
||||
Page<BgtDailyClockListDTO> queryDTOPage = new Page<>();
|
||||
queryDTOPage.setCurrent(dto.getPageNum());
|
||||
queryDTOPage.setSize(dto.getPageSize());
|
||||
Page<BgtDailyClockListVO> queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto);
|
||||
return PageUtils.buildDataInfo(queryVOPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BgtDailyClockDetailVO appQueryById(Long id) {
|
||||
WgzDailyClock dailyClock = getById(id);
|
||||
BgtDailyClockDetailVO detailVO = BeanUtil.copyProperties(dailyClock, BgtDailyClockDetailVO.class);
|
||||
BgtUser bgtUser = userService.getById(dailyClock.getUserId());
|
||||
detailVO.setUsername(bgtUser.getUsername());
|
||||
detailVO.setAvatarName(bgtUser.getAvatarName());
|
||||
BgtProjectRecruit recruit = recruitService.getById(dailyClock.getRecruitId());
|
||||
detailVO.setRecruitName(recruit.getRecruitName());
|
||||
return detailVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean appUpdate(BgtDailyClockUpdateDTO dto) {
|
||||
WgzDailyClock dailyClock = BeanUtil.copyProperties(dto, WgzDailyClock.class);
|
||||
dailyClock.setAuditorTime(LocalDateTime.now());
|
||||
return updateById(dailyClock);
|
||||
}
|
||||
}
|
||||
|
@ -2,41 +2,38 @@ package com.ruoyi.wgz.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
|
||||
import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
|
||||
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.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.wgz.bo.WgzPayCalculationQueryBo;
|
||||
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.domain.WgzPayCalculation;
|
||||
import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
|
||||
import com.ruoyi.wgz.mapper.WgzPayCalculationMapper;
|
||||
import com.ruoyi.wgz.service.IWgzPayCalculationFilesService;
|
||||
import com.ruoyi.wgz.service.IWgzPayCalculationService;
|
||||
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.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 工资结算Service业务层处理
|
||||
@ -172,4 +169,28 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
|
||||
return baseMapper.selectOne(eq);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<WgzAppApplyForPayrollSettlementListRes> appQueryPageList(BgtPayCalculationListDTO dto) {
|
||||
dto.setAuditorUserId(SecurityUtils.getAppUserId());
|
||||
Page<BgtPayCalculationListDTO> pe = new Page<>();
|
||||
pe.setCurrent(dto.getPageNum());
|
||||
pe.setSize(dto.getPageSize());
|
||||
return PageUtils.buildDataInfo(baseMapper.appQueryPageList(pe,dto));
|
||||
}
|
||||
|
||||
@Override
|
||||
public WgzAppApplyForPayrollSettlementListRes appQueryById(Long id) {
|
||||
WgzPayCalculation payCalculation = getById(id);
|
||||
WgzAppApplyForPayrollSettlementListRes res = BeanUtil.copyProperties(payCalculation, WgzAppApplyForPayrollSettlementListRes.class);
|
||||
List<WgzPayCalculationFiles> list = iWgzPayCalculationFilesService.list(Wrappers.<WgzPayCalculationFiles>lambdaQuery().eq(WgzPayCalculationFiles::getCalculationId, id));
|
||||
res.setPayCalculation(list);
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean appUpdate(BgtPayCalculationUpdateDTO dto) {
|
||||
WgzPayCalculation payCalculation = BeanUtil.copyProperties(dto, WgzPayCalculation.class);
|
||||
payCalculation.setAuditorTime(LocalDateTime.now());
|
||||
return updateById(payCalculation);
|
||||
}
|
||||
}
|
||||
|
@ -2,35 +2,36 @@ package com.ruoyi.wgz.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
|
||||
import com.ruoyi.bgt.domain.dto.BgtReissueacardListDTO;
|
||||
import com.ruoyi.bgt.domain.dto.BgtReissueacardUpdateDTO;
|
||||
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
|
||||
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.WgzReissueacardQueryBo;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppCardReplacementApplicationRes;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzAttendance;
|
||||
import com.ruoyi.wgz.service.IWgzAttendanceService;
|
||||
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.WgzReissueacardQueryBo;
|
||||
import com.ruoyi.wgz.domain.WgzReissueacard;
|
||||
import com.ruoyi.wgz.mapper.WgzReissueacardMapper;
|
||||
import com.ruoyi.wgz.service.IWgzAttendanceService;
|
||||
import com.ruoyi.wgz.service.IWgzReissueacardService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@ -170,4 +171,17 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
|
||||
return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage,userId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<WgzReplacementCardRecordRes> appQueryPageList(BgtReissueacardListDTO dto) {
|
||||
dto.setAuditorUserId(SecurityUtils.getAppUserId());
|
||||
Page<BgtReissueacardListDTO> queryDTOPage = new Page<>();
|
||||
queryDTOPage.setCurrent(dto.getPageNum());
|
||||
queryDTOPage.setSize(dto.getPageSize());
|
||||
return PageUtils.buildDataInfo(baseMapper.appQueryPageList(queryDTOPage,dto));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean appUpdate(BgtReissueacardUpdateDTO dto) {
|
||||
return updateById(BeanUtil.copyProperties(dto,WgzReissueacard.class));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user