From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null，为前端添加数据默认为0
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
index 7573a34..cc93123 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
@@ -3,17 +3,18 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.WorkOrderWhiteMapper">
-
+
<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
@@ -25,17 +26,36 @@
where serial_number = #{serialNumber}
</update>
- <select id="page" parameterType="Long" resultMap="WorkOrderWhiteResult">
- <include refid="selectWorkOrderWhiteVo"/>
+ <select id="page" parameterType="com.ycl.platform.domain.query.WorkOrderWhiteQuery" 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>
- <if test="query.serialNumber != null and query.serialNumber != ''"> and serial_number = #{query.serialNumber}</if>
- <if test="query.pointName != null and query.pointName != ''"> and point_name like concat('%', #{query.pointName}, '%')</if>
+ <if test="query.keyword != null and query.keyword != ''">
+ and (wow.serial_number like concat('%',#{query.keyword},'%') or m.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="whiteExport" resultType="com.ycl.platform.domain.excel.WorkOrderWhiteExport">
+ 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
+ </select>
+
<select id="selectBySerialNumber" resultType="com.ycl.platform.domain.entity.WorkOrderWhite">
<include refid="selectWorkOrderWhiteVo"/>
where serial_number = #{serialNumber}
</select>
+
<select id="selectList" resultType="com.ycl.platform.domain.entity.WorkOrderWhite">
<include refid="selectWorkOrderWhiteVo"/>
</select>
@@ -44,20 +64,20 @@
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>
</insert>
<delete id="deleteWorkOrderWhiteByIds" parameterType="String">
- delete from t_work_order_white where id in
+ delete from t_work_order_white where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@@ -68,4 +88,26 @@
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+
+ <update id="updateBatch">
+ <foreach collection="whiteList" separator=";" item="white">
+ UPDATE t_work_order_white
+ SET
+ <if test="white.errorType != null and white.errorType !=''">
+ error_type = #{white.errorType},
+ </if>
+ remark = #{white.remark}
+ WHERE serial_number = #{white.serialNumber}
+ </foreach>
+ </update>
+
+ <insert id="insertBatch">
+ insert into t_work_order_white (serial_number,error_type,remark) values
+ <foreach item="white" collection="whiteList" separator=",">
+ (#{white.serialNumber},#{white.errorType},#{white.remark})
+ </foreach>
+ </insert>
+ <delete id="deleteAll">
+ delete from t_work_order_white;
+ </delete>
+</mapper>
--
Gitblit v1.8.0