From 567db6d50ceb04b40b7f1753c7e3ca661fff4f83 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 11:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataReportingServiceImpl.java | 2 +- .../src/main/resources/mapper/CustomerStaffDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index ff71165a8a..6d76dfd175 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -124,7 +124,7 @@ public class DataReportingServiceImpl implements DataReportingService { st.setUpdateTime(dto.getUpdatedTime()); st.setIdCard(dto.getIdCard()); st.setStaffId(dto.getUserId()); - st.setIsLeave("fulltime".equals(dto.getWorkType()) ? "N" : "Y"); + st.setIsLeave("enable".equals(dto.getEnableFlag()) ? "N" : "Y"); if ("Y".equals(st.getIsLeave())) { st.setLeaveDate(DateUtils.integrate(dto.getUpdatedTime(), DateUtils.DATE_PATTERN)); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 31a3198808..9bc4f7ea33 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -465,7 +465,7 @@ mobile phonenumber, IF(work_type = 'fulltime', '01', '02') userType, updated_time updateTime, - IF(work_type = 'fulltime', 'N', 'Y') isLeave, + IF(enable_flag = 'enable', 'N', 'Y') isLeave, DATE_FORMAT(updated_time,'%Y-%m-%d') AS date FROM customer_staff