lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

班组

Browse Source
This commit is contained in:
zt
2025-12-17 14:57:13 +08:00
parent 48117eb5d4
commit 86951d43b4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
View File

@ -81,6 +81,7 @@ public class BusProjectTeamMemberVo implements Serializable {
/** /**
* 头像 * 头像
*/ */
@Translation(type = TransConstant.OSS_ID_TO_URL)
private String avatar; private String avatar;
/** /**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -596,8 +596,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
return this.save(attendance); return this.save(attendance);
} }
//考勤机打卡会有历史记录，需要更新状态 //考勤机打卡会有历史记录，需要更新状态
if (CollectionUtil.isNotEmpty(outAttendances) && "1".equals(req.getSource())) { if (CollectionUtil.isNotEmpty(inAttendances) && "1".equals(req.getSource())) {
BusAttendance busAttendance = outAttendances.getFirst(); BusAttendance busAttendance = inAttendances.getFirst();
String oldStatus = busAttendance.getClockStatus(); String oldStatus = busAttendance.getClockStatus();
//更新打卡时间 //更新打卡时间
busAttendance.setClockTime(now); busAttendance.setClockTime(now);

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
View File

@ -513,6 +513,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
projectTeamMemberVo.setTypeOfWork(constructionUser.getTypeOfWork()); projectTeamMemberVo.setTypeOfWork(constructionUser.getTypeOfWork());
projectTeamMemberVo.setPhone(constructionUser.getPhone()); projectTeamMemberVo.setPhone(constructionUser.getPhone());
projectTeamMemberVo.setEntryDate(constructionUser.getEntryDate()); projectTeamMemberVo.setEntryDate(constructionUser.getEntryDate());
projectTeamMemberVo.setAvatar(constructionUser.getFacePic());
} }
projectTeamMemberVo.setMemberName(memberName); projectTeamMemberVo.setMemberName(memberName);
return projectTeamMemberVo; return projectTeamMemberVo;