Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!399

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

@@ -554,7 +554,21 @@ public class YgglController {
 				// 存放 插入失败的 数据
 				// 存放 插入失败的 数据
 				insertErrors.add(yme);
 				insertErrors.add(yme);
 			}
 			}
-
+			
+			
+			
+			//假期规则初始化
+			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));
+			for(KqglAssoLeaveRules r : rul) {
+				if(r.getLeaveBalance() == 0) {
+					KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(login.getId()).balanceDays(-1).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
+				}else {
+					KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(login.getId()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
+				}
+			}
+			
+			
 		}
 		}
 
 
 		JSONObject obj = JSONUtil.createObj();
 		JSONObject obj = JSONUtil.createObj();