From 4636b03d801662db1b8712d7a9ae9105462eca37 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 09:53:26 +0800
Subject: [PATCH] 提交
---
tms/src/main/resources/mapper/tms/TmsContractMapper.xml | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsContractMapper.xml b/tms/src/main/resources/mapper/tms/TmsContractMapper.xml
index 3aaccd8..aeac506 100644
--- a/tms/src/main/resources/mapper/tms/TmsContractMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsContractMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tms.mapper.TmsContractMapper">
<resultMap type="com.ruoyi.tms.domain.TmsContract" id="TmsContractResult">
@@ -15,9 +15,11 @@
<result property="contractEndDate" column="contract_end_date" />
<result property="contractStatus" column="contract_status" />
<result property="partyAName" column="party_a_name" />
+ <result property="partyAId" column="party_a_id" />
<result property="partyAContact" column="party_a_contact" />
<result property="partyAContactInfo" column="party_a_contact_info" />
<result property="partyBName" column="party_b_name" />
+ <result property="partyBId" column="party_b_id" />
<result property="partyBContact" column="party_b_contact" />
<result property="partyBContactInfo" column="party_b_contact_info" />
<result property="contractAmount" column="contract_amount" />
@@ -42,7 +44,7 @@
</resultMap>
<sql id="selectTmsContractVo">
- select thisTab.id, thisTab.system_code, thisTab.contract_code, thisTab.contract_name, thisTab.contract_type, thisTab.sign_date, thisTab.contract_start_date, thisTab.contract_end_date, thisTab.contract_status, thisTab.party_a_name, thisTab.party_a_contact, thisTab.party_a_contact_info, thisTab.party_b_name, thisTab.party_b_contact, thisTab.party_b_contact_info, thisTab.contract_amount, thisTab.payment_method, thisTab.payment_cycle, thisTab.paid_amount, thisTab.unpaid_amount, thisTab.invoice_status, thisTab.fulfillment_status, thisTab.fulfillment_progress, thisTab.acceptance_status, thisTab.attachment_name, thisTab.attachment_path, thisTab.uploaded_by, thisTab.upload_time, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_contract AS thisTab
+ select thisTab.id, thisTab.system_code, thisTab.contract_code, thisTab.contract_name, thisTab.contract_type, thisTab.sign_date, thisTab.contract_start_date, thisTab.contract_end_date, thisTab.contract_status, thisTab.party_a_name, thisTab.party_a_id, thisTab.party_a_contact, thisTab.party_a_contact_info, thisTab.party_b_name, thisTab.party_b_id, thisTab.party_b_contact, thisTab.party_b_contact_info, thisTab.contract_amount, thisTab.payment_method, thisTab.payment_cycle, thisTab.paid_amount, thisTab.unpaid_amount, thisTab.invoice_status, thisTab.fulfillment_status, thisTab.fulfillment_progress, thisTab.acceptance_status, thisTab.attachment_name, thisTab.attachment_path, thisTab.uploaded_by, thisTab.upload_time, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_contract AS thisTab
</sql>
<sql id="selectTmsContractVoCount">
select count(0) from tms_contract as thisTab
@@ -58,6 +60,9 @@
<if test="contractEndDate != null "> and thisTab.contract_end_date = #{contractEndDate}</if>
<if test="contractStatus != null "> and thisTab.contract_status = #{contractStatus}</if>
<if test="partyAName != null and partyAName != ''"> and thisTab.party_a_name like concat('%', #{partyAName}, '%')</if>
+ <if test="partyAId != null "> and thisTab.party_a_id = #{partyAId}</if>
+ <if test="partyBId != null "> and thisTab.party_b_id = #{partyBId}</if>
+
<if test="partyBName != null and partyBName != ''"> and thisTab.party_b_name like concat('%', #{partyBName}, '%')</if>
<if test="contractAmount != null "> and thisTab.contract_amount = #{contractAmount}</if>
<if test="paymentMethod != null "> and thisTab.payment_method = #{paymentMethod}</if>
@@ -101,9 +106,11 @@
<if test="contractEndDate != null">contract_end_date,</if>
<if test="contractStatus != null">contract_status,</if>
<if test="partyAName != null and partyAName != ''">party_a_name,</if>
+ <if test="partyAId != null">party_a_id,</if>
<if test="partyAContact != null">party_a_contact,</if>
<if test="partyAContactInfo != null">party_a_contact_info,</if>
<if test="partyBName != null and partyBName != ''">party_b_name,</if>
+ <if test="partyBId != null">party_b_id,</if>
<if test="partyBContact != null">party_b_contact,</if>
<if test="partyBContactInfo != null">party_b_contact_info,</if>
<if test="contractAmount != null">contract_amount,</if>
@@ -125,7 +132,7 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
<if test="contractCode != null and contractCode != ''">#{contractCode},</if>
@@ -136,9 +143,11 @@
<if test="contractEndDate != null">#{contractEndDate},</if>
<if test="contractStatus != null">#{contractStatus},</if>
<if test="partyAName != null and partyAName != ''">#{partyAName},</if>
+ <if test="partyAId != null">#{partyAId},</if>
<if test="partyAContact != null">#{partyAContact},</if>
<if test="partyAContactInfo != null">#{partyAContactInfo},</if>
<if test="partyBName != null and partyBName != ''">#{partyBName},</if>
+ <if test="partyBId != null">#{partyBId},</if>
<if test="partyBContact != null">#{partyBContact},</if>
<if test="partyBContactInfo != null">#{partyBContactInfo},</if>
<if test="contractAmount != null">#{contractAmount},</if>
@@ -160,17 +169,17 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
- </trim>
+ </trim>
</insert>
<insert id="insertTmsContractBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_contract
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,contract_code,contract_name,contract_type,sign_date,contract_start_date,contract_end_date,contract_status,party_a_name,party_a_contact,party_a_contact_info,party_b_name,party_b_contact,party_b_contact_info,contract_amount,payment_method,payment_cycle,paid_amount,unpaid_amount,invoice_status,fulfillment_status,fulfillment_progress,acceptance_status,attachment_name,attachment_path,uploaded_by,upload_time,status,create_by,create_time,update_by,update_time,remark,
+ id,system_code,contract_code,contract_name,contract_type,sign_date,contract_start_date,contract_end_date,contract_status,party_a_name,party_a_id,party_a_contact,party_a_contact_info,party_b_name,party_b_id,party_b_contact,party_b_contact_info,contract_amount,payment_method,payment_cycle,paid_amount,unpaid_amount,invoice_status,fulfillment_status,fulfillment_progress,acceptance_status,attachment_name,attachment_path,uploaded_by,upload_time,status,create_by,create_time,update_by,update_time,remark,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.contractCode},#{item.contractName},#{item.contractType},#{item.signDate},#{item.contractStartDate},#{item.contractEndDate},#{item.contractStatus},#{item.partyAName},#{item.partyAContact},#{item.partyAContactInfo},#{item.partyBName},#{item.partyBContact},#{item.partyBContactInfo},#{item.contractAmount},#{item.paymentMethod},#{item.paymentCycle},#{item.paidAmount},#{item.unpaidAmount},#{item.invoiceStatus},#{item.fulfillmentStatus},#{item.fulfillmentProgress},#{item.acceptanceStatus},#{item.attachmentName},#{item.attachmentPath},#{item.uploadedBy},#{item.uploadTime},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
+ #{item.id},#{item.systemCode},#{item.contractCode},#{item.contractName},#{item.contractType},#{item.signDate},#{item.contractStartDate},#{item.contractEndDate},#{item.contractStatus},#{item.partyAName},#{item.partyAId},#{item.partyAContact},#{item.partyAContactInfo},#{item.partyBName},#{item.partyBId},#{item.partyBContact},#{item.partyBContactInfo},#{item.contractAmount},#{item.paymentMethod},#{item.paymentCycle},#{item.paidAmount},#{item.unpaidAmount},#{item.invoiceStatus},#{item.fulfillmentStatus},#{item.fulfillmentProgress},#{item.acceptanceStatus},#{item.attachmentName},#{item.attachmentPath},#{item.uploadedBy},#{item.uploadTime},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
</trim>
</foreach>
</insert>
@@ -188,9 +197,11 @@
<if test="contractEndDate != null">contract_end_date = #{contractEndDate},</if>
<if test="contractStatus != null">contract_status = #{contractStatus},</if>
<if test="partyAName != null and partyAName != ''">party_a_name = #{partyAName},</if>
+ <if test="partyAId != null">party_a_id = #{partyAId},</if>
<if test="partyAContact != null">party_a_contact = #{partyAContact},</if>
<if test="partyAContactInfo != null">party_a_contact_info = #{partyAContactInfo},</if>
<if test="partyBName != null and partyBName != ''">party_b_name = #{partyBName},</if>
+ <if test="partyBId != null">party_b_id = #{partyBId},</if>
<if test="partyBContact != null">party_b_contact = #{partyBContact},</if>
<if test="partyBContactInfo != null">party_b_contact_info = #{partyBContactInfo},</if>
<if test="contractAmount != null">contract_amount = #{contractAmount},</if>
@@ -229,9 +240,11 @@
<if test="item.contractEndDate != null">contract_end_date = #{item.contractEndDate},</if>
<if test="item.contractStatus != null">contract_status = #{item.contractStatus},</if>
<if test="item.partyAName != null and item.partyAName != ''">party_a_name = #{item.partyAName},</if>
+ <if test="item.partyAId != null">party_a_id = #{item.partyAId},</if>
<if test="item.partyAContact != null">party_a_contact = #{item.partyAContact},</if>
<if test="item.partyAContactInfo != null">party_a_contact_info = #{item.partyAContactInfo},</if>
<if test="item.partyBName != null and item.partyBName != ''">party_b_name = #{item.partyBName},</if>
+ <if test="item.partyBId != null">party_b_id = #{item.partyBId},</if>
<if test="item.partyBContact != null">party_b_contact = #{item.partyBContact},</if>
<if test="item.partyBContactInfo != null">party_b_contact_info = #{item.partyBContactInfo},</if>
<if test="item.contractAmount != null">contract_amount = #{item.contractAmount},</if>
@@ -254,7 +267,7 @@
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
</trim>
- where id = #{item.id}
+ where id = #{item.id}
</foreach>
</update>
@@ -269,4 +282,5 @@
</foreach>
</delete>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0