From 4a36a12d40453f7686e5f2664f19601b9f6b9ae2 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 22 八月 2024 14:39:52 +0800
Subject: [PATCH] order status
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 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 5b96976..6bfacd5 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,7 +33,9 @@
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">
@@ -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 != ''">
- name like concat('%', #{name}, '%') and
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ 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">
- status = #{status,jdbcType=TINYINT} and
+ <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 != ''">
- name like concat('%', #{name}, '%') and
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ 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">
- status = #{status,jdbcType=TINYINT} and
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
@@ -110,32 +112,31 @@
<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 != ''">
- name like concat('%', #{name}, '%') and
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ 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">
- status = #{status,jdbcType=TINYINT} and
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
</select>
-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_order
where id = #{id,jdbcType=BIGINT}
--
Gitblit v1.8.0