From d6faf46cdc1988b797988fd0f73a68540209aadf Mon Sep 17 00:00:00 2001 From: aikai Date: Mon, 11 Nov 2024 11:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A5=E8=81=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/service/oa/BpmOAEntryServiceImpl.java | 2 -- .../api/workovertime/WorkOvertimeApiImpl.java | 2 +- .../WorkOvertimeRuleAttendanceGroupDO.java | 14 +++++++------- .../HolidayUserRecordServiceImpl.java | 6 +++--- .../LaborContractServiceImpl.java | 12 ++++++++++-- .../resources/mapper/user/AdminUserMapper.xml | 2 ++ .../BusinessOrderNumberServiceImpl.java | 18 ++++++------------ .../DepotLocationItemServiceImpl.java | 18 ++++++------------ .../inouttype/InOutTypeServiceImpl.java | 18 ++++++------------ .../ProductionLineServiceImpl.java | 18 ++++++------------ 10 files changed, 47 insertions(+), 63 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java index 17dc907d..78d1ea01 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java @@ -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())); } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/workovertime/WorkOvertimeApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/workovertime/WorkOvertimeApiImpl.java index dcaaef4a..38978d23 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/workovertime/WorkOvertimeApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/workovertime/WorkOvertimeApiImpl.java @@ -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); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/workovertime/WorkOvertimeRuleAttendanceGroupDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/workovertime/WorkOvertimeRuleAttendanceGroupDO.java index 0d2ed436..55730e38 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/workovertime/WorkOvertimeRuleAttendanceGroupDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/workovertime/WorkOvertimeRuleAttendanceGroupDO.java @@ -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; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java index 6bbb3ff0..16fc1327 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java @@ -414,8 +414,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { .in(CollUtil.isNotEmpty(userIds), HolidayUserDO::getUserId, userIds)); // 清空记录 - holidayUserRecordMapper.delete(new LambdaQueryWrapper() - .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 getHolidayRemind(LocalDateTime now) { return holidayUserRecordMapper.selectList( new LambdaQueryWrapper() - .isNotNull(HolidayUserRecordDO::getExpirationReminderTime) .gt(HolidayUserRecordDO::getRemainingBalance, 0) + .isNotNull(HolidayUserRecordDO::getExpirationReminderTime) .lt(HolidayUserRecordDO::getExpirationReminderTime, now) .eq(HolidayUserRecordDO::getExpirationReminderFlag, 0) ); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java index 9dd84289..3976cb6e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java @@ -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() + .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); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml index a74c677a..07fe40a0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml @@ -112,6 +112,7 @@ + and b.deleted = 0 and b.attendance_group_id in #{groupId} @@ -157,6 +158,7 @@ + and c.deleted = 0 and c.attendance_group_id in #{groupId} diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/businessordernumber/BusinessOrderNumberServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/businessordernumber/BusinessOrderNumberServiceImpl.java index 2e7c04eb..4aed282b 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/businessordernumber/BusinessOrderNumberServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/businessordernumber/BusinessOrderNumberServiceImpl.java @@ -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 实现类 diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotlocationitem/DepotLocationItemServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotlocationitem/DepotLocationItemServiceImpl.java index b4e019ba..1596b2cd 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotlocationitem/DepotLocationItemServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/depotlocationitem/DepotLocationItemServiceImpl.java @@ -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 实现类 diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/inouttype/InOutTypeServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/inouttype/InOutTypeServiceImpl.java index e3d200da..0b4859fb 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/inouttype/InOutTypeServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/inouttype/InOutTypeServiceImpl.java @@ -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 实现类 diff --git a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/productionline/ProductionLineServiceImpl.java b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/productionline/ProductionLineServiceImpl.java index ac8e6586..2216d169 100644 --- a/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/productionline/ProductionLineServiceImpl.java +++ b/yudao-module-wms/yudao-module-wms-biz/src/main/java/cn/iocoder/yudao/module/wms/service/productionline/ProductionLineServiceImpl.java @@ -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 实现类