From ecddd117512728715a72841b4ca37d492680e651 Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 20 May 2024 14:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E4=BD=93=E6=8A=A5=E5=91=8A=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysScalePublishServiceImpl.java | 14 ++++++-------- .../resources/mapper/scale/StatisticMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index 2771c6b..0a5aeec 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -278,6 +278,11 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { if (batchNo == null) { throw new ServerException("场次Id不能为空"); } + //查询前置，用来判断 + int completeNum = recordMapper.selectCompleteNumByBatchNo(batchNo); + if (completeNum == 0) { + throw new ServerException("本场次暂无完成的量测记录，请测评后再导出"); + } PublishRecordWordData wordData = new PublishRecordWordData(); SysScalePublishVo publishVo = baseMapper.selectVoById(batchNo); @@ -309,7 +314,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { .series("", new Integer[]{maleNum, femaleNum}).create(); wordData.setSexChart(sexChart); - int completeNum = recordMapper.selectCompleteNumByBatchNo(batchNo); + int undoneNum = recordMapper.selectUndoneNumByBatchNo(batchNo); int recordNum = completeNum + undoneNum; int completePercent = processHalfUpPercent(completeNum, recordNum); @@ -408,11 +413,4 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { .divide(BigDecimal.valueOf(total), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).intValue(); } - - public static void main(String[] args) { - int i = BigDecimal.valueOf(0) - .divide(BigDecimal.valueOf(10), 2, RoundingMode.HALF_UP) - .multiply(BigDecimal.valueOf(100)).intValue(); - System.out.println(i); - } } 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 ad9b641..0169c2f 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 @@ -86,8 +86,8 @@ select scale_name as `name`, publish_nums as `value` from sys_scale - where status = 1 - order by publish_nums desc + where status = 1 and publish_nums >0 + order by publish_nums