ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

我管理的/我需要填写的 列表返回模版类型 1日报 2周报

Browse Source
This commit is contained in:
aikai 2024-04-15 14:02:48 +08:00
parent 897d15708d
commit d2e460b56d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java
View File

@ -21,5 +21,8 @@ public class LogStatisticsModelVO extends LogFormDO {
@Schema(description = "提交范围") @Schema(description = "提交范围")
private String commitTimeRange; private String commitTimeRange;
@Schema(description = "模版类型 1日报 2周报 3月报")
private Integer type;
} }

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
View File

@ -118,6 +118,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
List<LogInstanceDO> instanceDOS = logInstanceService.myManageLogInstanceByTimeRange(logFormDO.getId(), logRuleDO.getType(), thisDate); List<LogInstanceDO> instanceDOS = logInstanceService.myManageLogInstanceByTimeRange(logFormDO.getId(), logRuleDO.getType(), thisDate);
LogStatisticsModelVO vo = new LogStatisticsModelVO(); LogStatisticsModelVO vo = new LogStatisticsModelVO();
BeanUtil.copyProperties(logFormDO, vo); BeanUtil.copyProperties(logFormDO, vo);
vo.setType(logRuleDO.getType());
//查询下应该提交多少日志实例 - 直接通过模版id查询使用表 //查询下应该提交多少日志实例 - 直接通过模版id查询使用表
Integer num = Math.toIntExact(logUseMapper.selectCount(new LambdaQueryWrapper<LogUseDO>() Integer num = Math.toIntExact(logUseMapper.selectCount(new LambdaQueryWrapper<LogUseDO>()
.eq(LogUseDO::getFormId, logFormDO.getId()))); .eq(LogUseDO::getFormId, logFormDO.getId())));
@ -268,6 +269,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
vo.setUnSubmittedNum(unSubmittedNum); vo.setUnSubmittedNum(unSubmittedNum);
vo.setLateNum(lateNum); vo.setLateNum(lateNum);
} }
vo.setType(logRuleDO.getType());
list.add(vo); list.add(vo);
} }
return list; return list;