|
|
@@ -127,6 +127,8 @@ public class ItItsmController {
|
|
|
itItsmOrder.setOrderStatus(0);
|
|
|
itItsmOrder.setOrderName(reqVo.getOrderName());
|
|
|
itItsmOrder.setCreateTime(new Date());
|
|
|
+ itItsmOrder.setProcessed(0);
|
|
|
+ itItsmOrder.setProcessedUser(templateUserId);
|
|
|
int result = itItsmService.addItsmOrder(itItsmOrder);
|
|
|
|
|
|
ItItsmLog log = new ItItsmLog();
|
|
|
@@ -192,6 +194,7 @@ public class ItItsmController {
|
|
|
updateData.setOrderStatus(1);
|
|
|
updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
|
|
|
updateData.setReply(submitOrderReqVo.getReply());
|
|
|
+ updateData.setProcessed(1);
|
|
|
|
|
|
if (submitOrderReqVo.getRemark().isEmpty()) {
|
|
|
log.setLog("已通过");
|
|
|
@@ -209,6 +212,7 @@ public class ItItsmController {
|
|
|
}
|
|
|
updateData.setOrderStatus(2);
|
|
|
updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
|
|
|
+ updateData.setProcessed(1);
|
|
|
|
|
|
if (submitOrderReqVo.getRemark().isEmpty()) {
|
|
|
log.setLog("已退回");
|
|
|
@@ -241,6 +245,8 @@ public class ItItsmController {
|
|
|
updateData.setOrderStatus(0);
|
|
|
updateData.setCurrentUserId(template.getTemplateUser());
|
|
|
updateData.setData(submitOrderReqVo.getData());
|
|
|
+ updateData.setProcessed(0);
|
|
|
+ updateData.setProcessedUser(template.getTemplateUser());
|
|
|
log.setLog("重新提交");
|
|
|
}
|
|
|
break;
|
|
|
@@ -269,14 +275,14 @@ public class ItItsmController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/admin/order/get")
|
|
|
- public Result<MyPage<ItItsmOrder>> adminGetOrders(@RequestBody @Validated AdminGetOrderVo vo, @RequestAttribute("userId") Long userId) {
|
|
|
+ public Result<MyPage<OrderVo>> adminGetOrders(@RequestBody @Validated AdminGetOrderVo vo, @RequestAttribute("userId") Long userId) {
|
|
|
if (vo.getPageNo() == null) {
|
|
|
vo.setPageNo(1);
|
|
|
}
|
|
|
if (vo.getPageSize() == null) {
|
|
|
vo.setPageSize(20);
|
|
|
}
|
|
|
- IPage<ItItsmOrder> page = itItsmService.adminGetItsmOrder(vo.getPageNo(), vo.getPageSize(), userId, vo.getProcessed());
|
|
|
+ IPage<OrderVo> page = itItsmService.adminGetItsmOrder(vo.getPageNo(), vo.getPageSize(), userId, vo.getProcessed());
|
|
|
return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
|
|
|
}
|
|
|
|