|
|
@@ -34,6 +34,12 @@ public class ItItsmController {
|
|
|
return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplate());
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/template/get-by-id/{id}")
|
|
|
+ public Result<TemplateVo> getItsmTemplateById(@PathVariable String id) {
|
|
|
+ Long templateId = Long.parseLong(id);
|
|
|
+ return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmTemplateById(templateId));
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("/admin/template/add")
|
|
|
public Result<?> addItsmTemplate(@Validated @RequestBody ItItsmTemplate itItsmTemplate) {
|
|
|
itItsmTemplate.setTemplateId(null);
|
|
|
@@ -122,6 +128,14 @@ public class ItItsmController {
|
|
|
itItsmOrder.setOrderName(reqVo.getOrderName());
|
|
|
itItsmOrder.setCreateTime(new Date());
|
|
|
int result = itItsmService.addItsmOrder(itItsmOrder);
|
|
|
+
|
|
|
+ ItItsmLog log = new ItItsmLog();
|
|
|
+ log.setOrderId(itItsmOrder.getOrderId());
|
|
|
+ log.setUserId(userId);
|
|
|
+ log.setTime(new Date());
|
|
|
+ log.setLog("创建了工单:" + reqVo.getOrderName());
|
|
|
+
|
|
|
+ itItsmService.addItsmLog(log);
|
|
|
return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, itItsmOrder.getOrderId());
|
|
|
}
|
|
|
|
|
|
@@ -149,7 +163,9 @@ public class ItItsmController {
|
|
|
log.setOrderId(submitOrderReqVo.getOrderId());
|
|
|
log.setUserId(userId);
|
|
|
log.setTime(new Date());
|
|
|
-
|
|
|
+ if (submitOrderReqVo.getSubmitType() == null) {
|
|
|
+ return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
+ }
|
|
|
switch (submitOrderReqVo.getSubmitType()) {
|
|
|
case 0:
|
|
|
case 1:
|
|
|
@@ -159,9 +175,9 @@ public class ItItsmController {
|
|
|
break;
|
|
|
case 2:
|
|
|
case 3:
|
|
|
- if (roleId != 1) {
|
|
|
- return new Result<>(ResultCode.PERM_NO_PERMISSION);
|
|
|
- }
|
|
|
+// if (roleId != 1) {
|
|
|
+// return new Result<>(ResultCode.PERM_NO_PERMISSION);
|
|
|
+// }
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -170,6 +186,9 @@ public class ItItsmController {
|
|
|
if (submitOrderReqVo.getReply() == null || submitOrderReqVo.getRemark() == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
} else {
|
|
|
+ if (dbData.getOrderStatus() != 0) {
|
|
|
+ return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
|
|
|
+ }
|
|
|
updateData.setOrderStatus(1);
|
|
|
updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
|
|
|
updateData.setReply(submitOrderReqVo.getReply());
|
|
|
@@ -185,6 +204,9 @@ public class ItItsmController {
|
|
|
if (submitOrderReqVo.getRemark() == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
} else {
|
|
|
+ if (dbData.getOrderStatus() != 0) {
|
|
|
+ return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
|
|
|
+ }
|
|
|
updateData.setOrderStatus(2);
|
|
|
updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
|
|
|
|
|
|
@@ -199,6 +221,9 @@ public class ItItsmController {
|
|
|
if (submitOrderReqVo.getEvaluate() == null || submitOrderReqVo.getComment() == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
} else {
|
|
|
+ if (dbData.getOrderStatus() != 1) {
|
|
|
+ return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
|
|
|
+ }
|
|
|
updateData.setEvaluate(submitOrderReqVo.getEvaluate());
|
|
|
updateData.setComment(submitOrderReqVo.getComment());
|
|
|
updateData.setOrderStatus(3);
|
|
|
@@ -209,6 +234,9 @@ public class ItItsmController {
|
|
|
if (submitOrderReqVo.getData() == null) {
|
|
|
return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
} else {
|
|
|
+ if (dbData.getOrderStatus() != 2) {
|
|
|
+ return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
|
|
|
+ }
|
|
|
ItItsmTemplate template = itItsmService.getItsmTemplateByTemplateId(dbData.getTemplateId());
|
|
|
updateData.setCurrentUserId(template.getTemplateUser());
|
|
|
updateData.setData(submitOrderReqVo.getData());
|