From 5c1b7da4cecaf44871695d08595289f8def72021 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 09:10:33 +0800
Subject: [PATCH] screen-manage 删除组织时，判断该组织是否还包含该型号，如果没有该型号，则维护型号组织关系表
---
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
index c5e4db8..e87b805 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
@@ -105,10 +105,30 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
- @GetMapping("test")
- public ResultMessage test(){
- System.out.println(TokenUtils.getCurrentToken());
- return null;
+
+
+ @GetMapping("queryById")
+ public ResultMessage queryById(VersionQueryByIdForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ VersionQueryDTO dto = versionService.queryVersionById(form);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @GetMapping("queryByOrgId")
+ public ResultMessage queryByOrganizationId(Integer organizationId){
+
+ VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
}
--
Gitblit v1.8.0