试用期计算

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

@@ -45,6 +45,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.BetweenFormater.Level;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.tree.Tree;
@@ -1720,7 +1721,14 @@ public class YgglController {
 			loginInfo.setGwId(gw);
 			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
 			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);
 	}