From 41afb20b6b3776f1242ce2aba29d8e51fa8110d6 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 17 五月 2025 09:45:52 +0800
Subject: [PATCH] -
---
billion-main/src/main/resources/mapper/da/DaTightenCollectionMapper.xml | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/billion-main/src/main/resources/mapper/da/DaTightenCollectionMapper.xml b/billion-main/src/main/resources/mapper/da/DaTightenCollectionMapper.xml
index dbd33c4..358010c 100644
--- a/billion-main/src/main/resources/mapper/da/DaTightenCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/da/DaTightenCollectionMapper.xml
@@ -8,29 +8,24 @@
<result property="id" column="id" />
<result property="sfcCode" column="sfc_code" />
<result property="locationCode" column="location_code" />
- <result property="paramSetCode" column="param_set_code" />
<result property="paramSetName" column="param_set_name" />
<result property="torque" column="torque" />
- <result property="torqueStatus" column="torque_status" />
<result property="angle" column="angle" />
<result property="angleStatus" column="angle_status" />
<result property="collectTime" column="collect_time" />
</resultMap>
<sql id="selectDaTightenCollectionVo">
- select id, sfc_code, location_code, param_set_code, param_set_name, torque, torque_status, angle, angle_status, collect_time from da_tighten_collection
+ select id, sfc_code, location_code, param_set_name, torque, angle, angle_status, collect_time from da_tighten_collection
</sql>
<select id="selectDaTightenCollectionList" parameterType="DaTightenCollection" resultMap="DaTightenCollectionResult">
<include refid="selectDaTightenCollectionVo"/>
<where>
<if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
- <if test="locationCode != null and locationCode != ''"> and location_code like concat('%', #{locationCode}, '%')</if>
- <if test="paramSetCode != null and paramSetCode != ''"> and param_set_code like concat('%', #{paramSetCode}, '%')</if>
+ <if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="paramSetName != null and paramSetName != ''"> and param_set_name like concat('%', #{paramSetName}, '%')</if>
- <if test="torqueStatus != null and torqueStatus != ''"> and torque_status = #{torqueStatus}</if>
<if test="angleStatus != null and angleStatus != ''"> and angle_status = #{angleStatus}</if>
- <if test="startTime != null"> and collect_time BETWEEN #{startTime} and #{stopTime}</if>
</where>
</select>
@@ -38,27 +33,25 @@
<include refid="selectDaTightenCollectionVo"/>
where id = #{id}
</select>
-
- <insert id="insertDaTightenCollection" parameterType="DaTightenCollection" useGeneratedKeys="true" keyProperty="id">
+
+ <insert id="insertDaTightenCollection" parameterType="DaTightenCollection">
insert into da_tighten_collection
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
<if test="sfcCode != null">sfc_code,</if>
<if test="locationCode != null">location_code,</if>
- <if test="paramSetCode != null">param_set_code,</if>
<if test="paramSetName != null">param_set_name,</if>
<if test="torque != null">torque,</if>
- <if test="torqueStatus != null">torque_status,</if>
<if test="angle != null">angle,</if>
<if test="angleStatus != null">angle_status,</if>
<if test="collectTime != null">collect_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
<if test="sfcCode != null">#{sfcCode},</if>
<if test="locationCode != null">#{locationCode},</if>
- <if test="paramSetCode != null">#{paramSetCode},</if>
<if test="paramSetName != null">#{paramSetName},</if>
<if test="torque != null">#{torque},</if>
- <if test="torqueStatus != null">#{torqueStatus},</if>
<if test="angle != null">#{angle},</if>
<if test="angleStatus != null">#{angleStatus},</if>
<if test="collectTime != null">#{collectTime},</if>
@@ -70,10 +63,8 @@
<trim prefix="SET" suffixOverrides=",">
<if test="sfcCode != null">sfc_code = #{sfcCode},</if>
<if test="locationCode != null">location_code = #{locationCode},</if>
- <if test="paramSetCode != null">param_set_code = #{paramSetCode},</if>
<if test="paramSetName != null">param_set_name = #{paramSetName},</if>
<if test="torque != null">torque = #{torque},</if>
- <if test="torqueStatus != null">torque_status = #{torqueStatus},</if>
<if test="angle != null">angle = #{angle},</if>
<if test="angleStatus != null">angle_status = #{angleStatus},</if>
<if test="collectTime != null">collect_time = #{collectTime},</if>
--
Gitblit v1.9.3