From cfcfbf068acf9b9d509a99498346dcbcf101cdf9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 14 十一月 2024 16:37:46 +0800
Subject: [PATCH] 白名单基础增删改查

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
index 810fadd..8220c64 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
@@ -7,13 +7,14 @@
     <resultMap type="WorkOrderWhite" id="WorkOrderWhiteResult">
         <result property="id"    column="id"    />
         <result property="serialNumber"    column="serial_number"    />
-        <result property="pointName"    column="point_name"    />
+        <result property="pointName"    column="pointName"    />
+        <result property="errorType"    column="error_type"    />
         <result property="createBy"    column="create_by"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectWorkOrderWhiteVo">
-        select id, serial_number, point_name, create_by, remark from t_work_order_white
+        select id, serial_number, error_type, create_by, remark from t_work_order_white
     </sql>
     <update id="updateBySerialNumber">
         update t_work_order_white
@@ -26,11 +27,21 @@
     </update>
 
     <select id="page" parameterType="com.ycl.platform.domain.query.WorkOrderWhiteQuery" resultMap="WorkOrderWhiteResult">
-        <include refid="selectWorkOrderWhiteVo"/>
+        select wow.id, wow.serial_number,m.name as pointName, wow.error_type, wow.create_by, wow.remark
+        from t_work_order_white wow
+        left join t_monitor m on wow.serial_number = m.serial_number
         <where>
             <if test="query.keyword != null  and query.keyword != ''">
             and (serial_number like concat('%',#{query.keyword},'%') or point_name like concat('%', #{query.keyword}, '%'))
             </if>
+        </where>
+    </select>
+    <select id="getById"  resultMap="WorkOrderWhiteResult">
+        select wow.id, wow.serial_number,m.name as pointName, wow.error_type, wow.create_by, wow.remark
+        from t_work_order_white wow
+        left join t_monitor m on wow.serial_number = m.serial_number
+        <where>
+            wow.id = #{id}
         </where>
     </select>
     <select id="selectBySerialNumber" resultType="com.ycl.platform.domain.entity.WorkOrderWhite">
@@ -45,13 +56,13 @@
         insert into t_work_order_white
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
-            <if test="pointName != null and pointName != ''">point_name,</if>
+            <if test="errorType != null and errorType != ''">error_type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
-            <if test="pointName != null and pointName != ''">#{pointName},</if>
+            <if test="errorType != null and errorType != ''">#{errorType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="remark != null">#{remark},</if>
          </trim>

--
Gitblit v1.8.0