Commit 196babd1 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

parents 905866e4 ab08f2ec
......@@ -1317,6 +1317,15 @@ public class DateUtil {
return cal.getTime();
}
public static Date getDateOfThisMonth(Date date){
Calendar cal = Calendar.getInstance();
if (date != null) {
cal.setTime(date);
}
cal.set(Calendar.MONTH,Integer.valueOf(DateUtil.getMonth(new Date()))-1);
return cal.getTime();
}
/**
* @Description: 增减(日)
* @Author: hgw
......
......@@ -296,8 +296,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
save.setId(null);
save.setMonth(Integer.parseInt(DateUtil.getThisMonth()));
save.setType(CommonConstants.ZERO_STRING);
save.setSocialEndDate(DateUtil.addMonthByDate(save.getSocialEndDate(),CommonConstants.ONE_INT));
save.setMedicalEndDate(DateUtil.addMonthByDate(save.getMedicalEndDate(),CommonConstants.ONE_INT));
save.setSocialEndDate(DateUtil.getDateOfThisMonth(save.getSocialEndDate()));
save.setMedicalEndDate(DateUtil.getDateOfThisMonth(save.getMedicalEndDate()));
initSocialEndDate(holidayMap, save);
initMedicalEndDate(holidayMap, save);
queryWrapper = initCountQuery(save,queryWrapper);
......
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