diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java index 6249cef1..8d976760 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java @@ -21,5 +21,8 @@ public class LogStatisticsModelVO extends LogFormDO { @Schema(description = "提交范围") private String commitTimeRange; + + @Schema(description = "模版类型 1日报 2周报 3月报") + private Integer type; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java index 109e77e7..c0b27b7a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java @@ -118,6 +118,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService { List instanceDOS = logInstanceService.myManageLogInstanceByTimeRange(logFormDO.getId(), logRuleDO.getType(), thisDate); LogStatisticsModelVO vo = new LogStatisticsModelVO(); BeanUtil.copyProperties(logFormDO, vo); + vo.setType(logRuleDO.getType()); //查询下应该提交多少日志实例 - 直接通过模版id查询使用表 Integer num = Math.toIntExact(logUseMapper.selectCount(new LambdaQueryWrapper() .eq(LogUseDO::getFormId, logFormDO.getId()))); @@ -268,6 +269,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService { vo.setUnSubmittedNum(unSubmittedNum); vo.setLateNum(lateNum); } + vo.setType(logRuleDO.getType()); list.add(vo); } return list;