diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceRecordDetailService.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceRecordDetailService.java index 495682c761f8dccbae242f73828e313a6b6c7c4e..e17fc1346e37cbe74403ee73e1ef64de04360c27 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceRecordDetailService.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceRecordDetailService.java @@ -1,6 +1,10 @@ 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 diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordDetailServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordDetailServiceImpl.java index 1138614cdbe2370626c4cd897d05f2fe3b8253b6..2d7589866488ae33847a829f647e4d1c5ba2b86f 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordDetailServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordDetailServiceImpl.java @@ -1,4 +1,5 @@ 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 diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java index 88c6b44cd5663a0d892c9ec09c4253014b8af626..d98fe071dc5e3f50e5f4e994e71397bba96cc5cb 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java +++ b/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淇℃伅鍒皉emark - 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)); }