|
@@ -10,6 +10,7 @@ import com.palmnest.application.dto.OrgDto;
|
|
import com.palmnest.application.dto.WebPageResultDto;
|
|
import com.palmnest.application.dto.WebPageResultDto;
|
|
import com.palmnest.application.dto.input.AirConditionerAddTimeInputDto;
|
|
import com.palmnest.application.dto.input.AirConditionerAddTimeInputDto;
|
|
import com.palmnest.model.AppUserFloorRelation;
|
|
import com.palmnest.model.AppUserFloorRelation;
|
|
|
|
+import com.palmnest.model.RoomInfo;
|
|
import com.palmnest.model.User;
|
|
import com.palmnest.model.User;
|
|
import com.palmnest.model.property.VirtualArchitecture;
|
|
import com.palmnest.model.property.VirtualArchitecture;
|
|
import com.palmnest.service.AppUserService;
|
|
import com.palmnest.service.AppUserService;
|
|
@@ -27,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.ui.ExtendedModelMap;
|
|
import org.springframework.ui.ExtendedModelMap;
|
|
import org.springframework.ui.Model;
|
|
import org.springframework.ui.Model;
|
|
-import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
-import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -617,4 +615,17 @@ public class AirConditionerAddTimeController {
|
|
return new ModelAndView("/admin/airConditionalManage/overtimeReport", model.asMap());
|
|
return new ModelAndView("/admin/airConditionalManage/overtimeReport", model.asMap());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 获取空调加时订单下单时 所有可用的房间信息
|
|
|
|
+ * @param orderNo 空调加时订单编号
|
|
|
|
+ * @return 房间信息列表
|
|
|
|
+ */
|
|
|
|
+ @RequestMapping(value = "/addTimeOrderHistoryRooms", method = RequestMethod.GET)
|
|
|
|
+ @ResponseBody
|
|
|
|
+ public AppResultDto getAddTimeOrderHistoryRooms(@RequestParam("orderNo") String orderNo, HttpServletRequest request) {
|
|
|
|
+ User user = (User) request.getSession().getAttribute("UserCache");
|
|
|
|
+ log.info("获取空调加时订单下单时 所有可用的房间信息, user: {}, orderNo:{}", user.getFullName(), orderNo);
|
|
|
|
+ List<RoomInfo> list = conditionerAddTimeService.getAddTimeOrderHistoryRooms(orderNo);
|
|
|
|
+ return AppResultUtil.createSuccesDto(list);
|
|
|
|
+ }
|
|
}
|
|
}
|