From 7d61f3da119960ca6298901fb5636ebd63b0a145 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Mon, 29 Apr 2024 15:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/scale/controller/ScalePublishController.java  | 3 ++-
 .../main/java/org/dromara/scale/domain/SysScalePublish.java   | 1 +
 .../java/org/dromara/scale/mapper/SysScalePublishMapper.java  | 2 +-
 .../org/dromara/scale/service/ISysScalePublishService.java    | 3 ++-
 .../scale/service/impl/SysScalePublishServiceImpl.java        | 4 ++--
 .../src/main/resources/mapper/scale/SysScalePublishMapper.xml | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
index b3a9390..a384ef5 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ScalePublishController.java
@@ -14,6 +14,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.scale.domain.SysScalePublish;
 import org.dromara.scale.domain.bo.BaseQueryBo;
 import org.dromara.scale.domain.bo.SysScalePublishBo;
 import org.dromara.scale.domain.vo.EvaluationVo;
@@ -74,7 +75,7 @@ public class ScalePublishController extends BaseController {
      */
     @SaCheckPermission("scale:publish:query")
     @GetMapping("/{batchNo}")
-    public R<SysScalePublishVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SysScalePublish> getInfo(@NotNull(message = "主键不能为空")
                                         @PathVariable Long batchNo) {
         return R.ok(sysScalePublishService.queryById(batchNo));
     }
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 e2a5c83..63ac579 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
@@ -74,6 +74,7 @@ public class SysScalePublish {
     //@TableField(fill = FieldFill.INSERT)
     private Long createBy;
 
+    private String createName;
     /**
      * 创建时间
      */
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 97bde2b..e0e9eb7 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,6 +27,6 @@ public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, S
 
     List<EvaluationVo> selectUndoneEvaluationVoList(@Param("batchNo") Long batchNo);
 
-    SysScalePublishVo selectPublishVoById(@Param("batchNo") Long batchNo);
+    SysScalePublish selectPublishById(@Param("batchNo") Long batchNo);
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
index 66c6093..394fcce 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
@@ -2,6 +2,7 @@ package org.dromara.scale.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.scale.domain.SysScalePublish;
 import org.dromara.scale.domain.bo.BaseQueryBo;
 import org.dromara.scale.domain.bo.SysScalePublishBo;
 import org.dromara.scale.domain.vo.EvaluationVo;
@@ -21,7 +22,7 @@ public interface ISysScalePublishService {
     /**
      * 查询量发布
      */
-    SysScalePublishVo queryById(Long batchNo);
+    SysScalePublish queryById(Long batchNo);
 
     /**
      * 查询量发布列表
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 126795a..8808055 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
@@ -60,8 +60,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
      * 查询量发布
      */
     @Override
-    public SysScalePublishVo queryById(Long batchNo) {
-        return baseMapper.selectPublishVoById(batchNo);
+    public SysScalePublish queryById(Long batchNo) {
+        return baseMapper.selectPublishById(batchNo);
     }
 
     /**
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 060eee3..47e6b76 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
@@ -55,7 +55,7 @@
         order by d.dept_id
     </select>
 
-    <select id="selectPublishVoById" resultType="org.dromara.scale.domain.vo.SysScalePublishVo">
+    <select id="selectPublishById" resultType="org.dromara.scale.domain.SysScalePublish">
         select sp.*,
                u.nick_name as `createName`
         from sys_scale_publish sp