From 14b0417bca9050a11792248f5c5c7e7c86e4744f Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 21 八月 2024 16:47:45 +0800
Subject: [PATCH] 排班功能
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 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 1736600..38ea656 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
@@ -48,22 +48,25 @@
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
<if test="name != null and name != ''">
- name like concat('%', #{name}, '%') and
+ and name like concat('%', #{name}, '%')
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ and customer_name like concat('%', #{customerName}, '%')
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ and project_name like concat('%', #{projectName}, '%')
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ and director like concat('%', #{director}, '%')
</if>
- <if test="startTime != null">
- and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ <if test="startDate != null">
+ and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
</if>
- <if test="endTime != null">
- and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ <if test="endDate != null">
+ and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ </if>
+ <if test="status != null">
+ and status = #{status,jdbcType=TINYINT}
</if>
</trim>
order by id desc
@@ -80,22 +83,25 @@
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
<if test="name != null and name != ''">
- name like concat('%', #{name}, '%') and
+ and name like concat('%', #{name}, '%')
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ and customer_name like concat('%', #{customerName}, '%')
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ and project_name like concat('%', #{projectName}, '%')
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ and director like concat('%', #{director}, '%')
</if>
- <if test="startTime != null">
- and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ <if test="startDate != null">
+ and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
</if>
- <if test="endTime != null">
- and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ <if test="endDate != null">
+ and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ </if>
+ <if test="status != null">
+ and status = #{status,jdbcType=TINYINT}
</if>
</trim>
</select>
@@ -106,27 +112,29 @@
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
<if test="name != null and name != ''">
- name like concat('%', #{name}, '%') and
+ and name like concat('%', #{name}, '%')
</if>
<if test="customerName != null and customerName != ''">
- customer_name like concat('%', #{customerName}, '%') and
+ and customer_name like concat('%', #{customerName}, '%')
</if>
<if test="projectName != null and projectName != ''">
- project_name like concat('%', #{projectName}, '%') and
+ and project_name like concat('%', #{projectName}, '%')
</if>
<if test="director != null and director != ''">
- director like concat('%', #{director}, '%') and
+ and director like concat('%', #{director}, '%')
</if>
- <if test="startTime != null">
- and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ <if test="startDate != null">
+ and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
</if>
- <if test="endTime != null">
- and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ <if test="endDate != null">
+ and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ </if>
+ <if test="status != null">
+ and status = #{status,jdbcType=TINYINT}
</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