|
|
@@ -703,30 +703,28 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tNew.setOrderNo(task.getOrderNo());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(tNew);
|
|
|
}
|
|
|
- if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()||task.getProjectStatus()==NewProjectStatus.YLX.getCode()||
|
|
|
- task.getProjectStatus()==NewProjectStatus.YNGS.getCode()) {
|
|
|
- TOrderBonus tb=new TOrderBonus();
|
|
|
- TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
|
|
|
- tb.setId(UUID.randomUUID().toString());
|
|
|
- tb.setOrderNo(task.getOrderNo());
|
|
|
- if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()) {
|
|
|
- tb.setBonusSubject(21);//项目已提交
|
|
|
- addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode(),null);
|
|
|
- }
|
|
|
- if (task.getProjectStatus()==NewProjectStatus.YLX.getCode())tb.setBonusSubject(23);//项目立项
|
|
|
- if (task.getProjectStatus()==NewProjectStatus.YNGS.getCode())tb.setBonusSubject(24);//项目公示
|
|
|
- tb.setGrantType(1);//技术员
|
|
|
- //新增奖金之前检查这个奖金数据是否存在
|
|
|
- tb.setGrantTarget(task.getTaskReceiver());
|
|
|
- int c = tOrderBonusMapper.checkByOnoAndSub(tb);
|
|
|
- if(c==0){
|
|
|
- tb.setGrantBy(t.getFinanceId());
|
|
|
- tb.setTaskId(task.getId());
|
|
|
- tOrderBonusMapper.insertSelective(tb);
|
|
|
- }
|
|
|
-
|
|
|
+ if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()||task.getProjectStatus()==NewProjectStatus.YLX.getCode()||
|
|
|
+ task.getProjectStatus()==NewProjectStatus.YNGS.getCode()) {
|
|
|
+ TOrderBonus tb=new TOrderBonus();
|
|
|
+ TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
|
|
|
+ tb.setId(UUID.randomUUID().toString());
|
|
|
+ tb.setOrderNo(task.getOrderNo());
|
|
|
+ if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()) {
|
|
|
+ tb.setBonusSubject(21);//项目已提交
|
|
|
+ addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode(),null);
|
|
|
}
|
|
|
-
|
|
|
+ if (task.getProjectStatus()==NewProjectStatus.YLX.getCode())tb.setBonusSubject(23);//项目立项
|
|
|
+ if (task.getProjectStatus()==NewProjectStatus.YNGS.getCode())tb.setBonusSubject(24);//项目公示
|
|
|
+ tb.setGrantType(1);//技术员
|
|
|
+ //新增奖金之前检查这个奖金数据是否存在
|
|
|
+ tb.setGrantTarget(task.getTaskReceiver());
|
|
|
+ int c = tOrderBonusMapper.checkByOnoAndSub(tb);
|
|
|
+ if(c==0){
|
|
|
+ tb.setGrantBy(t.getFinanceId());
|
|
|
+ tb.setTaskId(task.getId());
|
|
|
+ tOrderBonusMapper.insertSelective(tb);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|