From b32dba6d0c069e4d1a416358501b441865714ab3 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 20 八月 2024 17:22:10 +0800
Subject: [PATCH] order manage
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java | 4 ++++
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 22 ++++++++++++++++++----
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml | 2 ++
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
index 5bb8369..15e35ce 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
@@ -43,6 +43,10 @@
*/
public String customerName;
/**
+ * 椤圭洰鍚嶇О
+ */
+ public String projectName;
+ /**
* 璁㈠崟璐熻矗浜�
*/
public String director;
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
index a3ca0de..7d632da 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
@@ -25,6 +25,7 @@
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectItems" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--绠楀嚭瀹屾垚鐜�-->
select
<include refid="Base_Column_List" />
from pr_order_item
@@ -63,6 +64,7 @@
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
+ <!--@mbg.generated-->
update pr_order_item
<set>
<if test="orderId != null">
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..1736600 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,
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
@@ -52,6 +52,9 @@
</if>
<if test="customerName != null and customerName != ''">
customer_name like concat('%', #{customerName}, '%') and
+ </if>
+ <if test="projectName != null and projectName != ''">
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
@@ -82,6 +85,9 @@
<if test="customerName != null and customerName != ''">
customer_name like concat('%', #{customerName}, '%') and
</if>
+ <if test="projectName != null and projectName != ''">
+ project_name like concat('%', #{projectName}, '%') and
+ </if>
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
</if>
@@ -104,6 +110,9 @@
</if>
<if test="customerName != null and customerName != ''">
customer_name like concat('%', #{customerName}, '%') and
+ </if>
+ <if test="projectName != null and projectName != ''">
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
@@ -132,6 +141,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 +155,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 +175,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