|
|
@@ -41,6 +41,7 @@
|
|
|
p.id,
|
|
|
p.contract_no as contractNo,
|
|
|
p.procurement_plan as procurementPlan,
|
|
|
+ p.order_type as orderType,
|
|
|
p.goods_name as goodsName,
|
|
|
p.customer,
|
|
|
p.unit_price as unitPrice,
|
|
|
@@ -57,8 +58,10 @@
|
|
|
p.seller_phone as sellerPhone,
|
|
|
p.transactions_number as transactionsNumber,
|
|
|
p.packing_type as packingType,
|
|
|
+ p.packing_type_key as packingTypeKey,
|
|
|
p.bagging_notes as baggingNotes,
|
|
|
p.type,
|
|
|
+ p.type_key as typeKey,
|
|
|
p.status,
|
|
|
p.update_date as updateDate,
|
|
|
p.create_date as createDate,
|
|
|
@@ -96,4 +99,85 @@
|
|
|
LIMIT ${startRecord}, ${pageSize}
|
|
|
</if>
|
|
|
</select>
|
|
|
+ <!-- 获得APP我的合同列表 -->
|
|
|
+ <select id="getListByConditionApp" parameterType="Map"
|
|
|
+ resultType="com.yh.saas.plugin.yiliangyiyun.entity.PurchaseOrder">
|
|
|
+ SELECT * FROM (
|
|
|
+ SELECT
|
|
|
+ p.id,
|
|
|
+ p.contract_no as contractNo,
|
|
|
+ p.procurement_plan as procurementPlan,
|
|
|
+ p.order_type as orderType,
|
|
|
+ '' as salePlan,
|
|
|
+ p.goods_name as goodsName,
|
|
|
+ p.customer,
|
|
|
+ p.unit_price as unitPrice,
|
|
|
+ p.basis,
|
|
|
+ p.freezing_deposit as freezingDeposit,
|
|
|
+ p.default_deposit as defaultDeposit,
|
|
|
+ p.unloading_charge as unloadingCharge,
|
|
|
+ p.invoice_fee as invoiceFee,
|
|
|
+ p.open_position as openPosition,
|
|
|
+ p.closed_position as closedPosition,
|
|
|
+ p.cumulative_turnover as cumulativeTurnover,
|
|
|
+ p.trading_target as tradingTarget,
|
|
|
+ p.seller,
|
|
|
+ p.seller_phone as sellerPhone,
|
|
|
+ '' as buyer,
|
|
|
+ '' as buyerPhone,
|
|
|
+ p.transactions_number as transactionsNumber,
|
|
|
+ p.packing_type as packingType,
|
|
|
+ p.packing_type_key as packingTypeKey,
|
|
|
+ p.bagging_notes as baggingNotes,
|
|
|
+ p.type,
|
|
|
+ p.type_key as typeKey,
|
|
|
+ p.status,
|
|
|
+ p.update_date as updateDate,
|
|
|
+ p.create_date as createDate
|
|
|
+ FROM purchase_order p
|
|
|
+ WHERE
|
|
|
+ p.delete_flag = '0'
|
|
|
+ AND p.common_id = #{commonId}
|
|
|
+ UNION ALL
|
|
|
+ SELECT
|
|
|
+ s.id,
|
|
|
+ s.contract_no as contractNo,
|
|
|
+ s.sale_plan as salePlan,
|
|
|
+ s.order_type as orderType,
|
|
|
+ '' as procurementPlan,
|
|
|
+ s.goods_name as goodsName,
|
|
|
+ s.customer,
|
|
|
+ s.unit_price as unitPrice,
|
|
|
+ s.basis,
|
|
|
+ s.freezing_deposit as freezingDeposit,
|
|
|
+ s.default_deposit as defaultDeposit,
|
|
|
+ s.unloading_charge as unloadingCharge,
|
|
|
+ s.invoice_fee as invoiceFee,
|
|
|
+ s.open_position as openPosition,
|
|
|
+ s.closed_position as closedPosition,
|
|
|
+ s.cumulative_turnover as cumulativeTurnover,
|
|
|
+ s.trading_target as tradingTarget,
|
|
|
+ s.buyer,
|
|
|
+ s.buyer_phone as buyerPhone,
|
|
|
+ '' as seller,
|
|
|
+ '' as sellerPhone,
|
|
|
+ s.transactions_number as transactionsNumber,
|
|
|
+ s.packing_type as packingType,
|
|
|
+ s.packing_type_key as packingTypeKey,
|
|
|
+ s.bagging_notes as baggingNotes,
|
|
|
+ s.type,
|
|
|
+ s.type_key as typeKey,
|
|
|
+ s.status,
|
|
|
+ s.update_date as updateDate,
|
|
|
+ s.create_date as createDate
|
|
|
+ FROM sale_order s
|
|
|
+ AND s.common_id = #{commonId}
|
|
|
+ WHERE
|
|
|
+ s.delete_flag = '0'
|
|
|
+ ) a
|
|
|
+ ORDER BY updateDate DESC
|
|
|
+ <if test="currentPage != null and currentPage != ''">
|
|
|
+ LIMIT ${startRecord}, ${pageSize}
|
|
|
+ </if>
|
|
|
+ </select>
|
|
|
</mapper>
|
zhangyuewww