Commit 99fed083 authored by fangxinjiang's avatar fangxinjiang

节假日配置表及社保医疗截止配置表调整

parent 2dd1e711
...@@ -401,9 +401,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI ...@@ -401,9 +401,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
private void initMedicalEndDate(Map<String, String> holidayMap, TSocialDeadlineInfo save) { private void initMedicalEndDate(Map<String, String> holidayMap, TSocialDeadlineInfo save) {
// type 0 休假 1 补班 // type 0 休假 1 补班
String type; String day = holidayMap.get(DateUtil.getDay(save.getMedicalEndDate()));
type = holidayMap.get(DateUtil.getDay(save.getMedicalEndDate())); if (Common.isNotNull(day)){
if (Common.isNotNull(type) && CommonConstants.ZERO_STRING.equals(type)){
save.setMedicalEndDate(DateUtil.addDayByDate(save.getMedicalEndDate(),CommonConstants.ONE_INT_NEGATE)); save.setMedicalEndDate(DateUtil.addDayByDate(save.getMedicalEndDate(),CommonConstants.ONE_INT_NEGATE));
}else { }else {
return; return;
...@@ -413,9 +412,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI ...@@ -413,9 +412,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
private void initSocialEndDate(Map<String, String> holidayMap, TSocialDeadlineInfo save) { private void initSocialEndDate(Map<String, String> holidayMap, TSocialDeadlineInfo save) {
// type 0 休假 1 补班 // type 0 休假 1 补班
String type; String day= holidayMap.get(DateUtil.getDay(save.getSocialEndDate()));
type = holidayMap.get(DateUtil.getDay(save.getSocialEndDate())); if (Common.isNotNull(day)){
if (Common.isNotNull(type)&& CommonConstants.ZERO_STRING.equals(type)){
save.setSocialEndDate(DateUtil.addDayByDate(save.getSocialEndDate(),CommonConstants.ONE_INT_NEGATE)); save.setSocialEndDate(DateUtil.addDayByDate(save.getSocialEndDate(),CommonConstants.ONE_INT_NEGATE));
}else { }else {
return; return;
......
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