Pārlūkot izejas kodu

变更发起修改

anderx 9 mēneši atpakaļ
vecāks
revīzija
997dd73586

+ 50 - 40
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -120,21 +120,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<TChangeDun> listcd=new ArrayList<>();
 		if (listDun!=null&&!listDun.isEmpty()) {
 			for (OutNewOrderDunBo d : listDun) {
-				TChangeDun cd=new TChangeDun();
-				cd.setOrderNo(d.getOrderNo());
-				cd.setAid(d.getAid());
-				cd.setAppropriationRatio(d.getAppropriationRatio());
-				cd.setCid(ncb.getId());
-				cd.setDid(d.getId());
-				cd.setTid(d.getTid());
-				cd.setProjectType(d.getProjectType());
-				cd.setDunType(d.getDunType());
-				cd.setMoney(d.getMoney());
-				cd.setWaitDay(d.getWaitDay());
-				cd.setStartTime(d.getStartTime());
-				cd.setEffectiveCount(d.getEffectiveCount());
-				cd.setCustomizeTime(d.getCustomizeTime());
-				cd.setCustomizeName(d.getCustomizeName());
+				TChangeDun cd = getChangeDun(d, ncb);
 				listcd.add(cd);
 			}
 			tChangeDunMapper.insertSelectiveList(listcd);
@@ -143,31 +129,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
 		if (listTask!=null&&!listTask.isEmpty()) {
 			for (TOrderTaskBo tt : listTask) {
-				TChangeTask ck=new TChangeTask();
-				ck.setOrderNo(tt.getOrderNo());
-				ck.setCid(ncb.getId());
-				ck.setCommodityId(tt.getCommodityId());
-				ck.setOrderNo(tt.getOrderNo());
-				ck.setCommodityName(tt.getCommodityName());
-				ck.setCommodityPrice(tt.getCommodityPrice());
-				ck.setCommodityQuantity(tt.getCommodityQuantity());
-				ck.setTaskComment(tt.getTaskComment());
-				ck.setSplitStatus(tt.getSplitStatus());
-				ck.setSplitSuper(tt.getSplitSuper());
-				ck.setReceiverName(tt.getReceiverName());
-				ck.setMain(tt.getMain());
-				ck.setTid(tt.getId());
-				ck.setType(0);
-				if(tt.getServiceLife()!=null)ck.setServiceLife(tt.getServiceLife());
-				if(tt.getServiceYear()!=null)		ck.setServiceYear(tt.getServiceYear());
-				if(tt.getYearSum()!=null)	ck.setYearSum(tt.getYearSum());
-				if(tt.getContractTerm()!=null)	ck.setContractTerm(tt.getContractTerm());
-				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());
+				TChangeTask ck = getChangeTask(tt, ncb);
 				listck.add(ck);
 			}
 			tChangeTaskMapper.insertBatch(listck);
@@ -177,6 +139,54 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	return 1;
 	}
 
+	private TChangeTask getChangeTask(TOrderTaskBo tt, NewOrderChangeBo ncb) {
+		TChangeTask ck=new TChangeTask();
+		ck.setOrderNo(tt.getOrderNo());
+		ck.setCid(ncb.getId());
+		ck.setCommodityId(tt.getCommodityId());
+		ck.setOrderNo(tt.getOrderNo());
+		ck.setCommodityName(tt.getCommodityName());
+		ck.setCommodityPrice(tt.getCommodityPrice());
+		ck.setCommodityQuantity(tt.getCommodityQuantity());
+		ck.setTaskComment(tt.getTaskComment());
+		ck.setSplitStatus(tt.getSplitStatus());
+		ck.setSplitSuper(tt.getSplitSuper());
+		ck.setReceiverName(tt.getReceiverName());
+		ck.setMain(tt.getMain());
+		ck.setTid(tt.getId());
+		ck.setType(0);
+		if(tt.getServiceLife()!=null)ck.setServiceLife(tt.getServiceLife());
+		if(tt.getServiceYear()!=null)		ck.setServiceYear(tt.getServiceYear());
+		if(tt.getYearSum()!=null)	ck.setYearSum(tt.getYearSum());
+		if(tt.getContractTerm()!=null)	ck.setContractTerm(tt.getContractTerm());
+		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());
+		return ck;
+	}
+
+	private TChangeDun getChangeDun(OutNewOrderDunBo d, NewOrderChangeBo ncb) {
+		TChangeDun cd=new TChangeDun();
+		cd.setOrderNo(d.getOrderNo());
+		cd.setAid(d.getAid());
+		cd.setAppropriationRatio(d.getAppropriationRatio());
+		cd.setCid(ncb.getId());
+		cd.setDid(d.getId());
+		cd.setTid(d.getTid());
+		cd.setProjectType(d.getProjectType());
+		cd.setDunType(d.getDunType());
+		cd.setMoney(d.getMoney());
+		cd.setWaitDay(d.getWaitDay());
+		cd.setStartTime(d.getStartTime());
+		cd.setEffectiveCount(d.getEffectiveCount());
+		cd.setCustomizeTime(d.getCustomizeTime());
+		cd.setCustomizeName(d.getCustomizeName());
+		return cd;
+	}
+
 	/*
 	 * 新增审核流程中的
 	 */