From b8ad4437edd1a32dc74c8d16015d05dd570e3b75 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 24 一月 2024 18:43:49 +0800
Subject: [PATCH] 新增-生产报表
---
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 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 8699587..1d91ae5 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -38,12 +38,14 @@
<include refid="selectDaParamCollectionVo"/>
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="type != null and type != ''"> and type = #{type}</if>
<if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if>
<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="dateConditions != null and dateConditions != ''"> and collection_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
</select>
--
Gitblit v1.9.3