|
@@ -148,7 +148,7 @@ public class KeeperOrderApiService {
|
|
|
if (mainVO != null && assignVO != null) {
|
|
|
if(mainVO.getId().equals(assignVO.getId())){ //没有指派管家
|
|
|
if(ChambStatusEnum.BUSY.getValue().equals(mainVO.getStatus())){ //主状态是忙碌时拆分子状态
|
|
|
- if(ChambOrderStatusEnum.DOING.equals(careEventOrderChamb.getStatus())){
|
|
|
+ if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
|
|
|
mainVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
|
|
|
} else {
|
|
|
mainVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
|
|
@@ -164,7 +164,7 @@ public class KeeperOrderApiService {
|
|
|
|
|
|
//设置指派管家状态
|
|
|
if(ChambStatusEnum.BUSY.getValue().equals(assignVO.getStatus())) { //指派管家的主状态是忙碌时拆分子状态
|
|
|
- if(ChambOrderStatusEnum.DOING.equals(careEventOrderChamb.getStatus())){
|
|
|
+ if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
|
|
|
assignVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
|
|
|
} else {
|
|
|
assignVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
|
|
@@ -180,7 +180,7 @@ public class KeeperOrderApiService {
|
|
|
} else if(mainVO == null && assignVO != null) {
|
|
|
//设置指派管家状态
|
|
|
if(ChambStatusEnum.BUSY.getValue().equals(assignVO.getStatus())) { //指派管家的主状态是忙碌时拆分子状态
|
|
|
- if(ChambOrderStatusEnum.DOING.equals(careEventOrderChamb.getStatus())){
|
|
|
+ if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
|
|
|
assignVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
|
|
|
} else {
|
|
|
assignVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
|