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 | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 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 b6914cc..38ea656 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -8,6 +8,7 @@
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
+ <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
<result property="director" column="director" jdbcType="VARCHAR"/>
<result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/>
<result property="deliveryDate" column="delivery_date" jdbcType="VARCHAR"/>
@@ -18,16 +19,15 @@
<result property="remark" column="remark" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
- <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="selectItems" column="id" />
+ <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
</sql>
-
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap2">
select
<include refid="Base_Column_List" />
from pr_order
@@ -48,19 +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 != ''">
+ 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
@@ -77,19 +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 != ''">
+ 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>
@@ -100,24 +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 != ''">
+ 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}
@@ -132,6 +149,7 @@
<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>
@@ -145,6 +163,7 @@
<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>
@@ -164,6 +183,9 @@
<if test="customerName != null">
customer_name = #{customerName,jdbcType=VARCHAR},
</if>
+ <if test="projectName != null">
+ project_name = #{projectName,jdbcType=VARCHAR},
+ </if>
<if test="director != null">
director = #{director,jdbcType=VARCHAR},
</if>
--
Gitblit v1.8.0