Commit 11db0ba0 authored by hongguangwu's avatar hongguangwu

MVP1.7.9-日志优化

parent 1fc8a510
...@@ -34,6 +34,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo; ...@@ -34,6 +34,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator; import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
...@@ -186,6 +187,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -186,6 +187,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if (Common.isNotNull(newInsurance.getId())) { if (Common.isNotNull(newInsurance.getId())) {
oldInsurance = oldMap.get(newInsurance.getId()); oldInsurance = oldMap.get(newInsurance.getId());
if (oldInsurance != null) { if (oldInsurance != null) {
initDateHour(oldInsurance);
differenceInsuranceKey = HrEquator.comparisonValue(oldInsurance, newInsurance); differenceInsuranceKey = HrEquator.comparisonValue(oldInsurance, newInsurance);
} }
if (Common.isNotNull(differenceInsuranceKey) || oldInsurance == null) { if (Common.isNotNull(differenceInsuranceKey) || oldInsurance == null) {
...@@ -260,6 +262,29 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -260,6 +262,29 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
} }
/**
* @Description: 设置日期为08点
* @Author: hgw
* @Date: 2025/4/14 18:52
* @return: void
**/
public void initDateHour(TEmployeeInsurancePre oldInsurance) {
if (oldInsurance != null) {
oldInsurance.setModelType(CommonConstants.TWO_STRING);
if (Common.isNotNull(oldInsurance.getPolicyStart())) {
oldInsurance.setPolicyStart(DateUtil.setHourByDate(oldInsurance.getPolicyStart()));
}
if (Common.isNotNull(oldInsurance.getPolicyEnd())) {
oldInsurance.setPolicyEnd(DateUtil.setHourByDate(oldInsurance.getPolicyEnd()));
}
if (Common.isNotNull(oldInsurance.getPolicyEffect())) {
oldInsurance.setPolicyEffect(DateUtil.setHourByDate(oldInsurance.getPolicyEffect()));
}
if (Common.isNotNull(oldInsurance.getJoinLeaveDate())) {
oldInsurance.setJoinLeaveDate(DateUtil.setHourByDate(oldInsurance.getJoinLeaveDate()));
}
}
}
@Override @Override
public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap) { , EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap) {
......
...@@ -1388,6 +1388,21 @@ public class DateUtil { ...@@ -1388,6 +1388,21 @@ public class DateUtil {
cal.add(Calendar.MONTH, mnt); cal.add(Calendar.MONTH, mnt);
return cal.getTime(); return cal.getTime();
} }
/**
* @Description: 设置(时)
* @Author: hgw
* @Date: 2022/8/3 9:17
* @return: java.util.Date
**/
public static Date setHourByDate(Date date) {
Calendar cal = Calendar.getInstance();
if (date != null) {
cal.setTime(date);
}
cal.set(Calendar.HOUR_OF_DAY, 0);
return cal.getTime();
}
/** /**
* @Description: 增减(月),并且设置为1号1点 * @Description: 增减(月),并且设置为1号1点
* @Author: hgw * @Author: hgw
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment