From e7113b09a75842d97f16999933110bb1a573ff76 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 14 九月 2024 15:55:08 +0800
Subject: [PATCH] export device no
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 c52c967..850cd9b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -21,6 +21,9 @@
<resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
<collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectItems" column="id" />
</resultMap>
+ <resultMap id="BaseResultMap3" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
+ <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectDistinctPro" column="id" />
+ </resultMap>
<sql id="Base_Column_List">
id,`name`,customer_name,project_name,
director,d_mobile,delivery_date,
@@ -107,7 +110,8 @@
</if>
</trim>
</select>
- <select id="selectAll" resultMap="BaseResultMap2">
+ <!--涓嬫媺鑿滃崟璁㈠崟-->
+ <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
select
<include refid="Base_Column_List" />
from pr_order p
@@ -157,7 +161,7 @@
<if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
<if test="status != null">status,</if>
<if test="creator != null and creator !=''">creator,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="deleted != null">deleted,</if>
<if test="remark != null and remark !=''">remark,</if>
</trim>
@@ -171,7 +175,7 @@
<if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
<if test="status != null">#{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="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
@@ -203,7 +207,7 @@
<if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
--
Gitblit v1.8.0