|
@@ -198,7 +198,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
|
|
OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
|
|
|
List<TOrderExamine> list =new ArrayList<>();
|
|
List<TOrderExamine> list =new ArrayList<>();
|
|
|
if(!Objects.isNull(dep)){
|
|
if(!Objects.isNull(dep)){
|
|
|
- if (!Objects.isNull(dep.getFinanceId())){
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(dep.getFinanceId())){
|
|
|
list.add(new TOrderExamine(o.getOrderNo(),0,dep.getFinanceId(),dep.getFinanceName()));
|
|
list.add(new TOrderExamine(o.getOrderNo(),0,dep.getFinanceId(),dep.getFinanceName()));
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(dep.getRetrialFinanceId())){
|
|
if (StringUtils.isNotBlank(dep.getRetrialFinanceId())){
|
|
@@ -1481,6 +1481,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (confirm==2) {
|
|
if (confirm==2) {
|
|
|
if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCTG.getCode());
|
|
if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCTG.getCode());
|
|
|
else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZTG.getCode());
|
|
else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZTG.getCode());
|
|
|
|
|
+ else if (t2.getApproval()==ApprovalNewState.FZCDSH.getCode())t.setApproval(ApprovalNewState.FZCTG.getCode());
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
|
|
OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
t.setFinanceId(oo.getFinanceId());
|