From 3974fad5d836431e417e99220cc07bb5b0aba331 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 08 十二月 2025 14:16:16 +0800
Subject: [PATCH] 提交

---
 tms/src/main/resources/mapper/tms/TmsQuotePlanMapper.xml |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/tms/src/main/resources/mapper/tms/TmsQuotePlanMapper.xml b/tms/src/main/resources/mapper/tms/TmsQuotePlanMapper.xml
index 5e622f2..e297bc3 100644
--- a/tms/src/main/resources/mapper/tms/TmsQuotePlanMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsQuotePlanMapper.xml
@@ -23,10 +23,13 @@
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="planType"    column="plan_type"    />
+        <result property="providerType"    column="provider_type"    />
+        <result property="providerId"    column="provider_id"    />
+        <result property="providerName"    column="provider_name"    />
     </resultMap>
 
     <sql id="selectTmsQuotePlanVo">
-        select thisTab.id, thisTab.system_code, thisTab.plan_name, thisTab.customer_id, thisTab.customer_name, thisTab.project_id, thisTab.project_name, thisTab.contract_id, thisTab.contract_name, thisTab.effective_date, thisTab.expiry_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.plan_type from tms_quote_plan AS thisTab
+        select thisTab.id, thisTab.system_code, thisTab.plan_name, thisTab.customer_id, thisTab.customer_name, thisTab.project_id, thisTab.project_name, thisTab.contract_id, thisTab.contract_name, thisTab.effective_date, thisTab.expiry_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.plan_type ,thisTab.provider_type, thisTab.provider_id, thisTab.provider_name from tms_quote_plan AS thisTab
     </sql>
     <sql id="selectTmsQuotePlanVoCount">
         select count(0) from tms_quote_plan as thisTab
@@ -45,6 +48,9 @@
         <if test="expiryDate != null "> and thisTab.expiry_date = #{expiryDate}</if>
         <if test="status != null "> and thisTab.status = #{status}</if>
         <if test="planType != null "> and thisTab.plan_type = #{planType}</if>
+        <if test="providerType != null "> and thisTab.provider_type = #{providerType}</if>
+        <if test="providerId != null "> and thisTab.provider_id = #{providerId}</if>
+        <if test="providerName != null  and providerName != ''"> and  thisTab.provider_name like concat('%', #{providerName}, '%')</if>
     </sql>
 
     <!--鏌ヨ-->
@@ -59,6 +65,7 @@
             <include refid="whereCondition"/>
         </where>
     </select>
+
 
     <select id="selectTmsQuotePlanList" parameterType="com.ruoyi.tms.domain.TmsQuotePlan" resultMap="TmsQuotePlanResult">
         <include refid="selectTmsQuotePlanVo"/>
@@ -89,6 +96,9 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="planType != null">plan_type,</if>
+            <if test="providerType != null">provider_type,</if>
+            <if test="providerId != null">provider_id,</if>
+            <if test="providerName != null">provider_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
@@ -108,17 +118,20 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="planType != null">#{planType},</if>
+            <if test="providerType != null">#{providerType},</if>
+            <if test="providerId != null">#{providerId},</if>
+            <if test="providerName != null">#{providerName},</if>
         </trim>
     </insert>
 
     <insert id="insertTmsQuotePlanBatch" parameterType="java.util.List"  useGeneratedKeys="true" keyProperty="id">
         insert into tms_quote_plan
         <trim prefix="(" suffix=") values" suffixOverrides=",">
-            id,system_code,plan_name,customer_id,customer_name,project_id,project_name,contract_id,contract_name,effective_date,expiry_date,status,create_by,create_time,update_by,update_time,remark,plan_type,
+            id,system_code,plan_name,customer_id,customer_name,project_id,project_name,contract_id,contract_name,effective_date,expiry_date,status,create_by,create_time,update_by,update_time,remark,plan_type,provider_type,provider_id,provider_name,
         </trim>
         <foreach item="item" index="index" collection="list" separator=",">
             <trim prefix="(" suffix=") " suffixOverrides=",">
-                #{item.id},#{item.systemCode},#{item.planName},#{item.customerId},#{item.customerName},#{item.projectId},#{item.projectName},#{item.contractId},#{item.contractName},#{item.effectiveDate},#{item.expiryDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.planType},
+                #{item.id},#{item.systemCode},#{item.planName},#{item.customerId},#{item.customerName},#{item.projectId},#{item.projectName},#{item.contractId},#{item.contractName},#{item.effectiveDate},#{item.expiryDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.planType},#{item.providerType},#{item.providerId},#{item.providerName},
             </trim>
         </foreach>
     </insert>
@@ -144,6 +157,9 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="planType != null">plan_type = #{planType},</if>
+            <if test="providerType != null">provider_type = #{providerType},</if>
+            <if test="providerId != null">provider_id = #{providerId},</if>
+            <if test="providerName != null">provider_name = #{providerName},</if>
         </trim>
         where id = #{id}
     </update>
@@ -169,6 +185,9 @@
                 <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
                 <if test="item.remark != null">remark = #{item.remark},</if>
                 <if test="item.planType != null">plan_type = #{item.planType},</if>
+                <if test="item.providerType != null">provider_type = #{item.providerType},</if>
+                <if test="item.providerId != null">provider_id = #{item.providerId},</if>
+                <if test="item.providerName != null">provider_name = #{item.providerName},</if>
             </trim>
             where id = #{item.id}
         </foreach>

--
Gitblit v1.8.0