From d89118c8c2f83e4d39f05b774e9019141f0a6341 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 24 九月 2025 09:35:11 +0800
Subject: [PATCH] fix: 修复数据库表名大小写不一致问题及SQL查询错误
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 1ce8de2..606ab46 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -12,12 +12,15 @@
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -118,6 +121,15 @@
if (empContractinfo.getBeginDate() == null) {
empContractinfo.setBeginDate(empContractinfo.getSigningDate());
}
+ if(StrUtil.isEmpty(empContractinfo.getSex())){
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("empNumb", empContractinfo.getEmpNumb());
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getOne(queryWrapper);
+ if(ObjectUtil.isNotEmpty(empBaseInfo)){
+ empContractinfo.setSex(empBaseInfo.getSex());
+ }
+ }
+ empContractinfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), empContractinfo.getEndDate(), false));
empContractinfo.setCreator(operatorId);
empContractinfo.setModifier(operatorId);
this.save(empContractinfo);
@@ -132,6 +144,7 @@
empContractinfo.setDelFlag(dbData.getDelFlag());
empContractinfo.setModifyTime(new Date());
empContractinfo.setModifier(operatorId);
+ empContractinfo.setDiffDay((int) DateUtil.betweenDay(DateUtil.date(), empContractinfo.getEndDate(), false));
this.saveOrUpdate(empContractinfo);
}
@@ -259,7 +272,7 @@
queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
queryWrapper.eq("a.remindFlag", 0);
queryWrapper.in("a.contractStatus", contractStatus);
- queryWrapper.between("a.diffDay", 0, diffDay);
+ queryWrapper.le("a.diffDay", diffDay);
queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
--
Gitblit v1.8.0