|
|
@@ -525,6 +525,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tOrderExamineMapper.deleteByOrderNo(t.getOrderNo());
|
|
|
addOrderExamine(t);
|
|
|
}
|
|
|
+
|
|
|
//订单提交
|
|
|
if (isSubmit==1) {
|
|
|
t2.setApproval(t.getApproval());
|
|
|
@@ -548,7 +549,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
}
|
|
|
//特批逻辑处理
|
|
|
- if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
|
|
|
+ if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()||
|
|
|
+ t2.getApproval()==ApprovalNewState.DSZBH.getCode()||
|
|
|
+ t2.getApproval()== ApprovalNewState.FZCBH.getCode()||
|
|
|
+ t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
|
|
|
if (a.getId().equals(AFTConstants.CAOJIN_AID)){
|
|
|
t.setApproval(ApprovalNewState.DSZDSH.getCode());
|
|
|
}else {
|
|
|
@@ -560,13 +564,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()){
|
|
|
- t.setApproval(ApprovalNewState.ZCDSH.getCode());
|
|
|
- }else if (t2.getApproval()==ApprovalNewState.DSZBH.getCode()){
|
|
|
- t.setApproval(ApprovalNewState.DSZDSH.getCode());
|
|
|
- }else if (t2.getApproval()== ApprovalNewState.FZCBH.getCode()){
|
|
|
- t.setApproval(ApprovalNewState.FZCDSH.getCode());
|
|
|
- }
|
|
|
//生成流转
|
|
|
if (StringUtils.isBlank(t2.getContractNo())) {
|
|
|
//没有合同编号则生成
|