修改查询考勤接口bug

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<CClockingInVo.ClockRecord> clockRecords = clockingInDao.queryByMemberId(memberIdList);
         for (CClockingInVo.ClockingInInfo clockingInInfo2 : list) {
-            for (CClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) {
+            for (CClockingInVo.ClockRecord record : clockRecords) {
-                for (CClockingInVo.ClockRecord record : clockRecords) {
+                if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime())) {
-                    if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime()) && clockRecord.getMemberId().equals(record.getMemberId())) {
+                    for (CClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) {
-                        clockRecord.setCheckerId(record.getCheckerId());
+                        if (clockRecord.getMemberId().equals(record.getMemberId())) {
-                        clockRecord.setCheckerName(record.getCheckerName());
+                            BeanUtil.copyProperties(record,clockRecord);
+                        }
                     }
                 }
             }