Преглед изворни кода

新增变更会员子项修改主项勾选

anderx пре 10 месеци
родитељ
комит
6e53f692a7

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

@@ -773,7 +773,8 @@ unilateral_service = values(unilateral_service)
         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.change_split_super changeSplitSuper
+        a.patent_type patentType,a.contract_term contractTerm,a.change_split_super changeSplitSuper,
+        a.ht_member htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy
         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}

+ 14 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1672,7 +1672,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (tChangeTask.getType()!=1)tChangeTask.setType(2);
 		TChangeTask newT=new TChangeTask();
 		BeanUtils.copyProperties(tChangeTask,newT);
-		tChangeTaskMapper.update(tChangeTask);
+
 		//在判断是否有删除的年份没有就新增
 		newT.setId(null);
 		newT.setTid(null);
@@ -1688,12 +1688,25 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		newT.setTaskComment(in.getTaskComment());
 		newT.setServiceYear(in.getServiceYear());
 		tChangeTaskMapper.insertSelective(tChangeTask);
+
+
 		//根据上级id修改上级
 		updateSuperServiceYear(tChangeTask);
 		return tChangeTask;
 	}
 
 	public  void updateSuperServiceYear(TChangeTask tChangeTask) {
+		List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(null, tChangeTask.getId(), tChangeTask.getCid());
+		int a=0,b=0,c=0;
+		for (TChangeTask e : tChangeTasks) {
+			if (e.getHtMember()!=null)a=e.getHtMember();
+			if (e.getAdditionalDeduction()!=null)b=e.getAdditionalDeduction();
+			if (e.getRdAwardsubsidy()!=null)c=e.getRdAwardsubsidy();
+		}
+		tChangeTask.setHtMember(a);
+		tChangeTask.setAdditionalDeduction(b);
+		tChangeTask.setRdAwardsubsidy(c);
+		tChangeTaskMapper.update(tChangeTask);
 		if(tChangeTask.getSplitSuper()!=null){
 			tChangeTaskMapper.updateSuperServiceYear(tChangeTask);
 		}else {