|
|
@@ -79,10 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="version" column="version" />
|
|
|
<result property="otherCost" column="other_cost" />
|
|
|
<result property="liftAmount" column="lift_amount" />
|
|
|
+ <result property="collectionRatio" column="collection_ratio" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTqContractLiftHistoryVo">
|
|
|
- select id, contract_no, contract_name, area_id, country_id, city, salesman, end_customers, trade_terms, agent_id, payment_method, currency_id, amount_of_money, signing_date, del_flag, create_time, create_by, update_time, update_by, remark, permission_char, production_order_no, contract_no_version_no, sales_model, contract_amendment_date, product_category, elevator_model, specification, count, unit_price, quotation_discount, expected_production_schedule_date, hope_to_schedule_production_date, actual_production_schedule_date, production_schedule_date, reason_for_project_cancellation_and_sus, reason_for_delayed_overdue_shipment, reason_for_non_scheduling, hope_for_delivery_date, actual_delivery_date, port, production_order_status, review_discount, review_shipping_costs, review_commission, commission_payment_date, payout_date, receiving_bank, received_amount, payment_ratio, accounts_receivable_balance, plan_adjustment_date, actual_inland_freight_cost, actual_ocean_freight, invoice_date, customs_declaration_month, subsequent_collection_of_shipping_fees, collection_date, plan_inland_freight_cost, plan_ocean_freight, project_status, rate_4_production_scheduling, rate_4_shipment, rate_4_signing_contracts, elevator_code, origin, elevator_type, quotation_no_version, project_name, quoter, additional_cost, version,other_cost,lift_amount from tq_contract_lift_history
|
|
|
+ select id,collection_ratio, contract_no, contract_name, area_id, country_id, city, salesman, end_customers, trade_terms, agent_id, payment_method, currency_id, amount_of_money, signing_date, del_flag, create_time, create_by, update_time, update_by, remark, permission_char, production_order_no, contract_no_version_no, sales_model, contract_amendment_date, product_category, elevator_model, specification, count, unit_price, quotation_discount, expected_production_schedule_date, hope_to_schedule_production_date, actual_production_schedule_date, production_schedule_date, reason_for_project_cancellation_and_sus, reason_for_delayed_overdue_shipment, reason_for_non_scheduling, hope_for_delivery_date, actual_delivery_date, port, production_order_status, review_discount, review_shipping_costs, review_commission, commission_payment_date, payout_date, receiving_bank, received_amount, payment_ratio, accounts_receivable_balance, plan_adjustment_date, actual_inland_freight_cost, actual_ocean_freight, invoice_date, customs_declaration_month, subsequent_collection_of_shipping_fees, collection_date, plan_inland_freight_cost, plan_ocean_freight, project_status, rate_4_production_scheduling, rate_4_shipment, rate_4_signing_contracts, elevator_code, origin, elevator_type, quotation_no_version, project_name, quoter, additional_cost, version,other_cost,lift_amount from tq_contract_lift_history
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectTqContractLiftHistoryList" parameterType="TqContractLiftHistory" resultMap="TqContractLiftHistoryResult">
|
|
|
@@ -154,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="additionalCost != null "> and additional_cost = #{additionalCost}</if>
|
|
|
<if test="version != null "> and version = #{version}</if>
|
|
|
<if test="otherCost != null "> and l.other_cost = #{otherCost}</if>
|
|
|
+ <if test="collectionRatio != null "> and l.collection_ratio = #{collectionRatio}</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
|
@@ -241,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="version != null">version,</if>
|
|
|
<if test="otherCost != null">other_cost,</if>
|
|
|
<if test="liftAmount != null">lift_amount,</if>
|
|
|
+ <if test="collectionRatio != null">collection_ratio,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="contractNo != null">#{contractNo},</if>
|
|
|
@@ -316,6 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="version != null">#{version},</if>
|
|
|
<if test="otherCost != null">#{otherCost},</if>
|
|
|
<if test="liftAmount != null">#{liftAmount},</if>
|
|
|
+ <if test="collectionRatio != null">#{collectionRatio},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -333,7 +337,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
actual_ocean_freight, invoice_date, customs_declaration_month, subsequent_collection_of_shipping_fees, collection_date,
|
|
|
plan_inland_freight_cost, plan_ocean_freight, project_status, rate_4_production_scheduling,
|
|
|
rate_4_shipment, rate_4_signing_contracts,elevator_code,
|
|
|
- origin,elevator_type,quotation_no_version,project_name,quoter,additional_cost,version,other_cost,lift_amount
|
|
|
+ origin,elevator_type,quotation_no_version,project_name,quoter,additional_cost,version,other_cost,lift_amount,
|
|
|
+ collection_ratio
|
|
|
)
|
|
|
values
|
|
|
<foreach collection="list" item="item" separator=",">
|
|
|
@@ -354,7 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
#{item.rate4ProductionScheduling},#{item.rate4Shipment},
|
|
|
#{item.rate4SigningContracts},#{item.elevatorCode},
|
|
|
#{item.origin},#{item.elevatorType},#{item.quotationNoVersion},#{item.projectName},#{item.quoter},#{item.additionalCost},#{item.version},#{item.otherCost},
|
|
|
- #{item.liftAmount}
|
|
|
+ #{item.liftAmount},#{item.collectionRatio}
|
|
|
)
|
|
|
</foreach>
|
|
|
</insert>
|
|
|
@@ -435,6 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="version != null">version = #{version},</if>
|
|
|
<if test="otherCost != null">other_cost = #{otherCost},</if>
|
|
|
<if test="liftAmount != null">lift_amount = #{liftAmount},</if>
|
|
|
+ <if test="collectionRatio != null">collection_ratio = #{collectionRatio},</if>
|
|
|
</trim>
|
|
|
where id = #{id}
|
|
|
</update>
|
xiewd