From 696fd55ecc1243bce1d421d95cb9fba4b0a598b1 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期三, 22 五月 2024 18:43:41 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index 1d91ae5..03caf9a 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -28,10 +28,11 @@
<result property="paramName" column="param_name" />
<result property="unit" column="unit" />
<result property="type" column="type" />
+ <result property="repairFlag" column="repair_flag" />
</resultMap>
<sql id="selectDaParamCollectionVo">
- select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
+ select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type, repair_flag from da_param_collection
</sql>
<select id="selectDaParamCollectionList" parameterType="DaParamCollection" resultMap="DaParamCollectionResult">
@@ -45,15 +46,24 @@
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="equipmentNo != null and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="paramValue != null and paramValue != ''"> and param_value = #{paramValue}</if>
<if test="dateConditions != null and dateConditions != ''"> and collection_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
+ ORDER BY id DESC
</select>
<select id="selectDaParamCollectionById" parameterType="Long" resultMap="DaParamCollectionResult">
<include refid="selectDaParamCollectionVo"/>
where id = #{id}
</select>
-
+ <select id="getListBySfcCode" resultMap="DaParamCollectionResult">
+ <include refid="selectDaParamCollectionVo"/>
+ where sfc_code in
+ <foreach collection="engineNoList" open="(" close=")" item="code" separator=",">
+ #{code}
+ </foreach>
+ </select>
+
<insert id="insertDaParamCollection" parameterType="DaParamCollection">
insert into da_param_collection
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3