From 893fda95385e39c2c810c6f3ac3758a63d11d4ae Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 04 九月 2024 16:33:25 +0800
Subject: [PATCH] 修改时间类型的判空
---
pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml | 8 ++--
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml | 4 +-
pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml | 6 +-
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 4 +-
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 4 +-
pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml | 6 +-
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 6 +-
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 4 +-
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml | 6 +-
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 6 +-
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 8 ++--
pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml | 4 +-
pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml | 6 +-
13 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 1c2b4b8..421f495 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -91,7 +91,7 @@
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
- <if test="dt != null and dt != '' ">
+ <if test="dt != null">
DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
@@ -119,7 +119,7 @@
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
- <if test="dt != null and dt != '' ">
+ <if test="dt != null">
DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index f8e99c5..241a6a9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -135,7 +135,7 @@
<if test="disabled != null">
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
- <if test="dt != null and dt != ''">
+ <if test="dt != null">
DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
</if>
</trim>
@@ -156,7 +156,7 @@
<if test="disabled != null">
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
- <if test="dt != null and dt != ''">
+ <if test="dt != null">
DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
</if>
</trim>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
index 894444d..b0309e6 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
@@ -60,7 +60,7 @@
<if test="filePath!= null and filePath !=''">
file_path,
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt,
</if>
</trim>
@@ -83,7 +83,7 @@
<if test="filePath!= null and filePath !=''">
#{filePath},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
#{dt},
</if>
</trim>
@@ -107,7 +107,7 @@
<if test="filePath!= null and filePath !=''">
file_path = #{filePath},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt},
</if>
</set>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
index e718314..ecd826b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -77,7 +77,7 @@
<if test="deleted != null">
deleted,
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt,
</if>
<if test="remark != null and remark !=''">
@@ -109,7 +109,7 @@
<if test="deleted != null">
#{deleted,jdbcType=VARCHAR },
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
#{dt,jdbcType=TIMESTAMP},
</if>
<if test="remark != null and remark !=''">
@@ -136,7 +136,7 @@
<if test="dMobile != null and dMobile !=''">
d_mobile = #{dMobile,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="remark != null and remark !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 6d5d8a8..1d84692 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -261,8 +261,8 @@
<if test="endDate != null and endDate !=''">end_date,</if>
<if test="deleted != null">deleted,</if>
<if test="content != null and content !=''">content,</if>
- <if test="inputNumber!= null and inputNumber !=''">input_number,</if>
- <if test="outputNumber!= null and outputNumber !=''">output_number,</if>
+ <if test="inputNumber!= null">input_number,</if>
+ <if test="outputNumber!= null">output_number,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -325,10 +325,10 @@
<if test="content != null and content !=''">
content = #{content,jdbcType=VARCHAR},
</if>
- <if test="inputNumber!= null and inputNumber !=''">
+ <if test="inputNumber!= null">
input_number = #{inputNumber,jdbcType=INTEGER},
</if>
- <if test="outputNumber!= null and outputNumber !=''">
+ <if test="outputNumber!= null">
output_number = #{outputNumber,jdbcType=INTEGER},
</if>
</set>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml
index 1faf981..c1178b4 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml
@@ -49,7 +49,7 @@
<if test="batchNumber!= null">batch_number,</if>
<if test="proId != null">pro_id,</if>
<if test="creator != null and creator !=''">creator,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -57,7 +57,7 @@
<if test="batchNumber!= null">#{batchNumber,jdbcType=INTEGER},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
<if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -110,7 +110,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR} and
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="remark != null and remark !=''">
@@ -141,7 +141,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR} and
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="remark != null and remark !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
index 8e6bd09..7f8266e 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
@@ -54,7 +54,7 @@
<if test="name != null and name !=''">name,</if>
<if test="status != null">status,</if>
<if test="creator != null and creator !=''">creator,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="startDate != null and startDate !=''">start_date,</if>
<if test="endDate != null and endDate !=''">end_date,</if>
<if test="deleted != null">deleted,</if>
@@ -65,7 +65,7 @@
<if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="startDate != null and startDate !=''">#{startDate,jdbcType=VARCHAR},</if>
<if test="endDate != null and endDate !=''">#{endDate,jdbcType=VARCHAR},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
@@ -84,7 +84,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="startDate != null and startDate !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
index 8fc48f4..850cd9b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -161,7 +161,7 @@
<if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
<if test="status != null">status,</if>
<if test="creator != null and creator !=''">creator,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="deleted != null">deleted,</if>
<if test="remark != null and remark !=''">remark,</if>
</trim>
@@ -175,7 +175,7 @@
<if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
@@ -207,7 +207,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index 78e5bed..8d74700 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -80,7 +80,7 @@
<if test="proId != null">pro_id,</if>
<if test="name != null and name !=''">name,</if>
<if test="creator != null and creator !=''">creator,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
<if test="remark != null and remark !=''">remark,</if>
@@ -90,7 +90,7 @@
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
<if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
<if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
@@ -108,7 +108,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="disabled != null">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
index 93de9e8..40353c9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
@@ -53,7 +53,7 @@
<if test="deleted != null">
deleted,
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt,
</if>
</trim>
@@ -70,7 +70,7 @@
<if test="deleted != null">
#{deleted,jdbcType=TINYINT},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
#{dt,jdbcType=TIMESTAMP},
</if>
</trim>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index b1a7326..de585b8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -304,7 +304,7 @@
where user_id = #{userId,jdbcType=BIGINT}
and station_id = #{stationId,jdbcType=BIGINT}
<choose>
- <when test="planId != null and planId !=''">
+ <when test="planId != null">
and plan_id = #{planId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -320,7 +320,7 @@
</otherwise>
</choose>
<choose>
- <when test="nodeId != null and nodeId !=''">
+ <when test="nodeId != null">
and node_id = #{nodeId,jdbcType=BIGINT}
</when>
<otherwise>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
index cc8dc9c..5317d88 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
@@ -41,14 +41,14 @@
<if test="id != null">id,</if>
<if test="userId != null">user_id,</if>
<if test="planId != null">plan_id,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="userId != null">#{userId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
</trim>
</insert>
@@ -61,7 +61,7 @@
<if test="planId != null">
plan_id = #{planId,jdbcType=BIGINT},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
index 8fdedc6..9d877b3 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -63,7 +63,7 @@
<if test="productId != null">#{productId,jdbcType=BIGINT},</if>
<if test="productName != null and productName !=''">#{productName,jdbcType=VARCHAR},</if>
<if test="productNo!= null and productNo !=''">#{productNo,jdbcType=VARCHAR},</if>
- <if test="createTime != null and createTime !=''">#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
</trim>
</insert>
@@ -82,7 +82,7 @@
<if test="productNo!= null and productNo !=''">
product_no = #{productNo,jdbcType=VARCHAR},
</if>
- <if test="createTime != null and createTime !=''">
+ <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createBy != null">
--
Gitblit v1.8.0