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

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git into test

limin лет назад: 7
Родитель
Сommit
7954bcf4b4
1 измененных файлов с 2 добавлено и 0 удалено
  1. 2 0
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -196,12 +196,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()||task.getProjectStatus()==ProjectNewStage.LS.getCode()||
 			if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()||task.getProjectStatus()==ProjectNewStage.LS.getCode()||
 					task.getProjectStatus()==ProjectNewStage.GS.getCode()) {
 					task.getProjectStatus()==ProjectNewStage.GS.getCode()) {
 				TOrderBonus tb=new TOrderBonus();
 				TOrderBonus tb=new TOrderBonus();
+				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
 				tb.setId(UUID.randomUUID().toString());
 				tb.setId(UUID.randomUUID().toString());
 				tb.setOrderNo(task.getOrderNo());
 				tb.setOrderNo(task.getOrderNo());
 				if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode())tb.setBonusSubject(21);//项目已提交
 				if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode())tb.setBonusSubject(21);//项目已提交
 				if (task.getProjectStatus()==ProjectNewStage.LS.getCode())tb.setBonusSubject(23);//项目立项
 				if (task.getProjectStatus()==ProjectNewStage.LS.getCode())tb.setBonusSubject(23);//项目立项
 				if (task.getProjectStatus()==ProjectNewStage.GS.getCode())tb.setBonusSubject(24);//项目公示
 				if (task.getProjectStatus()==ProjectNewStage.GS.getCode())tb.setBonusSubject(24);//项目公示
 				tb.setGrantTarget(task.getTaskReceiver());
 				tb.setGrantTarget(task.getTaskReceiver());
+				tb.setGrantBy(t.getFinanceId());
 				tb.setGrantType(1);//技术员
 				tb.setGrantType(1);//技术员
 				tOrderBonusMapper.insertSelective(tb);
 				tOrderBonusMapper.insertSelective(tb);