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/TmsProjectMapper.xml | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsProjectMapper.xml b/tms/src/main/resources/mapper/tms/TmsProjectMapper.xml
index f84083f..c0c99e4 100644
--- a/tms/src/main/resources/mapper/tms/TmsProjectMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsProjectMapper.xml
@@ -1,24 +1,27 @@
<?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.TmsProjectMapper">
<resultMap type="com.ruoyi.tms.domain.TmsProject" id="TmsProjectResult">
<result property="id" column="id" />
<result property="projectName" column="project_name" />
<result property="projectCode" column="project_code" />
- <result property="relatedContract" column="related_contract" />
- <result property="relatedCustomer" column="related_customer" />
+ <result property="relatedContractId" column="related_contract_id" />
+ <result property="relatedContractName" column="related_contract_name" />
+ <result property="relatedCustomerId" column="related_customer_id" />
<result property="status" column="status" />
+ <result property="relatedCustomerName" column="related_customer_name" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="createBy" column="create_by" />
</resultMap>
<sql id="selectTmsProjectVo">
- select thisTab.id, thisTab.project_name, thisTab.project_code, thisTab.related_contract, thisTab.related_customer, thisTab.status, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_project AS thisTab
+ select thisTab.id, thisTab.project_name, thisTab.project_code, thisTab.related_contract_id, thisTab.related_contract_name, thisTab.related_customer_id, thisTab.status, thisTab.related_customer_name, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.create_by from tms_project AS thisTab
</sql>
<sql id="selectTmsProjectVoCount">
select count(0) from tms_project as thisTab
@@ -27,9 +30,11 @@
<sql id="whereCondition">
<if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
<if test="projectCode != null and projectCode != ''"> and thisTab.project_code = #{projectCode}</if>
- <if test="relatedContract != null and relatedContract != ''"> and thisTab.related_contract = #{relatedContract}</if>
- <if test="relatedCustomer != null and relatedCustomer != ''"> and thisTab.related_customer = #{relatedCustomer}</if>
+ <if test="relatedContractId != null "> and thisTab.related_contract_id = #{relatedContractId}</if>
+ <if test="relatedContractName != null and relatedContractName != ''"> and thisTab.related_contract_name like concat('%', #{relatedContractName}, '%')</if>
+ <if test="relatedCustomerId != null "> and thisTab.related_customer_id = #{relatedCustomerId}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="relatedCustomerName != null and relatedCustomerName != ''"> and thisTab.related_customer_name like concat('%', #{relatedCustomerName}, '%')</if>
</sql>
<!--鏌ヨ-->
@@ -59,35 +64,41 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="projectName != null and projectName != ''">project_name,</if>
<if test="projectCode != null and projectCode != ''">project_code,</if>
- <if test="relatedContract != null">related_contract,</if>
- <if test="relatedCustomer != null">related_customer,</if>
+ <if test="relatedContractId != null">related_contract_id,</if>
+ <if test="relatedContractName != null">related_contract_name,</if>
+ <if test="relatedCustomerId != null">related_customer_id,</if>
<if test="status != null">status,</if>
+ <if test="relatedCustomerName != null">related_customer_name,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
- </trim>
+ <if test="createBy != null">create_by,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectName != null and projectName != ''">#{projectName},</if>
<if test="projectCode != null and projectCode != ''">#{projectCode},</if>
- <if test="relatedContract != null">#{relatedContract},</if>
- <if test="relatedCustomer != null">#{relatedCustomer},</if>
+ <if test="relatedContractId != null">#{relatedContractId},</if>
+ <if test="relatedContractName != null">#{relatedContractName},</if>
+ <if test="relatedCustomerId != null">#{relatedCustomerId},</if>
<if test="status != null">#{status},</if>
+ <if test="relatedCustomerName != null">#{relatedCustomerName},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
- </trim>
+ <if test="createBy != null">#{createBy},</if>
+ </trim>
</insert>
<insert id="insertTmsProjectBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_project
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,project_name,project_code,related_contract,related_customer,status,create_time,update_by,update_time,remark,
+ id,project_name,project_code,related_contract_id,related_contract_name,related_customer_id,status,related_customer_name,create_time,update_by,update_time,remark,create_by,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.projectName},#{item.projectCode},#{item.relatedContract},#{item.relatedCustomer},#{item.status},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
+ #{item.id},#{item.projectName},#{item.projectCode},#{item.relatedContractId},#{item.relatedContractName},#{item.relatedCustomerId},#{item.status},#{item.relatedCustomerName},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.createBy},
</trim>
</foreach>
</insert>
@@ -98,13 +109,16 @@
<trim prefix="SET" suffixOverrides=",">
<if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
<if test="projectCode != null and projectCode != ''">project_code = #{projectCode},</if>
- <if test="relatedContract != null">related_contract = #{relatedContract},</if>
- <if test="relatedCustomer != null">related_customer = #{relatedCustomer},</if>
+ <if test="relatedContractId != null">related_contract_id = #{relatedContractId},</if>
+ <if test="relatedContractName != null">related_contract_name = #{relatedContractName},</if>
+ <if test="relatedCustomerId != null">related_customer_id = #{relatedCustomerId},</if>
<if test="status != null">status = #{status},</if>
+ <if test="relatedCustomerName != null">related_customer_name = #{relatedCustomerName},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
</trim>
where id = #{id}
</update>
@@ -115,15 +129,18 @@
<trim prefix="SET" suffixOverrides=",">
<if test="item.projectName != null and item.projectName != ''">project_name = #{item.projectName},</if>
<if test="item.projectCode != null and item.projectCode != ''">project_code = #{item.projectCode},</if>
- <if test="item.relatedContract != null">related_contract = #{item.relatedContract},</if>
- <if test="item.relatedCustomer != null">related_customer = #{item.relatedCustomer},</if>
+ <if test="item.relatedContractId != null">related_contract_id = #{item.relatedContractId},</if>
+ <if test="item.relatedContractName != null">related_contract_name = #{item.relatedContractName},</if>
+ <if test="item.relatedCustomerId != null">related_customer_id = #{item.relatedCustomerId},</if>
<if test="item.status != null">status = #{item.status},</if>
+ <if test="item.relatedCustomerName != null">related_customer_name = #{item.relatedCustomerName},</if>
<if test="item.createTime != null">create_time = #{item.createTime},</if>
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
+ <if test="item.createBy != null">create_by = #{item.createBy},</if>
</trim>
- where id = #{item.id}
+ where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.8.0