Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 3
Родитель
Сommit
c6e831dcd6

+ 3 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -212,8 +212,9 @@ public interface OrderNewService {
 
 	int updateSalesType(TOrderNew in);
 
-	void addTaskMid(Integer id, String commodityId, String orderNo);
-	void addTaskMid(Integer id, String commodityId, String orderNo,Integer change);
+	int addTaskMid(InputAddTask inputAddTask);
+	int addTaskMid(Integer id, String commodityId, String orderNo);
+	int addTaskMid(Integer id, String commodityId, String orderNo,Integer change);
 
 	void pushExamineName(TOrderNew t);
 

+ 11 - 12
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -1064,16 +1064,22 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
 				tOrderTaskMapper.insertSelective(ot);
-				orderNewService.addTaskMid(ot.getId(),ot.getCommodityId(),ot.getOrderNo(),1);
+				InputAddTask inMid=new InputAddTask();
+				inMid.setId(ot.getId());
+				inMid.setCommodityId(ot.getCommodityId());
+				inMid.setOrderNo(ot.getOrderNo());
+				inMid.setChange(1);
+				inMid.setLastYear(cd.getLastYear());
+				inMid.setLastYearCapital(cd.getLastYearCapital());
+				inMid.setLastYearIncome(cd.getLastYearIncome());
+				orderNewService.addTaskMid(inMid);
 				if (cd.getSplitStatus()==1){
 					map.put(cd.getId(),ot.getId());
 				}
 				if (cd.getServiceLife()!=null){
 					addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				}
-				if (cd.getLastYear()!=null){
-					addTaskMid(ot.getId(),cd.getLastYear(),cd.getLastYearCapital(),cd.getLastYearIncome());
-				}
+
 				cd.setTid(ot.getId());
 				tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 				tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
@@ -1107,14 +1113,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		tTaskMidMapper.updateByTid(tTaskMid);
 	}
 
-	private void addTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
-		TTaskMid tTaskMid = new TTaskMid();
-		tTaskMid.setTid(id);
-		tTaskMid.setLastYear(lastYear);
-		tTaskMid.setLastYearCapital(lastYearCapital);
-		tTaskMid.setLastYearIncome(lastYearIncome);
-		tTaskMidMapper.insertSelective(tTaskMid);
-	}
+
 
 	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
 		TTaskMember ttm=new TTaskMember();

+ 5 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -245,25 +245,25 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public void addTaskMid(Integer id, String commodityId, String orderNo) {
+	public int addTaskMid(Integer id, String commodityId, String orderNo) {
 		InputAddTask t = new InputAddTask();
 		t.setId(id);
 		t.setCommodityId(commodityId);
 		t.setOrderNo(orderNo);
-		addTaskMid( t);
+		return  addTaskMid( t);
 	}
 
 	@Override
-	public void addTaskMid(Integer id, String commodityId, String orderNo, Integer change) {
+	public int addTaskMid(Integer id, String commodityId, String orderNo, Integer change) {
 		InputAddTask t = new InputAddTask();
 		t.setId(id);
 		t.setCommodityId(commodityId);
 		t.setOrderNo(orderNo);
 		t.setChange(change);
-		addTaskMid( t);
+		return  addTaskMid( t);
 	}
 
-
+	@Override
 	public int addTaskMid(InputAddTask t) {
 		TTaskMid tm=new TTaskMid();
 		tm.setTid(t.getId());