From 0ad6eb5da00eb35a68ec892db9b75bf4c7b79afc Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 24 四月 2021 17:55:57 +0800
Subject: [PATCH] fix(bug修复): 去掉了版本号乐观锁
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index f608557..587d849 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -199,7 +199,7 @@
returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- contractInfo.setDelFlag(2);
+ contractInfo.setDelFlag(0);
contractInfo.setEmpId(empId);
contractInfo.setDeptName(list.get(1).toString());
contractInfo.setDeptId(dept.getDeptId());
@@ -217,7 +217,7 @@
contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
}
if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
}
//合同
DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
--
Gitblit v1.8.0