From c89cf8126ed20af98e19b8ab1f63e8bfae596788 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 16 十月 2024 17:11:05 +0800
Subject: [PATCH] command crud

---
 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 17 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 93c87e8..6335d2f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -12,18 +12,24 @@
             <result property="director" column="director" jdbcType="VARCHAR"/>
             <result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/>
             <result property="deliveryDate" column="delivery_date" jdbcType="VARCHAR"/>
+            <result property="deliveryAddress" column="delivery_address" jdbcType="VARCHAR"/>
+            <result property="recipient" column="recipient" jdbcType="VARCHAR"/>
+            <result property="rMobile" column="r_mobile" jdbcType="VARCHAR"/>
             <result property="status" column="status" jdbcType="TINYINT"/>
             <result property="creator" column="creator" jdbcType="VARCHAR"/>
             <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+            <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
             <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="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,
+        director,d_mobile,delivery_date,delivery_address,recipient,r_mobile,
         status,creator,dt,
         deleted,remark
     </sql>
@@ -38,7 +44,7 @@
     </select>
     <select id="exists" resultType="java.lang.Boolean">
         select count(1) from pr_order where name = #{name}
-        <if test="id != null and id !=''">
+        <if test="id != null">
             and id != #{id}
         </if>
     </select>
@@ -67,7 +73,7 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
@@ -102,11 +108,12 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
     </select>
+    <!--涓嬫媺鑿滃崟璁㈠崟-->
     <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
         select
         <include refid="Base_Column_List" />
@@ -131,7 +138,7 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
@@ -148,31 +155,37 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
         insert into pr_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">id,</if>
+                <if test="id != null">id,</if>
                 <if test="name != null and name !=''">name,</if>
                 <if test="customerName!= null and customerName !=''">customer_name,</if>
                 <if test="projectName!= null and projectName !=''">project_name,</if>
                 <if test="director != null and director !=''">director,</if>
                 <if test="dMobile != null and dMobile !=''">d_mobile,</if>
                 <if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
-                <if test="status != null and status !=''">status,</if>
+                <if test="deliveryAddress!= null and deliveryAddress !=''">delivery_date,</if>
+                <if test="recipient!= null and recipient !=''">recipient,</if>
+                <if test="rMobile!= null and rMobile !=''">r_mobile,</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="deleted != null and deleted !=''">deleted,</if>
+                <if test="dt != null">dt,</if>
+                <if test="deleted != null">deleted,</if>
                 <if test="remark != null and remark !=''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                 <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                 <if test="customerName!= null and customerName !=''">#{customerName,jdbcType=VARCHAR},</if>
                 <if test="projectName!= null and projectName !=''">#{projectName,jdbcType=VARCHAR},</if>
                 <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
                 <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
                 <if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
-                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
+                <if test="deliveryAddress!= null and deliveryAddress !=''">#{deliveryAddress,jdbcType=VARCHAR},</if>
+                <if test="recipient!= null and recipient !=''">#{recipient,jdbcType=VARCHAR},</if>
+                <if test="rMobile!= null and rMobile !=''">#{rMobile,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="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</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>
     </insert>
@@ -197,16 +210,25 @@
                 <if test="deliveryDate!= null and deliveryDate !=''">
                     delivery_date = #{deliveryDate,jdbcType=VARCHAR},
                 </if>
-                <if test="status != null and status !=''">
+                <if test="deliveryAddress!= null and deliveryAddress !=''">
+                    delivery_date = #{deliveryAddress,jdbcType=VARCHAR},
+                </if>
+                <if test="recipient!= null and recipient !=''">
+                    recipient = #{recipient,jdbcType=VARCHAR},
+                </if>
+                <if test="rMobile!= null and rMobile !=''">
+                    r_mobile = #{rMobile,jdbcType=VARCHAR},
+                </if>
+                <if test="status != null">
                     status = #{status,jdbcType=TINYINT},
                 </if>
                 <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 and deleted !=''">
+                <if test="deleted != null">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
                 <if test="remark != null and remark !=''">

--
Gitblit v1.8.0