From 0eb627e6ce15f62b0b33e1ccac12d98d2146efd8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 17:59:13 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 b01e878..0bc3360 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
@@ -81,10 +81,13 @@
queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
- queryWrapper.like("a.EmpStatus", empContractinfo.getEmpStatus());
+ queryWrapper.in("a.deptName", empContractinfo.getDeptName());
}
if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -168,7 +171,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
if (list.size()==0){
continue;
@@ -207,7 +210,12 @@
if (StringUtils.isNotBlank(list.get(8).toString())) {
contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
}
- contractInfo.setContractStatus(list.get(9).toString());
+ //合同
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ contractInfo.setContractStatus(dicItem.getDicItemCode());
+ }
+
contractInfo.setTransactor(list.get(10).toString());
contractInfo.setRemark(list.get(11).toString());
--
Gitblit v1.8.0