From b05caaeda58437df9bb3f5f48b593cc0abd0fe8d Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 21 May 2024 11:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B7=BB=E5=8A=A0=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=BA=BA=E6=95=B0=EF=BC=9B=E6=A1=A3=E6=A1=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/scale/domain/SysScalePublish.java | 5 +++++ .../src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java | 2 ++ .../java/org/dromara/scale/domain/vo/SysScalePublishVo.java | 5 +++++ .../org/dromara/scale/service/impl/ArchiveServiceImpl.java | 1 + 4 files changed, 13 insertions(+) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java index db8df3b..32732b4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java @@ -63,6 +63,11 @@ public class SysScalePublish { */ private Integer totalNum; + /** + * 测评完成人数 + */ + private Integer completeNum; + /** * 截止日期 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java index c574ee0..b50c6b6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ArchiveVo.java @@ -50,5 +50,7 @@ public class ArchiveVo implements Serializable { */ private String address; + private String userType; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java index 8f471fd..a47d226 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java @@ -50,6 +50,11 @@ public class SysScalePublishVo implements Serializable { * 测评总人数 */ private Integer totalNum; + + /** + * 测评完成人数 + */ + private Integer completeNum; /** * 截止日期 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java index 7014447..f2a7954 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java @@ -29,6 +29,7 @@ public class ArchiveServiceImpl implements IArchiveService { @Override public TableDataInfo queryPageList(ArchiveVo vo, PageQuery pageQuery) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(ArchiveVo::getUserType, "student"); lqw.like(StringUtils.isNotEmpty(vo.getNickName()), ArchiveVo::getNickName, vo.getNickName()); lqw.like(StringUtils.isNotEmpty(vo.getPhonenumber()), ArchiveVo::getPhonenumber, vo.getPhonenumber()); Page result = archiveMapper.selectArchiveVoPage(pageQuery.build(), lqw);