by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

详情返回无打卡日期bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
dy 2025-07-27 17:07:58 +08:00
parent dd733fe5e2
commit eb7d29640b
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java
View File

@ -59,10 +59,6 @@ public class AttendanceClockDate extends TenantEntity {
*/ */
private String reason; private String reason;
/**
* 创建人
*/
private Long createdBy;
} }

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java
View File

@ -58,10 +58,6 @@ public class AttendanceClockDateBo extends BaseEntity {
*/ */
private String reason; private String reason;
/**
* 创建人
*/
private Long createdBy;
} }

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java
View File

@ -73,11 +73,6 @@ public class AttendanceClockDateVo implements Serializable {
@ExcelProperty(value = "必须/无需打卡原因") @ExcelProperty(value = "必须/无需打卡原因")
private String reason; private String reason;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
private Long createdBy;
} }

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java
View File

@ -1,15 +1,12 @@
package org.dromara.property.domain.vo; package org.dromara.property.domain.vo;
import org.dromara.property.domain.AttendanceGroup; import org.dromara.property.domain.*;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.property.domain.AttendanceShift;
import org.dromara.property.domain.AttendanceWeekSet;
import org.dromara.property.domain.AttendanceWeeksetShift;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -62,5 +59,7 @@ public class AttendanceGroupVo implements Serializable {
List<AttendanceShift> attendanceList; List<AttendanceShift> attendanceList;
List<AttendanceClockDate> clockDateList;
} }

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java
View File

@ -80,7 +80,7 @@ public class AttendanceClockDateServiceImpl implements IAttendanceClockDateServi
lqw.eq(bo.getStartDate() != null, AttendanceClockDate::getStartDate, bo.getStartDate()); lqw.eq(bo.getStartDate() != null, AttendanceClockDate::getStartDate, bo.getStartDate());
lqw.eq(bo.getEndDate() != null, AttendanceClockDate::getEndDate, bo.getEndDate()); lqw.eq(bo.getEndDate() != null, AttendanceClockDate::getEndDate, bo.getEndDate());
lqw.eq(StringUtils.isNotBlank(bo.getReason()), AttendanceClockDate::getReason, bo.getReason()); lqw.eq(StringUtils.isNotBlank(bo.getReason()), AttendanceClockDate::getReason, bo.getReason());
lqw.eq(bo.getCreatedBy() != null, AttendanceClockDate::getCreatedBy, bo.getCreatedBy()); // lqw.eq(bo.getCreateBy() != null, AttendanceClockDate::getCreateBy, bo.getCreateBy());
return lqw; return lqw;
} }

4
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
View File

@ -91,6 +91,10 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
vo.setAttendanceList(shifts); vo.setAttendanceList(shifts);
} }
//根据id查询attendance_clock_date表
List<AttendanceClockDate> clockDates = attendanceClockDateMapper.selectList(Wrappers.<AttendanceClockDate>lambdaQuery().eq(AttendanceClockDate::getGroupId, id));
vo.setClockDateList(clockDates);
return vo; return vo;
} }