hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打卡详情调整

Browse Source
This commit is contained in:
andy 2026-03-18 08:55:47 +08:00
parent 7393d00710
commit 06ee3738f6
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
evo-admin/src/main/java/com/evo/attendance/domain/vo/RzAttendanceDetailTimeLineVO.java
View File

@ -27,6 +27,8 @@ public class RzAttendanceDetailTimeLineVO {
String size = "large";
String delFlag;
public RzAttendanceDetailTimeLineVO(String content, String photo, String timestamp, String delFlag) {
this.content = content;
this.photo = photo;
@ -36,7 +38,7 @@ public class RzAttendanceDetailTimeLineVO {
this.icon = timeLine.icon;
}
enum TimeLineEnum{
public enum TimeLineEnum{
UP("上班", "primary","el-icon-caret-top"),
OVERTIME("加班", "success","el-icon-plus"),
DOWN("下班", "warning","el-icon-caret-bottom"),
@ -46,8 +48,8 @@ public class RzAttendanceDetailTimeLineVO {
;
String typeWork;
String type;
String icon;
public String type;
public String icon;
TimeLineEnum(String typeWork, String type, String icon) {
this.typeWork = typeWork;

8
evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceDetailServiceImpl.java
View File

@ -134,7 +134,13 @@ public class RzAttendanceDetailServiceImpl extends ServiceImpl<RzAttendanceDetai
@Override
public List<RzAttendanceDetailTimeLineVO> selectListByAttendanceId(Long attId) {
return getBaseMapper().selectListByAttendanceId(attId);
List<RzAttendanceDetailTimeLineVO> result = getBaseMapper().selectListByAttendanceId(attId);
result.stream().forEach(data->{
RzAttendanceDetailTimeLineVO.TimeLineEnum timeLine = RzAttendanceDetailTimeLineVO.TimeLineEnum.get(data.getContent(), data.getDelFlag());
data.setType(timeLine.type);
data.setIcon(timeLine.icon);
});
return result;
//
// return getBaseMapper().selectListByAttendanceId(new LambdaQueryWrapper<RzAttendanceDetail>().eq(RzAttendanceDetail::getAttendanceId, attId)
// .select(RzAttendanceDetail::getButtonType, RzAttendanceDetail::getPhoto, RzAttendanceDetail::getDateTime,RzAttendanceDetail::getDelFlag)).stream().map(data ->{

2
evo-admin/src/main/resources/mapper/attendance/RzAttendanceDetailMapper.xml
View File

@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectListByAttendanceId" resultType="com.evo.attendance.domain.vo.RzAttendanceDetailTimeLineVO">
select ad.button_type, ad.date_time, ad.del_flag,ap.photo
select ad.button_type as content, DATE_FORMAT(ad.date_time,"%Y-%m-%d %H:%i:%s") as `timestamp`, ad.del_flag as delFlag , ap.photo
from rz_attendance_detail ad
left join rz_attendance_photo ap on ap.attendance_detail_id = ad.id
where ad.attendance_id = #{attId}