Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc

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

@@ -59,6 +59,8 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.SysRegion;
+import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
+import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.yggl.YgglAttaClfjb;
@@ -286,7 +288,26 @@ public class YgglController {
 					.jobStatus(jobStatus.SHIYONG.getType()).rzTime(rzTime).syq(syq).sex(sex)
 					.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).build();
 			ygglMainEmp.insert();
-
+			
+			
+			
+			//假期规则初始化
+			
+			List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
+			for(KqglAssoLeaveRules r : rul) {
+				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();//员工假期余额
+				}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();//员工假期余额
+				}
+			}
+			
+			
+			
+			
+			
 			return ResultUtil.data(ygglMainEmp, "添加员工成功!");
 		} else {
 			return ResultUtil.error("该手机号已被使用,请输入正确手机号");

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -550,10 +550,14 @@ public class RouterUtils {
 						//在 原审批人 列表中 插入 一个被转派人(审批人)
 						}else if (sts == ExecutorSts.REDEPLOY.ordinal()) {
 							List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1);
+							redeployUser.setExecute(UNEXECUTED);
 							users1.add(redeployUser);
 							List<User> users2 = CollectionUtil.sub(listUser, i_user+1, listUser.size());
+							System.out.println(users1);
+							System.out.println(users2);
 							listUser = ListUtils.union(users1, users2);
 							n_user = listUser.size();
+							System.out.println(listUser);
 						}
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 						SpmkExecutor.builder()

src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java

@@ -39,7 +39,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
 		String PatchCardTime = ObjectUtil.isNull(jsonObj.get("__PatchCardTime",FromData.class)) ? null : jsonObj.get("__PatchCardTime",FromData.class).getValue();
 		// 缺卡原因
 		String cardShortage = ObjectUtil.isNull(jsonObj.get("cardShortage",FromData.class)) ? null : jsonObj.get("cardShortage",FromData.class).getValue();
-		
+
 		// 缺卡时段-上班、下班-前端未改
 		String cardSupplementType = ObjectUtil.isNull(jsonObj.get("__CardSupplementType",FromData.class)) ? null : jsonObj.get("__CardSupplementType",FromData.class).getValue();