|
|
@@ -4,6 +4,8 @@ import cn.iaun.it.model.ItItsmLog;
|
|
|
import cn.iaun.it.model.ItItsmOrder;
|
|
|
import cn.iaun.it.model.ItItsmTemplate;
|
|
|
import cn.iaun.it.model.ItItsmTemplateField;
|
|
|
+import cn.iaun.it.model.vo.itsm.OrderVo;
|
|
|
+import cn.iaun.it.model.vo.itsm.TemplateVo;
|
|
|
import cn.iaun.it.model.vo.itsm.controller.*;
|
|
|
import cn.iaun.it.model.vo.user.ItUserVo;
|
|
|
import cn.iaun.it.service.ItItsmService;
|
|
|
@@ -105,7 +107,7 @@ public class ItItsmController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/order/create")
|
|
|
- public Result<?> createOrder(@Validated @RequestBody CreateOrderReqVo reqVo, @RequestAttribute("userId") Long userId) {
|
|
|
+ public Result<Long> createOrder(@Validated @RequestBody CreateOrderReqVo reqVo, @RequestAttribute("userId") Long userId) {
|
|
|
ItItsmTemplate templateInfo = itItsmService.getItsmTemplateByTemplateId(reqVo.getTemplateId());
|
|
|
if (templateInfo == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
@@ -117,8 +119,10 @@ public class ItItsmController {
|
|
|
itItsmOrder.setTemplateId(reqVo.getTemplateId());
|
|
|
itItsmOrder.setData(reqVo.getData());
|
|
|
itItsmOrder.setOrderStatus(0);
|
|
|
+ itItsmOrder.setOrderName(reqVo.getOrderName());
|
|
|
+ itItsmOrder.setCreateTime(new Date());
|
|
|
int result = itItsmService.addItsmOrder(itItsmOrder);
|
|
|
- return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
|
|
|
+ return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, itItsmOrder.getOrderId());
|
|
|
}
|
|
|
|
|
|
@PostMapping("/order/submit")
|
|
|
@@ -126,6 +130,7 @@ public class ItItsmController {
|
|
|
submitOrderReqVo.setTemplateId(null);
|
|
|
submitOrderReqVo.setCurrentUserId(null);
|
|
|
submitOrderReqVo.setOrderStatus(null);
|
|
|
+ submitOrderReqVo.setOrderName(null);
|
|
|
if (submitOrderReqVo.getOrderId() == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
}
|
|
|
@@ -216,15 +221,21 @@ public class ItItsmController {
|
|
|
return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/order/get-by-id/{i}")
|
|
|
+ public Result<OrderVo> getOrderById(@PathVariable String i, @RequestAttribute("userId") Long userId) {
|
|
|
+ Long orderId = Long.parseLong(i);
|
|
|
+ return new Result<>(ResultCode.SUCCESS, itItsmService.getOrderByOrderIdExt(orderId, userId));
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("/order/get")
|
|
|
- public Result<MyPage<ItItsmOrder>> getMyOrders(@RequestBody @Validated GetOrderVo getOrderVo, @RequestAttribute("userId") Long userId) {
|
|
|
+ public Result<MyPage<OrderVo>> getMyOrders(@RequestBody @Validated GetOrderReqVo getOrderVo, @RequestAttribute("userId") Long userId) {
|
|
|
if (getOrderVo.getPageNo() == null) {
|
|
|
getOrderVo.setPageNo(1);
|
|
|
}
|
|
|
if (getOrderVo.getPageSize() == null) {
|
|
|
getOrderVo.setPageSize(20);
|
|
|
}
|
|
|
- IPage<ItItsmOrder> page = itItsmService.getItsmOrderByIds(getOrderVo.getPageNo(), getOrderVo.getPageSize(), userId, getOrderVo.getOrderStatus());
|
|
|
+ IPage<OrderVo> page = itItsmService.getItsmOrderByStatusExt(getOrderVo.getPageNo(), getOrderVo.getPageSize(), userId, getOrderVo.getOrderStatus());
|
|
|
return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
|
|
|
}
|
|
|
|