From fda3f979616e3c5e26993ec7033900cd188ea296 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 06663cc..546b906 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -88,7 +88,7 @@
queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
}
if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
@@ -177,7 +177,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
if (list.size()==0){
continue;
@@ -206,7 +206,14 @@
if (StringUtils.isNotBlank(list.get(5).toString())) {
empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
}
- empLabortrouble.setArbitrationType(list.get(6).toString());
+
+ //仲裁类型
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
+ }
+
+
empLabortrouble.setArbitrationReason(list.get(7).toString());
empLabortrouble.setReporter(list.get(8).toString());
empLabortrouble.setRemark(list.get(9).toString());
--
Gitblit v1.8.0