考勤汇总时增加正常打卡时明细数据保存

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -263,6 +263,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                             continue;
                         }
                     }
+
                     AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
                     if (temp == null) {
                         AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity();
@@ -308,6 +309,28 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     staffStat.initAttrValue();
                     BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
                     staffStat.setAttendanceSummary("正常");
+
+                    //todo 保存详细json信息到remark
+                    AttendanceRecordQuery attendanceRecordQuery = new AttendanceRecordQuery();
+                    attendanceRecordQuery.setStaffId(item.getStaffId());
+                    attendanceRecordQuery.setAttendanceDateStart(query.getSummaryTime());
+                    attendanceRecordQuery.setAttendanceDateEnd(query.getSummaryTime());
+
+                    AttendanceRecordEntity recordEntity = recordService.selectOne(attendanceRecordQuery);
+                    if(!ObjectUtils.isEmpty(recordEntity)){
+                        AttendanceRecordQuery detailQuery = new AttendanceRecordQuery();
+                        detailQuery.setStaffId(item.getStaffId());
+                        detailQuery.setId(recordEntity.getId());
+                        //log.info("staffId:{},date:{}",staffStat.getStaffId(),date);
+                        detailQuery.setAttendanceDateStart(query.getSummaryTime());
+                        detailQuery.setAttendanceDateEnd(query.getSummaryTime());
+                        List<AttendanceRecordDetailEntity> detailEntities = attendanceRecordDetailService.getListByWhere(detailQuery);
+                        if (!ObjectUtils.isEmpty(detailEntities)) {
+                            //log.info("detailEntities size:{}",detailEntities.size());
+                            staffStat.setRemark(JSON.toJSONString(detailEntities));
+                        }
+                    }
+
                     AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
                     if (staffStatTemp != null) {
                         staffStat.setId(staffStatTemp.getId());