Browse Source

发起变更不同步会员勾选处理

anderx 9 months ago
parent
commit
2ae17107b0

+ 2 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1689,7 +1689,8 @@ progress_tid = values(progress_tid)
         a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
         a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime,a.patent_type patentType,ttm.contract_term contractTerm,
         a.picture_url pictureUrl, ttm.service_life serviceLife ,ttm.service_year serviceYear,ttm.year_sum yearSum,
-        tm.last_year lastYear,tm.last_year_capital lastYearCapital,tm.last_year_income lastYearIncome
+        tm.last_year lastYear,tm.last_year_capital lastYearCapital,tm.last_year_income lastYearIncome,
+        a.ht_member htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy
         from t_order_task a left join t_order_new e on a.order_no=e.order_no left join admin f on e.salesman_id=f.id
         left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id left join business_project i on a.commodity_id=i.id
         left join business_category c on i.cid=c.id left join admin d on a.task_receiver=d.id

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -165,6 +165,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if(tt.getLastYear()!=null)	ck.setLastYear(tt.getLastYear());
 				if(tt.getLastYearCapital()!=null)	ck.setLastYearCapital(tt.getLastYearCapital());
 				if(tt.getLastYearIncome()!=null)	ck.setLastYearIncome(tt.getLastYearIncome());
+				if (tt.getHtMember()!=null) ck.setHtMember(tt.getHtMember());
+				if (tt.getAdditionalDeduction()!=null) ck.setAdditionalDeduction(tt.getAdditionalDeduction());
+				if (tt.getRdAwardsubsidy()!=null) ck.setRdAwardsubsidy(tt.getRdAwardsubsidy());
 				listck.add(ck);
 			}
 			tChangeTaskMapper.insertBatch(listck);