|
|
@@ -329,8 +329,9 @@
|
|
|
select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,a.official_cost officialCost,
|
|
|
a.official_cost officialCost, a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
|
|
|
a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
|
|
|
- a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,
|
|
|
- a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm
|
|
|
+ a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,i.patent_transfer patentTransfer,
|
|
|
+ i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,
|
|
|
+ a.change_split_super changeSplitSuper
|
|
|
from t_change_task a left join business_project i on a.commodity_id=i.id
|
|
|
left join business_category c on i.cid=c.id
|
|
|
where 1=1
|
|
|
@@ -338,7 +339,7 @@
|
|
|
and a.split_status= #{splitStatus}
|
|
|
</if>
|
|
|
<if test="splitStatus ==3">
|
|
|
- and a.split_status !=2
|
|
|
+ and a.split_status in (0,1)
|
|
|
</if>
|
|
|
and a.cid= #{id} order by a.id
|
|
|
</select>
|
|
|
@@ -391,7 +392,9 @@
|
|
|
<select id="selectBySuper" resultType="com.goafanti.order.bo.TChangeTaskOut">
|
|
|
select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
|
|
|
a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,a.receiver_name receiverName,
|
|
|
- a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper
|
|
|
+ a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper,
|
|
|
+ a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum, a.declaration_batch declarationBatch,
|
|
|
+ a.patent_type patentType,a.contract_term contractTerm,a.change_split_super changeSplitSuper
|
|
|
from t_change_task a left join business_project i on a.commodity_id=i.id
|
|
|
left join business_category c on i.cid=c.id
|
|
|
where a.split_status=2 and a.cid= #{cid}
|