|
@@ -183,6 +183,26 @@ public class OrderLogLogic {
|
|
|
pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ //预约
|
|
|
+ if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YUYUEB.getRemark())){
|
|
|
+ if(pgOrderBase.getAppointmentTime() != null){
|
|
|
+ throw new RemoteServiceException("已预约工单请操作改约");
|
|
|
+ }
|
|
|
+ if(pgOrderOperatorLog.getAppointmentTime().getTime() < new Date().getTime()){
|
|
|
+ throw new RemoteServiceException("预约时间不可小于当前时间");
|
|
|
+ }
|
|
|
+
|
|
|
+ int hour = Integer.parseInt(sdf2.format(pgOrderOperatorLog.getAppointmentTime()));
|
|
|
+ String s = hour >= 12 ? "下午" : "上午";
|
|
|
+ String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+",");
|
|
|
+
|
|
|
+ String format = sdf3.format(pgOrderBase.getAppointmentTime());
|
|
|
+ String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
|
|
|
+
|
|
|
+ pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
|
|
|
+
|
|
|
+ }
|
|
|
//改约
|
|
|
if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.GAIYUE.getRemark())){
|
|
|
if(pgOrderBase.getOrderStatus().equals(OrderBaseStatusEnum.YWG.getRemark()) || pgOrderBase.getOrderStatus().equals(OrderBaseStatusEnum.YJS.getRemark())){
|