From b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 03 Sep 2023 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 c632470..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
@@ -108,9 +108,26 @@
@GetMapping("queryById")
- public ResultMessage queryById(Integer id){
- VersionDTO dto = versionService.queryVersionById(id);
- VersionVO vo = VersionVO.convert(dto);
+ 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