Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

 package com.mortals.xhx.module.attendance.service;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
+import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
+
+import java.util.List;
+
 /**
 * AttendanceRecordDetailService
 *
@@ -10,5 +14,10 @@ import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
 * @date 2023-04-07
 */
 public interface AttendanceRecordDetailService extends ICRUDService<AttendanceRecordDetailEntity,Long>{
-
+    /**
+     * 查询每日打卡记录明细
+     * @param query
+     * @return
+     */
+    List<AttendanceRecordDetailEntity> getListByWhere(AttendanceRecordQuery query);
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.attendance.service.impl;
+import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,6 +7,9 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.attendance.dao.AttendanceRecordDetailDao;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
 import com.mortals.xhx.module.attendance.service.AttendanceRecordDetailService;
+
+import java.util.List;
+
 /**
 * AttendanceRecordDetailService
 * 考勤打卡记录详细信息 service实现
@@ -15,5 +19,9 @@ import com.mortals.xhx.module.attendance.service.AttendanceRecordDetailService;
 */
 @Service("attendanceRecordDetailService")
 public class AttendanceRecordDetailServiceImpl extends AbstractCRUDServiceImpl<AttendanceRecordDetailDao, AttendanceRecordDetailEntity, Long> implements AttendanceRecordDetailService {
-    
+
+    @Override
+    public List<AttendanceRecordDetailEntity> getListByWhere(AttendanceRecordQuery query) {
+        return dao.getListByWhere(query);
+    }
 }
\ No newline at end of file

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

@@ -279,13 +279,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
 
                     if (!ObjectUtils.isEmpty(attendanceSummary)) {
                         //todo 保存详细json信息到remark
-                        AttendanceRecordDetailQuery detailQuery = new AttendanceRecordDetailQuery();
+                        AttendanceRecordQuery detailQuery = new AttendanceRecordQuery();
                         detailQuery.setStaffId(staffStat.getStaffId());
                         //格式化年月日
                         String date = staffStat.getYear() + "-" + StrUtil.padPre(staffStat.getMonth() + "", 2, "0")+ "-"  + StrUtil.padPre(staffStat.getDay() + "", 2, "0");
-                        detailQuery.setCreateTimeStart(date);
-                        detailQuery.setCreateTimeEnd(date);
-                        List<AttendanceRecordDetailEntity> detailEntities = attendanceRecordDetailService.find(detailQuery);
+                        detailQuery.setAttendanceDateStart(date);
+                        detailQuery.setAttendanceDateEnd(date);
+                        List<AttendanceRecordDetailEntity> detailEntities = attendanceRecordDetailService.getListByWhere(detailQuery);
                         if (!ObjectUtils.isEmpty(detailEntities)) {
                             staffStat.setRemark(JSON.toJSONString(detailEntities));
                         }