|
|
@@ -1,6 +1,7 @@
|
|
|
package com.jeeplus.business.holiday.service;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
@@ -117,7 +118,13 @@ public class HolidayService {
|
|
|
int daysInYear = instance.getActualMaximum(Calendar.DAY_OF_YEAR);
|
|
|
//判断员工入职是否满10年
|
|
|
long round=0;
|
|
|
- double days1=Double.parseDouble(holidayDTO.getDays());
|
|
|
+ //员工请假时间
|
|
|
+ double days1=0;
|
|
|
+ if (ObjectUtil.isNotEmpty(holidayDTO.getDays())){
|
|
|
+ days1=Double.parseDouble(holidayDTO.getDays());
|
|
|
+ }else {
|
|
|
+ return "请选择请假日期";
|
|
|
+ }
|
|
|
if (yearsPassed>=1 && yearsPassed<10){
|
|
|
//(当年剩余的天数/当年一共天数)*5
|
|
|
double yearDays=(double)days/daysInYear*5;
|
sangwenwei