ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整入职时间set

Browse Source
This commit is contained in:
aikai 2024-11-11 11:07:42 +08:00
parent 725f729740
commit d6faf46cdc
10 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java
View File

@ -147,8 +147,6 @@ public class BpmOAEntryServiceImpl implements BpmOAEntryService {
.setUrls(convertList(uploadUserFiles, UploadUserFile::getUrl))
.setUserId(userId);
fileApi.updateUserFileUserId(updateReqDTO);
// 更新用户入职时间到users表中
userApi.updateUserEntryDate(new UserSaveRespDTO().setId(userId).setEntryDate(entry.getEntryDate().atStartOfDay()));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/workovertime/WorkOvertimeApiImpl.java
View File

@ -31,7 +31,7 @@ public class WorkOvertimeApiImpl implements WorkOvertimeApi {
return CommonResult.success(vo.setIsGroup(Constants.ZERO));
}
WorkOvertimeRuleDO workOvertimeRuleDO = workOvertimeRuleAttendanceGroupService.getRuleByAttendanceGroupId(attendanceGroupDO.getId());
if (workOvertimeRuleDO == null){
if (workOvertimeRuleDO == null) {
return CommonResult.success(vo.setIsOvertime(Constants.ZERO));
}
BeanUtil.copyProperties(workOvertimeRuleDO, vo);

14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/workovertime/WorkOvertimeRuleAttendanceGroupDO.java
View File

@ -1,11 +1,10 @@
package cn.iocoder.yudao.module.system.dal.dataobject.workovertime;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
/**
* 加班规则考勤组关联 DO
@ -13,7 +12,8 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
* @author 艾楷
*/
@TableName("kq_work_overtime_rule_attendance_group")
@KeySequence("kq_work_overtime_rule_attendance_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@KeySequence("kq_work_overtime_rule_attendance_group_seq")
// 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@ -36,4 +36,4 @@ public class WorkOvertimeRuleAttendanceGroupDO extends BaseDO {
*/
private Long attendanceGroupId;
}
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
View File

@ -414,8 +414,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
.in(CollUtil.isNotEmpty(userIds), HolidayUserDO::getUserId, userIds));
// 清空记录 -
holidayUserRecordMapper.delete(new LambdaQueryWrapper<HolidayUserRecordDO>()
.eq(HolidayUserRecordDO::getHolidaySettingId, holidaySettingId)
.in(CollUtil.isNotEmpty(userIds), HolidayUserRecordDO::getUserId, userIds));
.in(CollUtil.isNotEmpty(userIds), HolidayUserRecordDO::getUserId, userIds)
.eq(HolidayUserRecordDO::getHolidaySettingId, holidaySettingId));
}
@Override
@ -659,8 +659,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
public List<HolidayUserRecordDO> getHolidayRemind(LocalDateTime now) {
return holidayUserRecordMapper.selectList(
new LambdaQueryWrapper<HolidayUserRecordDO>()
.isNotNull(HolidayUserRecordDO::getExpirationReminderTime)
.gt(HolidayUserRecordDO::getRemainingBalance, 0)
.isNotNull(HolidayUserRecordDO::getExpirationReminderTime)
.lt(HolidayUserRecordDO::getExpirationReminderTime, now)
.eq(HolidayUserRecordDO::getExpirationReminderFlag, 0)
);

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java
View File

@ -9,9 +9,11 @@ import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborCon
import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.laborcontract.LaborContractDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.laborcontract.LaborContractMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
@ -46,13 +48,19 @@ public class LaborContractServiceImpl implements LaborContractService {
@Override
public Long createLaborContract(LaborContractSaveReqVO createReqVO) {
// -- 查询是否有多条记录
Long num = laborContractMapper.selectCount(new LambdaQueryWrapper<LaborContractDO>()
.eq(LaborContractDO::getUserId, createReqVO.getUserId()));
// 插入
LaborContractDO laborContract = BeanUtils.toBean(createReqVO, LaborContractDO.class);
// 设置到期时间
laborContract.setExpirationDate(laborContract.getSigningDate().plusYears(laborContract.getContractDuration()));
laborContract.setStatus(2);
laborContractMapper.insert(laborContract);
// - 判断是否有多条记录 - 如果没有的话则 插入时间到用户表中
if (num == 0) {
userMapper.updateById(new AdminUserDO().setId(createReqVO.getUserId()).setEntryDate(createReqVO.getSigningDate().atStartOfDay()));
}
// 返回
return laborContract.getId();
}
@ -143,4 +151,4 @@ public class LaborContractServiceImpl implements LaborContractService {
return CollectionUtil.isEmpty(list) ? null : list.get(0);
}
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml
View File

@ -112,6 +112,7 @@
</foreach>
</if>
<if test="dto.groupIds != null and dto.groupIds.size() > 0">
and b.deleted = 0
and b.attendance_group_id in
<foreach collection="dto.groupIds" item="groupId" open="(" close=")" separator=",">
#{groupId}
@ -157,6 +158,7 @@
</foreach>
</if>
<if test="vo.groupIds != null and vo.groupIds.size() > 0">
and c.deleted = 0
and c.attendance_group_id in
<foreach collection="vo.groupIds" item="groupId" open="(" close=")" separator=",">
#{groupId}

18
yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/businessordernumber/BusinessOrderNumberServiceImpl.java
View File

@ -1,21 +1,15 @@
package cn.iocoder.yudao.module.wms.service.businessordernumber;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.wms.controller.admin.businessordernumber.vo.*;
import cn.iocoder.yudao.module.wms.dal.dataobject.businessordernumber.BusinessOrderNumberDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.wms.controller.admin.businessordernumber.vo.BusinessOrderNumberPageReqVO;
import cn.iocoder.yudao.module.wms.controller.admin.businessordernumber.vo.BusinessOrderNumberSaveReqVO;
import cn.iocoder.yudao.module.wms.dal.dataobject.businessordernumber.BusinessOrderNumberDO;
import cn.iocoder.yudao.module.wms.dal.mysql.businessordernumber.BusinessOrderNumberMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
/**
* 业务单号管理 Service 实现类

18
yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotlocationitem/DepotLocationItemServiceImpl.java
View File

@ -1,21 +1,15 @@
package cn.iocoder.yudao.module.wms.service.depotlocationitem;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.wms.controller.admin.depotlocationitem.vo.*;
import cn.iocoder.yudao.module.wms.dal.dataobject.depotlocationitem.DepotLocationItemDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.wms.controller.admin.depotlocationitem.vo.DepotLocationItemPageReqVO;
import cn.iocoder.yudao.module.wms.controller.admin.depotlocationitem.vo.DepotLocationItemSaveReqVO;
import cn.iocoder.yudao.module.wms.dal.dataobject.depotlocationitem.DepotLocationItemDO;
import cn.iocoder.yudao.module.wms.dal.mysql.depotlocationitem.DepotLocationItemMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
/**
* 库位子表管理 Service 实现类

18
yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/inouttype/InOutTypeServiceImpl.java
View File

@ -1,21 +1,15 @@
package cn.iocoder.yudao.module.wms.service.inouttype;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.wms.controller.admin.inouttype.vo.*;
import cn.iocoder.yudao.module.wms.dal.dataobject.inouttype.InOutTypeDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.wms.controller.admin.inouttype.vo.InOutTypePageReqVO;
import cn.iocoder.yudao.module.wms.controller.admin.inouttype.vo.InOutTypeSaveReqVO;
import cn.iocoder.yudao.module.wms.dal.dataobject.inouttype.InOutTypeDO;
import cn.iocoder.yudao.module.wms.dal.mysql.inouttype.InOutTypeMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
/**
* 出入库类型管理 Service 实现类

18
yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/productionline/ProductionLineServiceImpl.java
View File

@ -1,21 +1,15 @@
package cn.iocoder.yudao.module.wms.service.productionline;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.wms.controller.admin.productionline.vo.*;
import cn.iocoder.yudao.module.wms.dal.dataobject.productionline.ProductionLineDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.wms.controller.admin.productionline.vo.ProductionLinePageReqVO;
import cn.iocoder.yudao.module.wms.controller.admin.productionline.vo.ProductionLineSaveReqVO;
import cn.iocoder.yudao.module.wms.dal.dataobject.productionline.ProductionLineDO;
import cn.iocoder.yudao.module.wms.dal.mysql.productionline.ProductionLineMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
/**
* 产线管理 Service 实现类