|
|
@@ -478,7 +478,7 @@ unilateral_service = values(unilateral_service)
|
|
|
order_no ,
|
|
|
</if>
|
|
|
<if test="main != null">
|
|
|
- main = ,
|
|
|
+ main ,
|
|
|
</if>
|
|
|
<if test="commodityId != null and commodityId != ''">
|
|
|
commodity_id ,
|
|
|
@@ -681,7 +681,6 @@ unilateral_service = values(unilateral_service)
|
|
|
#{unilateralService},
|
|
|
</if>
|
|
|
</trim>
|
|
|
- where id = #{id}
|
|
|
</insert>
|
|
|
|
|
|
<select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
|
|
|
@@ -690,7 +689,7 @@ unilateral_service = values(unilateral_service)
|
|
|
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,i.patent_transfer patentTransfer,
|
|
|
i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,a.cost_reduction costReduction,
|
|
|
- a.change_split_super changeSplitSuper,a.last_year lastYear,a.last_year_income lastYearIncome,a.last_year_capital lastYearCapital,
|
|
|
+ a.change_split_super changeSplitSuper,a.last_year lastYear,a.last_year_income lastYearIncome,a.last_year_capital lastYearCapital,i.project_type as projectType,
|
|
|
a.ht_member htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy,a.just_forms justForms,
|
|
|
a.technology_project_Type technologyProjectType,a.ordinary_risk ordinaryRisk,a.days,a.scheme,a.unilateral_service unilateralService
|
|
|
from t_change_task a left join business_project i on a.commodity_id=i.id
|