From 6df90a9002c7b43b89910c4b605841ee4e98385a Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 11 Aug 2023 10:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/system/pojo/vo/EleEpdPqdVO.java  |  4 +-
 .../system/mapper/mapping/EleEpdPqdMapper.xml | 40 +++++++++++++++----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java
index b273fa839..53d8b5558 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java
@@ -42,10 +42,10 @@ public class EleEpdPqdVO implements Serializable {
     private String unit;
 
     @ApiModelProperty(value = "数据开始谐波次数")
-    private Integer harmStart;
+    private Double harmStart;
 
     @ApiModelProperty(value = "数据结束谐波次数")
-    private Integer harmEnd;
+    private Double harmEnd;
 
     @ApiModelProperty(value = "统计方式")
     private String statMethod;
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
index 59273ef1d..02cabcdd8 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
@@ -3,19 +3,45 @@
 <mapper namespace="com.njcn.system.mapper.EleEpdPqdMapper">
 
     <select id="page" resultType="EleEpdPqdVO">
-        SELECT
+        select
             sdd.Name dataTypeName,
-            ele_epd_pqd.*
-        FROM
+            ele_epd_pqd.Id,
+            ele_epd_pqd.Name,
+            ele_epd_pqd.Other_Name otherName,
+            ele_epd_pqd.Show_Name showName,
+            ele_epd_pqd.Sort,
+            ele_epd_pqd.`Type` ,
+            ele_epd_pqd.Phase ,
+            ele_epd_pqd.Unit ,
+            case when ele_epd_pqd.Harm_Start = 1 then 0.5 else ele_epd_pqd.Harm_Start end harmStart,
+            case when ele_epd_pqd.Harm_Start = 1 then 49.5 else ele_epd_pqd.Harm_End end harmEnd ,
+            ele_epd_pqd.Stat_Method statMethod,
+            ele_epd_pqd.Class_Id classId,
+            ele_epd_pqd.System_Type systemType,
+            ele_epd_pqd.data_type dataType,
+            ele_epd_pqd.tran_flag tranFlag,
+            ele_epd_pqd.tran_rule tranRule,
+            ele_epd_pqd.event_type eventType,
+            ele_epd_pqd.store_flag storeFlag,
+            ele_epd_pqd.cur_sts curSts,
+            ele_epd_pqd.ctl_sts ctlSts,
+            ele_epd_pqd.max_num maxNum,
+            ele_epd_pqd.min_num minNum,
+            ele_epd_pqd.set_value setValue,
+            ele_epd_pqd.strlen ,
+            ele_epd_pqd.default_value defaultValue,
+            ele_epd_pqd.resources_id resourcesId,
+            ele_epd_pqd.status
+        from
             ele_epd_pqd ele_epd_pqd
         left join
             sys_dict_data sdd
         on
             ele_epd_pqd.data_type = sdd.Id
-        <where>
-            1=1
-            and ${ew.sqlSegment}
-        </where>
+            <where>
+                1=1
+                and ${ew.sqlSegment}
+            </where>
     </select>
 
 </mapper>