|
@@ -336,7 +336,22 @@ public class BmsEventOrderService {
|
|
|
assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
|
|
|
chambList.add(assignVO);
|
|
|
}
|
|
|
+ } else if(mainVO == null && assignVO != null) {
|
|
|
+ //设置指派管家状态
|
|
|
+ if(ChambStatusEnum.BUSY.getValue().equals(assignVO.getStatus())) { //指派管家的主状态是忙碌时拆分子状态
|
|
|
+ if(ChambOrderStatusEnum.DOING.equals(careEventOrderChamb.getStatus())){
|
|
|
+ assignVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
|
|
|
+ } else {
|
|
|
+ assignVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
|
|
|
+ }
|
|
|
+ } else {//指派管家的主状态不是忙碌时设置子状态和主状态相同
|
|
|
+ assignVO.setSubStatus(assignVO.getStatus());
|
|
|
+ }
|
|
|
+
|
|
|
+ assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
|
|
|
+ chambList.add(assignVO);
|
|
|
}
|
|
|
+
|
|
|
return chambList;
|
|
|
}
|
|
|
|