From 00c11e16ac27b31c8d29b3c64afa88082010c33e Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 17 五月 2021 22:37:08 +0800
Subject: [PATCH] 合同信息增加到处备注
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..3341240 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
@@ -74,7 +74,7 @@
queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
+ queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
}
if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
@@ -82,9 +82,9 @@
if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
}
- if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.in("a.deptName", empContractinfo.getDeptName());
- }
+ // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ // queryWrapper.in("a.deptName", empContractinfo.getDeptName());
+ // }
if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
}
@@ -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