From 0bd3125739c0d8bded4f7bd405fd99f1723df964 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 15:51:49 +0800
Subject: [PATCH] 不同服务器配置文件备份
---
pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
index c415133..2f1a70e 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
@@ -13,6 +13,8 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
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">
@@ -26,18 +28,18 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason" useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason">
insert into plt_product_unqualified_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="deleted != null">#{deleted,jdbcType=TINYINT},</if>
@@ -49,7 +51,7 @@
<if test="disabled != null">
disabled = #{disabled,jdbcType=TINYINT},
</if>
- <if test="reason != null">
+ <if test="reason != null and reason !=''">
reason = #{reason,jdbcType=VARCHAR},
</if>
<if test="proId != null">
@@ -70,11 +72,17 @@
from plt_product_unqualified_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
+ order by pro_id desc, sort asc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -87,9 +95,15 @@
from plt_product_unqualified_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