From 4ad2f089780e34bfe0611b99285b76c2d30fa0f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 12 May 2021 13:56:44 +0800
Subject: [PATCH] screen-manage 更改单位转换显示公式
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 66cd6bb..8642de0 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -1,19 +1,11 @@
package com.moral.api.controller;
-import com.moral.api.aop.log.OperationLogAnno;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
-import com.moral.api.pojo.vo.organization.OrganizationDeleteVO;
-import com.moral.api.pojo.vo.organization.OrganizationInsertVO;
-import com.moral.api.pojo.vo.organization.OrganizationQueryVO;
-import com.moral.api.pojo.vo.organization.OrganizationUpdateVO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
+import com.moral.api.pojo.form.organization.*;
+import com.moral.api.pojo.vo.organization.*;
import com.moral.api.service.OrganizationService;
-import com.moral.api.util.LogUtils;
-import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
@@ -56,10 +48,7 @@
//������������������
OrganizationDTO dto = organizationService.insertOrganization(form);
- //���������������������������
- OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
@@ -79,10 +68,7 @@
//������������������
OrganizationDTO dto = organizationService.updateOrganization(form);
- //���������������������������
- OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
@@ -95,10 +81,7 @@
//������������������
OrganizationDTO dto = organizationService.deleteOrganization(form);
- //���������������������������
- OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
@@ -117,4 +100,16 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+ @GetMapping("queryNames")
+ public ResultMessage queryNames(OrganizationQueryNamesForm form){
+
+ //������������������
+ OrganizationQueryNamesDTO dto = organizationService.queryNames(form);
+
+ //������������������������
+ OrganizationQueryAllNamesVO vo = OrganizationQueryAllNamesVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+ }
+
}
--
Gitblit v1.8.0