From 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 26 八月 2024 20:47:46 +0800
Subject: [PATCH] 修改判空方式
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 71 deletions(-)
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 6fca7d9..93c87e8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -22,7 +22,7 @@
<collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectItems" column="id" />
</resultMap>
<sql id="Base_Column_List">
- id,`name`,customer_name,
+ id,`name`,customer_name,project_name,
director,d_mobile,delivery_date,
status,creator,dt,
deleted,remark
@@ -33,10 +33,12 @@
from pr_order
where id = #{id,jdbcType=BIGINT}
</select>
-
+ <select id="selectOrderNameById" parameterType="java.lang.Long" resultType="String">
+ select name from pr_order where id=#{orderId,jdbcType=BIGINT}
+ </select>
<select id="exists" resultType="java.lang.Boolean">
select count(1) from pr_order where name = #{name}
- <if test="id != null">
+ <if test="id != null and id !=''">
and id != #{id}
</if>
</select>
@@ -46,27 +48,27 @@
<include refid="Base_Column_List" />
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
@@ -81,27 +83,27 @@
select count(1)
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
@@ -110,27 +112,27 @@
<include refid="Base_Column_List" />
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
@@ -146,68 +148,68 @@
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
insert into pr_order
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="name != null">name,</if>
- <if test="customerName != null">customer_name,</if>
- <if test="projectName != null">project_name,</if>
- <if test="director != null">director,</if>
- <if test="dMobile != null">d_mobile,</if>
- <if test="deliveryDate != null">delivery_date,</if>
- <if test="status != null">status,</if>
- <if test="creator != null">creator,</if>
- <if test="dt != null">dt,</if>
- <if test="deleted != null">deleted,</if>
- <if test="remark != null">remark,</if>
+ <if test="id != null and id !=''">id,</if>
+ <if test="name != null and name !=''">name,</if>
+ <if test="customerName!= null and customerName !=''">customer_name,</if>
+ <if test="projectName!= null and projectName !=''">project_name,</if>
+ <if test="director != null and director !=''">director,</if>
+ <if test="dMobile != null and dMobile !=''">d_mobile,</if>
+ <if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
+ <if test="status != null and status !=''">status,</if>
+ <if test="creator != null and creator !=''">creator,</if>
+ <if test="dt != null and dt !=''">dt,</if>
+ <if test="deleted != null and deleted !=''">deleted,</if>
+ <if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="customerName != null">#{customerName,jdbcType=VARCHAR},</if>
- <if test="projectName != null">#{projectName,jdbcType=VARCHAR},</if>
- <if test="director != null">#{director,jdbcType=VARCHAR},</if>
- <if test="dMobile != null">#{dMobile,jdbcType=VARCHAR},</if>
- <if test="deliveryDate != null">#{deliveryDate,jdbcType=VARCHAR},</if>
- <if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
- <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+ <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+ <if test="customerName!= null and customerName !=''">#{customerName,jdbcType=VARCHAR},</if>
+ <if test="projectName!= null and projectName !=''">#{projectName,jdbcType=VARCHAR},</if>
+ <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
+ <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
+ <if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
+ <if test="status != null and status !=''">#{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="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+ <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder">
update pr_order
<set>
- <if test="name != null">
+ <if test="name != null and name !=''">
name = #{name,jdbcType=VARCHAR},
</if>
- <if test="customerName != null">
+ <if test="customerName!= null and customerName !=''">
customer_name = #{customerName,jdbcType=VARCHAR},
</if>
- <if test="projectName != null">
+ <if test="projectName!= null and projectName !=''">
project_name = #{projectName,jdbcType=VARCHAR},
</if>
- <if test="director != null">
+ <if test="director != null and director !=''">
director = #{director,jdbcType=VARCHAR},
</if>
- <if test="dMobile != null">
+ <if test="dMobile != null and dMobile !=''">
d_mobile = #{dMobile,jdbcType=VARCHAR},
</if>
- <if test="deliveryDate != null">
+ <if test="deliveryDate!= null and deliveryDate !=''">
delivery_date = #{deliveryDate,jdbcType=VARCHAR},
</if>
- <if test="status != null">
+ <if test="status != null and status !=''">
status = #{status,jdbcType=TINYINT},
</if>
- <if test="creator != null">
+ <if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null">
+ <if test="dt != null and dt !=''">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
- <if test="deleted != null">
+ <if test="deleted != null and deleted !=''">
deleted = #{deleted,jdbcType=TINYINT},
</if>
- <if test="remark != null">
+ <if test="remark != null and remark !=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
--
Gitblit v1.8.0