diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java index 1467be1..5b70de7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java @@ -9,9 +9,11 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.constant.RecordTypeConstants; +import org.dromara.system.domain.SysOssPerson; import org.dromara.system.domain.SysTextbookRecord; import org.dromara.system.domain.vo.StatisticNumVo; import org.dromara.system.domain.vo.SysTextbookRecordVo; +import org.dromara.system.mapper.SysOssPersonMapper; import org.dromara.system.mapper.SysTextbookRecordMapper; import org.dromara.system.service.ISysTextbookRecordService; import org.springframework.stereotype.Service; @@ -31,6 +33,8 @@ public class SysTextbookRecordServiceImpl implements ISysTextbookRecordService { private final SysTextbookRecordMapper baseMapper; + private final SysOssPersonMapper personMapper; + /** * 查询同步教材记录 * @@ -83,13 +87,13 @@ public class SysTextbookRecordServiceImpl implements ISysTextbookRecordService { collect.setValue(collectNum.intValue()); list.add(collect); - Long recordNum = baseMapper.selectCount(new LambdaQueryWrapper() - .eq(SysTextbookRecord::getRecordType, RecordTypeConstants.RECORD) - .eq(SysTextbookRecord::getCreateBy, userId)); - StatisticNumVo record = new StatisticNumVo(); - record.setName("record"); - record.setValue(recordNum.intValue()); - list.add(record); + Long uploadNum = personMapper.selectCount(new LambdaQueryWrapper() + .eq(SysOssPerson::getDelFlag, 0) + .eq(SysOssPerson::getCreateBy, userId)); + StatisticNumVo upload = new StatisticNumVo(); + upload.setName("upload"); + upload.setValue(uploadNum.intValue()); + list.add(upload); return list; } }