From 051414acd3a8c3e761d1010b14014d6b9bddd7fb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 15 十月 2024 15:52:06 +0800
Subject: [PATCH] statistic workload change

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml |   49 +++++++++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
index e8f1818..1631f35 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -12,24 +12,23 @@
         <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
         <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
         <association property="proName" column="pro_id" javaType="java.lang.Long"
-                     select="selectProNameById" fetchType="eager" />
+                     select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+        <association property="proType" column="pro_id" javaType="java.lang.Long"
+                     select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id,reason,disabled,
         deleted,pro_id,sort
     </sql>
-    <sql id="part_Column_List">
-        ${alias}.id,
-        ${alias}.reason,
-        ${alias}.pro_id,
-        ${alias}.sort,
-        ${alias}.deleted,
-        ${alias}.disabled
-    </sql>
-    <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
-        select name proName from plt_product where id=#{id}
-    </select>
+<!--    <sql id="part_Column_List">-->
+<!--        ${alias}.id,-->
+<!--        ${alias}.reason,-->
+<!--        ${alias}.pro_id,-->
+<!--        ${alias}.sort,-->
+<!--        ${alias}.deleted,-->
+<!--        ${alias}.disabled-->
+<!--    </sql>-->
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -46,30 +45,30 @@
         insert into plt_product_scrapping_reason
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="reason != null">reason,</if>
+            <if test="reason != null and reason !=''">reason,</if>
             <if test="proId != null">pro_id,</if>
             <if test="sort != null">sort,</if>
             <if test="deleted != null">deleted,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id,jdbcType=BIGINT},</if>
-            <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
+            <if test="reason != null and reason !=''">#{reason,jdbcType=VARCHAR},</if>
             <if test="proId != null">#{proId,jdbcType=VARCHAR},</if>
-            <if test="sort != null">#{sort,jdbcType=VARCHAR},</if>
+            <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
             <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
         update plt_product_scrapping_reason
         <set>
-            <if test="reason != null">
+            <if test="reason != null and reason !=''">
                 reason = #{reason,jdbcType=VARCHAR},
             </if>
             <if test="proId != null">
                 pro_id = #{proId,jdbcType=VARCHAR},
             </if>
             <if test="sort != null">
-                sort = #{sort,jdbcType=VARCHAR},
+                sort = #{sort,jdbcType=INTEGER},
             </if>
             <if test="disabled != null">
                 disabled = #{disabled,jdbcType=TINYINT},
@@ -83,14 +82,18 @@
 
     <select id="selectSome" resultMap="BaseResultMap">
         select
-        <include refid="part_Column_List" >
-            <property name="alias" value="t"/>
-        </include>
+        <include refid="Base_Column_List"/>
         from plt_product_scrapping_reason t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
+            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
+            </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
             </if>
         </trim>
         order by sort desc
@@ -106,9 +109,15 @@
         from plt_product_scrapping_reason t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
+            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
             </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+            </if>
         </trim>
     </select>
 

--
Gitblit v1.8.0