From 519a87f05bd981ae4fcb56fb4cbe56cd119e24b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 df65704..e06449c 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
@@ -1,27 +1,24 @@
package com.kidgrow.usercenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysDepartment;
+import com.kidgrow.usercenter.service.ISysDepartmentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysDepartment;
-import com.kidgrow.usercenter.service.ISysDepartmentService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,9 +80,21 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
+ //先检查该医院下的该科室名是否已经存在？
+ SysDepartment sysDepartmentTemp=new SysDepartment();
+ sysDepartmentTemp.setHospitalId(sysDepartment.getHospitalId());
+ sysDepartmentTemp.setDepartmentName(sysDepartment.getDepartmentName().trim());
+ sysDepartmentTemp=sysDepartmentService.findByObject(sysDepartmentTemp);
+ if (sysDepartmentTemp!=null) {
+ return ResultBody.failed().msg(String.format("该医院下已经存在 %s",sysDepartment.getDepartmentName()));
+ }
boolean v= sysDepartmentService.saveOrUpdate(sysDepartment);
if(v) {
return ResultBody.ok().data(sysDepartment).msg("保存成功");
@@ -110,4 +119,14 @@
return ResultBody.failed().msg("删除失败");
}
}
+
+ /**
+ * 根据医院获取 组织，通过组织，获取科室；
+ * @param params
+ * @return
+ */
+ @GetMapping("findListByHospitalId")
+ public ResultBody findListByHospitalId(@RequestParam Map<String, Object> params) {
+ return sysDepartmentService.findListByHospitalId(params);
+ }
}
--
Gitblit v1.8.0