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

Compare commits

base: lcj:fbffc18a9f9911045885285ab0f87863d15c4e85
Branches Tags
lcj:dev lcj:prod
...
compare: lcj:f5d9cb7fc1007805871097b738509a47a7ab0fd1
Branches Tags
lcj:dev lcj:prod

2 Commits
fbffc18a9f ... f5d9cb7fc1

Author SHA1 Message Date
zt
f5d9cb7fc1 Merge remote-tracking branch 'origin/dev' into dev 2025-09-04 21:27:26 +08:00
zt
5b05d2eb40 版本号 2025-09-04 21:27:11 +08:00
2 changed files with 9 additions and 4 deletions
Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
View File

@ -156,4 +156,9 @@ public class BusReissueCardVo implements Serializable {
* 头像 * 头像
*/ */
private String avatar; private String avatar;
/**
* 补卡类型（1上班 2下班）
*/
private String reissueCardType;
} }

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

@ -595,8 +595,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
LambdaQueryWrapper<SubConstructionUser> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SubConstructionUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SubConstructionUser::getProjectId, dto.getProjectId()); wrapper.eq(SubConstructionUser::getProjectId, dto.getProjectId());
wrapper.in("1".equals(dto.getClockStatus()),SubConstructionUser::getId,attendanceUserIds); wrapper.in("1".equals(dto.getClockStatus()),SubConstructionUser::getSysUserId,attendanceUserIds);
wrapper.notIn("2".equals(dto.getClockStatus()),SubConstructionUser::getId,attendanceUserIds); wrapper.notIn("2".equals(dto.getClockStatus()),SubConstructionUser::getSysUserId,attendanceUserIds);
wrapper.eq(StrUtil.isNotBlank(dto.getTypeOfWork()),SubConstructionUser::getTypeOfWork,dto.getTypeOfWork()); wrapper.eq(StrUtil.isNotBlank(dto.getTypeOfWork()),SubConstructionUser::getTypeOfWork,dto.getTypeOfWork());
wrapper.eq(dto.getTeamId()!=null,SubConstructionUser::getTeamId,dto.getTeamId()); wrapper.eq(dto.getTeamId()!=null,SubConstructionUser::getTeamId,dto.getTeamId());
Page<SubConstructionUser> result = constructionUserService.page(pageQuery.build(), wrapper); Page<SubConstructionUser> result = constructionUserService.page(pageQuery.build(), wrapper);
@ -609,9 +609,9 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
SysUserVo sysUserVo = userService.selectUserById(constructionUser.getSysUserId()); SysUserVo sysUserVo = userService.selectUserById(constructionUser.getSysUserId());
attendanceUserVo.setUserId(sysUserVo.getUserId()); attendanceUserVo.setUserId(sysUserVo.getUserId());
attendanceUserVo.setNickName(sysUserVo.getNickName()); attendanceUserVo.setNickName(sysUserVo.getNickName());
if (sysUserVo.getAvatar() != null) {
SysOssVo byId = ossService.getById(sysUserVo.getAvatar()); SysOssVo byId = ossService.getById(sysUserVo.getAvatar());
if (byId != null) { attendanceUserVo.setAvatar(byId==null?null:byId.getUrl());
attendanceUserVo.setAvatar(byId.getUrl());
} }
attendanceUserVo.setTypeOfWork(attendanceUserVo.getTypeOfWork()); attendanceUserVo.setTypeOfWork(attendanceUserVo.getTypeOfWork());
attendanceUserVo.setTeamName(attendanceUserVo.getTeamName()); attendanceUserVo.setTeamName(attendanceUserVo.getTeamName());