试用期计算

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -6,6 +6,7 @@
 package cn.timer.api.controller.yggl;
 package cn.timer.api.controller.yggl;
 
 
 import java.io.IOException;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Date;
@@ -44,6 +45,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.BetweenFormater.Level;
 import cn.hutool.core.date.BetweenFormater.Level;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.Tree;
@@ -60,6 +62,7 @@ import cn.hutool.poi.excel.ExcelWriter;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.SysRegion;
 import cn.timer.api.bean.clazz.SysRegion;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
+import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
@@ -289,25 +292,19 @@ public class YgglController {
 					.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).build();
 					.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).build();
 			ygglMainEmp.insert();
 			ygglMainEmp.insert();
 			
 			
-			
-			
 			//假期规则初始化
 			//假期规则初始化
-			
+			String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 			List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
 			List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
 			for(KqglAssoLeaveRules r : rul) {
 			for(KqglAssoLeaveRules r : rul) {
 				if(r.getLeaveBalance() == 0) {
 				if(r.getLeaveBalance() == 0) {
-					KqglAssoLeaveBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).modifyAction(2).balanceDays("-1")
-					.reason("不限制余额").modifyUserid(ygglMainEmp.getEmpNum()).modifyTimer(new Date().getTime()).orgCode(userBean.getOrgCode()).isAutomatic(1).modifyNumber(1).build().insert();//员工假期余额
+					KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(-1).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
 				}else {
 				}else {
-					KqglAssoLeaveBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).modifyAction(1).balanceDays("+0")
-					.reason("系统按照规则自动").modifyUserid(ygglMainEmp.getEmpNum()).modifyTimer(new Date().getTime()).orgCode(userBean.getOrgCode()).isAutomatic(1).modifyNumber(1).build().insert();//员工假期余额
+					KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
 				}
 				}
 			}
 			}
 			
 			
 			
 			
 			
 			
-			
-			
 			return ResultUtil.data(ygglMainEmp, "添加员工成功!");
 			return ResultUtil.data(ygglMainEmp, "添加员工成功!");
 		} else {
 		} else {
 			return ResultUtil.error("该手机号已被使用,请输入正确手机号");
 			return ResultUtil.error("该手机号已被使用,请输入正确手机号");
@@ -1724,7 +1721,14 @@ public class YgglController {
 			loginInfo.setGwId(gw);
 			loginInfo.setGwId(gw);
 			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
 			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
 			loginInfo.setEntryTime(ygglMainEmp.getRzTime());
 			loginInfo.setEntryTime(ygglMainEmp.getRzTime());
-			loginInfo.setRegularTime(ygglMainEmp.getRzTime());
+			
+			if(ygglMainEmp.getSyq()!=null) {
+				Date expireDate = DateUtil.offsetMonth(ygglMainEmp.getRzTime(), ygglMainEmp.getSyq()); // 时间偏移
+				loginInfo.setRegularTime(expireDate);	
+			}else {
+				loginInfo.setRegularTime(new Date());	
+			}
+			
 		}
 		}
 		return ResultUtil.data(loginInfo);
 		return ResultUtil.data(loginInfo);
 	}
 	}