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

bug修改

Browse Source
This commit is contained in:
zt
2025-10-10 21:45:08 +08:00
parent 6c96c6f534
commit 11b5908d8c
2 changed files with 3 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/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
View File

@ -143,6 +143,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
// 获取施工人员总数 // 获取施工人员总数
Long count = constructionUserService.lambdaQuery() Long count = constructionUserService.lambdaQuery()
.eq(SubConstructionUser::getProjectId, projectId) .eq(SubConstructionUser::getProjectId, projectId)
.eq(SubConstructionUser::getUserRole, "0")
.isNotNull(SubConstructionUser::getTeamId) .isNotNull(SubConstructionUser::getTeamId)
.count(); .count();
BigDecimal countDec = BigDecimal.valueOf(count); BigDecimal countDec = BigDecimal.valueOf(count);

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java
View File

@ -128,8 +128,8 @@ public class BusAttendanceAppController extends BaseController {
* 获取用户打卡异常记录 * 获取用户打卡异常记录
*/ */
@GetMapping("/getAbnormalAttendance/{projectId}") @GetMapping("/getAbnormalAttendance/{projectId}")
public R<List<BusAttendanceVo>> getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId){ public TableDataInfo<BusAttendanceVo> getAbnormalAttendance(@NotNull @PathVariable("projectId") Long projectId, PageQuery pageQuery){
return R.ok(attendanceService.getAbnormalAttendance(projectId)); return attendanceService.getAbnormalAttendance(projectId,pageQuery);
} }
/** /**