From 4e48571d3217113f441567b9417d81b3933b0684 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:37:16 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.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/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 4c3521f..c2d8bc7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -77,7 +77,7 @@
queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empLeaveinfo.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
@@ -187,7 +187,7 @@
if (StringUtils.isNotBlank(list.get(7).toString())) {
leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
}
- leaveInfo.setLeaveType(list.get(8).toString());
+ leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
if (StringUtils.isNotBlank(list.get(9).toString())) {
leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
}
--
Gitblit v1.8.0