diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java index 8c15d73..282d92e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java @@ -122,8 +122,8 @@ public class StatisticController extends BaseController { * 获取量表发布次数 */ @GetMapping("/scale/publish/num") - public R> getPublishNum() { - return R.ok(statisticService.getScalePublishNum()); + public R> getPublishNum(Integer limitNum) { + return R.ok(statisticService.getScalePublishNum(limitNum)); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java index dbcced1..a357c73 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java @@ -32,7 +32,7 @@ public interface StatisticMapper { int selectWarnNum(); int selectInterveneNum(); - List selectScalePublishNum(); + List selectScalePublishNum(int limitNum); List selectPublishNumByGrade(@Param("startTime") String startTime); List selectEvaluationNumByGrade(@Param("startTime") String startTime); List selectConclusion(@Param("startTime") String startTime); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java index 3cd526a..e551ae6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java @@ -30,7 +30,7 @@ public interface IStatisticService { int getEvaluationNum(); int getWarnNum(); int getInterveneNum(); - List getScalePublishNum(); + List getScalePublishNum(Integer limitNum); List getPublishAndEvaluationNumByGrade(String select); List getConclusion(String select); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java index f00d9c9..f0424f1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysInterveneRecordService.java @@ -41,10 +41,6 @@ public interface ISysInterveneRecordService { */ Boolean insertByBo(SysInterveneRecordBo bo); - /** - * 修改干预记录 - */ - Boolean updateByBo(SysInterveneRecordBo bo); List queryInterveneTimeList(Long userId); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java index 046a297..6452763 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java @@ -196,8 +196,8 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public List getScalePublishNum() { - return statisticMapper.selectScalePublishNum(); + public List getScalePublishNum(Integer limitNum) { + return statisticMapper.selectScalePublishNum(limitNum); } @Override diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index d850711..2ee5bac 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -1,6 +1,5 @@ package org.dromara.scale.service.impl; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -60,16 +59,13 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService .eq(SysInterveneRecord::getUserId, userId) .orderByDesc(SysInterveneRecord::getCreateTime) ); - if (ObjectUtil.isNotEmpty(result.getRecords())) { - for (SysInterveneRecordVo record : result.getRecords()) { - SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo()); - record.setSessionName(sysScalePublish.getSessionName()); - SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper() - //.select(SysWarnRecord::getNote) - .eq(SysWarnRecord::getBatchNo, record.getBatchNo()) - .eq(SysWarnRecord::getUserId, record.getUserId())); - record.setNote(warn.getNote()); - } + for (SysInterveneRecordVo record : result.getRecords()) { + SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo()); + record.setSessionName(sysScalePublish.getSessionName()); + SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper() + .eq(SysWarnRecord::getBatchNo, record.getBatchNo()) + .eq(SysWarnRecord::getUserId, record.getUserId())); + record.setNote(warn.getNote()); } return TableDataInfo.build(result); } @@ -122,9 +118,7 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService throw new ServiceException("此用户状态为无需干预,无法提交干预记录"); } SysInterveneRecord add = MapstructUtils.convert(bo, SysInterveneRecord.class); - //add.setCreateTime(new Date()); add.setCounselorId(loginUser.getUserId()); - validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setInterveneId(add.getInterveneId()); @@ -139,23 +133,6 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService return flag; } - /** - * 修改干预记录 - */ - @Override - public Boolean updateByBo(SysInterveneRecordBo bo) { - SysInterveneRecord update = MapstructUtils.convert(bo, SysInterveneRecord.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysInterveneRecord entity) { - //TODO 做一些数据校验,如唯一约束 - } - @Override public List queryInterveneTimeList(Long userId) { List warn = warnMapper.selectTimeList(userId); diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml index 984731d..12b9d1d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml @@ -96,6 +96,7 @@ where status = 1 and publish_nums > 0 order by publish_nums + limit #{limitNum}