From 1c6ed99cf3f49fadbeb09b3a4a89b57382089464 Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 29 Apr 2024 15:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E6=91=98=E8=A6=81=EF=BC=9B?= =?UTF-8?q?=E6=B5=8B=E8=AF=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=9B?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/scale/domain/vo/SysScalePublishVo.java | 4 ++++ .../dromara/scale/mapper/SysScalePublishMapper.java | 2 ++ .../service/impl/SysEvaluationRecordServiceImpl.java | 12 +++++++++++- .../service/impl/SysScalePublishServiceImpl.java | 7 ++----- .../resources/mapper/scale/SysScalePublishMapper.xml | 7 +++++++ 5 files changed, 26 insertions(+), 6 deletions(-) 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 cc449e5..b3f0305 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 @@ -67,6 +67,10 @@ public class SysScalePublishVo implements Serializable { @ExcelProperty(value = "0:不允许，1：允许") private Integer allowQueryResult; + private Long create_by; + + private String createName; + private List scaleList; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java index 9b6e5c1..97bde2b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java @@ -27,4 +27,6 @@ public interface SysScalePublishMapper extends BaseMapperPlus selectUndoneEvaluationVoList(@Param("batchNo") Long batchNo); + SysScalePublishVo selectPublishVoById(@Param("batchNo") Long batchNo); + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java index c73a4c9..3ec119f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.io.IOException; +import java.rmi.ServerException; import java.util.ArrayList; import java.util.List; @@ -123,13 +124,22 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi @Override public XWPFTemplate getWordTemplate(BaseQueryBo bo) throws IOException { Long userId = bo.getUserId(); + if (userId == null) { + throw new ServerException("用户ID不能为空"); + } Long recordId = bo.getRecordId(); + if (recordId == null) { + throw new ServerException("记录ID不能为空"); + } Long scaleId = bo.getScaleId(); + if (scaleId == null) { + throw new ServerException("量表ID不能为空"); + } EvaluationEecordWordData wordData = new EvaluationEecordWordData(); SysUserVo user = userMapper.selectUserById(userId); wordData.setNickName(user.getNickName()); wordData.setDeptName(user.getDept().getDeptName()); - wordData.setSex("1".equals(user.getSex()) ? "男" : "女"); + wordData.setSex("0".equals(user.getSex()) ? "男" : "女"); SysScaleVo scale = scaleMapper.selectVoById(scaleId); wordData.setScaleName(scale.getScaleName()); wordData.setScaleDetails(scale.getScaleDetails()); 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 fd7c306..126795a 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 @@ -61,7 +61,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { */ @Override public SysScalePublishVo queryById(Long batchNo) { - return baseMapper.selectVoById(batchNo); + return baseMapper.selectPublishVoById(batchNo); } /** @@ -84,13 +84,10 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { } private LambdaQueryWrapper buildQueryWrapper(SysScalePublishBo bo) { - //Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); -// lqw.eq(StringUtils.isNotBlank(bo.getScaleIds()), SysScalePublish::getScaleIds, bo.getScaleIds()); lqw.like(StringUtils.isNotBlank(bo.getScaleNames()), SysScalePublish::getScaleNames, bo.getScaleNames()); lqw.like(StringUtils.isNotBlank(bo.getSessionName()), SysScalePublish::getSessionName, bo.getSessionName()); -// lqw.(StringUtils.isNotBlank(bo.getDeptIds()), SysScalePublish::getSessionName, bo.getSessionName()); -// lqw.eq(bo.getExpireTime() != null, SysScalePublish::getExpireTime, bo.getExpireTime()); + lqw.like(StringUtils.isNotBlank(bo.getDeptNames()), SysScalePublish::getDeptNames, bo.getDeptNames()); lqw.eq(bo.getStatus() != null, SysScalePublish::getStatus, bo.getStatus()); lqw.eq(bo.getAllowQueryResult() != null, SysScalePublish::getAllowQueryResult, bo.getAllowQueryResult()); return lqw; diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml index b7e0777..67d5004 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml @@ -54,4 +54,11 @@ and er.status = 0 order by d.dept_id + +