From 5efb7cff42590529ebba5d57b6bf7bb0057d3eb2 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 31 Aug 2021 15:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/common/service/ClockingInService.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/com/ccsens/common/service/ClockingInService.java b/common/src/main/java/com/ccsens/common/service/ClockingInService.java index bf1d3ee3..c81c5daa 100644 --- a/common/src/main/java/com/ccsens/common/service/ClockingInService.java +++ b/common/src/main/java/com/ccsens/common/service/ClockingInService.java @@ -90,7 +90,7 @@ public class ClockingInService implements IClockingInService { for (CClockingInVo.ClockingInInfo clockingInInfo : list) { for (CClockingInVo.ClockRecord clockRecord : clockRecordList) { CClockingInVo.ClockRecord filterRecord = new CClockingInVo.ClockRecord(); - filterRecord.setMemberId(clockRecord.getId()); + filterRecord.setMemberId(clockRecord.getMemberId()); filterRecord.setMemberName(clockRecord.getMemberName()); clockingInInfo.getRecordList().add(filterRecord); } @@ -100,11 +100,12 @@ public class ClockingInService implements IClockingInService { //查询所有成员打卡记录 List clockRecords = clockingInDao.queryByMemberId(memberIdList); for (CClockingInVo.ClockingInInfo clockingInInfo2 : list) { - for (CClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) { - for (CClockingInVo.ClockRecord record : clockRecords) { - if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime()) && clockRecord.getMemberId().equals(record.getMemberId())) { - clockRecord.setCheckerId(record.getCheckerId()); - clockRecord.setCheckerName(record.getCheckerName()); + for (CClockingInVo.ClockRecord record : clockRecords) { + if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime())) { + for (CClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) { + if (clockRecord.getMemberId().equals(record.getMemberId())) { + BeanUtil.copyProperties(record,clockRecord); + } } } }