|
|
@@ -875,6 +875,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setSignTotalAmount(new BigDecimal(signTotalAmount));
|
|
|
tOrder.setOrderStage(OrderStage.SIGNED.getCode());
|
|
|
tOrder.setOrderStatus(OrderState.ALREADY_SIGN.getCode());
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
tOrder.setApproval(Integer.valueOf(approval));
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -1275,5 +1276,25 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int approvalServiceOrder(String orderNo, Integer confirm) {
|
|
|
+ TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ checkOrder(tOrder);
|
|
|
+ if(tOrder.getProjectStage() != ProjectStage.NOT_SATISFY_CONDITION.getCode()
|
|
|
+ || tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
+ || tOrder.getOrderStage() != OrderStage.SIGNED.getCode()
|
|
|
+ || tOrder.getApproval() != ApprovalState.WAIT_AUDIT.getCode()){
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo , ""));
|
|
|
+ }
|
|
|
+ tOrder.setUpdateTime(new Date());
|
|
|
+ if(confirm == AFTConstants.YES){
|
|
|
+ tOrder.setApproval(ApprovalState.AUDIT_PASS.getCode());
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ }else if(confirm == AFTConstants.NO){
|
|
|
+ tOrder.setApproval(ApprovalState.AUDIT_REFUSE.getCode());
|
|
|
+ }
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
}
|