From 92257d291a9d171a15b22c1fc6527b1a909ac3f6 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 09 Aug 2020 15:11:30 +0800
Subject: [PATCH] 1.增加运营平台首页页面功能 2.修改检查科室名称的问题
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
index 7dac69e..2286aa9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
@@ -4,6 +4,7 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysOrganizationService;
@@ -20,7 +21,6 @@
import javax.validation.Valid;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -86,22 +86,31 @@
*/
@ApiOperation(value = "检查科室名是否存在")
@GetMapping("/checkName")
- public ResultBody checkDepName(@RequestParam Map<String, Object> params) {
- params.put("page", 1);
- params.put("limit", 1);
- if (sysDepartmentService.findList(params).getData().size() > 0) {
- return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", params.get("departmentName")));
+ public ResultBody checkDepName(Long hospitalId,String departmentName) {
+ if (departMentNameIsUsed(hospitalId,departmentName)) {
+ return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", departmentName));
}
return ResultBody.ok().msg("");
}
/**
+ * 检查科室名是否存在
+ * @param hosId
+ * @param departmentName
+ * @return
+ */
+ private Boolean departMentNameIsUsed(Long hosId,String departmentName)
+ {
+ String departName=sysDepartmentService.checkDepartmentName(hosId,departmentName);
+ return StringUtils.isNotBlank(departName);
+ }
+ /**
* 新增or更新
*/
@ApiOperation(value = "保存")
- @PostMapping
+ @PostMapping("/{hosId}")
@Transactional(rollbackFor = {Exception.class})
- public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment,@PathVariable Long hosId, BindingResult bindingResult) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -111,11 +120,8 @@
} else {
//先检查该医院该科室是否已经存在
if (sysDepartment.getId() == null) {
- Map<String, Object> checkDepartment = new HashMap<String, Object>();
- checkDepartment.put("page", 1);
- checkDepartment.put("limit", 1);
- checkDepartment.put("departmentName", sysDepartment.getDepartmentName());
- if (sysDepartmentService.findList(checkDepartment).getData().size() > 0) {
+
+ if (departMentNameIsUsed(hosId,sysDepartment.getDepartmentName())) {
return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", sysDepartment.getDepartmentName()));
}
}
--
Gitblit v1.8.0