|
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="shipmentPort" column="shipment_port" />
|
|
|
<result property="destinationPort" column="destination_port" />
|
|
|
<result property="shipmentDeadline" column="shipment_deadline" />
|
|
|
+ <result property="version" column="version" />
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="com.ruoyi.project.business.domain.vo.contract.TqContractVo" id="TqContractVoResult" extends="TqContractResult">
|
|
@@ -54,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTqContractVo">
|
|
|
- select id, contract_no, contract_name, area_id, country_id, city, salesman, end_customers, trade_terms, agent_id, payment_method, sales_model, currency_id, amount, signing_date, payment_ratio, approve_status, permission_char, del_flag, create_time, create_by, update_time, update_by, remark, status, rate_4_signing_contracts, address, telephone, email, shipping_mark, shipment_port, destination_port, shipment_deadline from tq_contract
|
|
|
+ select id,version, contract_no, contract_name, area_id, country_id, city, salesman, end_customers, trade_terms, agent_id, payment_method, sales_model, currency_id, amount, signing_date, payment_ratio, approve_status, permission_char, del_flag, create_time, create_by, update_time, update_by, remark, status, rate_4_signing_contracts, address, telephone, email, shipping_mark, shipment_port, destination_port, shipment_deadline from tq_contract
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectTqContractList" parameterType="TqContract" resultMap="TqContractResult">
|
|
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="shipmentPort != null and shipmentPort != ''"> and shipment_port = #{shipmentPort}</if>
|
|
|
<if test="destinationPort != null and destinationPort != ''"> and destination_port = #{destinationPort}</if>
|
|
|
<if test="shipmentDeadline != null "> and shipment_deadline = #{shipmentDeadline}</if>
|
|
|
+ <if test="version != null "> and version = #{version}</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
@@ -198,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
|
|
|
<if test="endCustomersName != null "> and account.account_name like concat('%', #{endCustomersName}, '%')</if>
|
|
|
+ <if test="version != null "> and ah.version = #{version}</if>
|
|
|
</where>
|
|
|
order by ah.id desc
|
|
|
</select>
|
|
@@ -296,6 +299,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="version != null "> and ah.version = #{version}</if>
|
|
|
</where>
|
|
|
order by ah.id desc
|
|
|
</select>
|
|
@@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="shipmentPort != null">shipment_port,</if>
|
|
|
<if test="destinationPort != null">destination_port,</if>
|
|
|
<if test="shipmentDeadline != null">shipment_deadline,</if>
|
|
|
+ <if test="version != null">version,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="contractNo != null">#{contractNo},</if>
|
|
@@ -370,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="shipmentPort != null">#{shipmentPort},</if>
|
|
|
<if test="destinationPort != null">#{destinationPort},</if>
|
|
|
<if test="shipmentDeadline != null">#{shipmentDeadline},</if>
|
|
|
+ <if test="version != null">#{version},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
@@ -409,6 +415,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="shipmentPort != null">shipment_port = #{shipmentPort},</if>
|
|
|
<if test="destinationPort != null">destination_port = #{destinationPort},</if>
|
|
|
<if test="shipmentDeadline != null">shipment_deadline = #{shipmentDeadline},</if>
|
|
|
+ <if test="version != null">version = #{version},</if>
|
|
|
</trim>
|
|
|
where id = #{id}
|
|
|
</update>
|