From ec0f2528f83ee7c6ec64537d561a697ffff5b5c3 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 21 Apr 2020 15:27:04 +0800
Subject: [PATCH] 1.组织，医院，科室的编辑业务调整，增加了联动编辑功能（创建医院自动创建组织数据，修改同理） 2.重新优化，调整了医院/科室编辑过程中对名称的检查，数据间依赖关系的调整 3.调整优化了区域联动插件，自动完成插件的通用性
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
index 706b955..d0d2124 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
@@ -1,23 +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.common.model.SysOrganization;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
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.service.ISysOrganizationService;
-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 java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -52,12 +53,45 @@
}
return ResultBody.ok().data(sysOrganizationService.findList(params));
}
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "模糊查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("/listByName")
+ public ResultBody listByName(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ if (params.get("orgName")!=null) {
+ return ResultBody.ok().data(sysOrganizationService.findList(params).getData());
+ }
+ else
+ {
+ return ResultBody.ok().data(null);
+ }
+ }
@ApiOperation(value = "查询列表by MAP")
@GetMapping("getListByMap")
public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
return sysOrganizationService.getListByMap(params);
}
+ @ApiOperation(value = "获取tree")
+ @GetMapping("getTree")
+ public ResultBody getTree(@RequestParam Map<String, Object> params) {
+ return sysOrganizationService.getTree(params);
+ }
+ @ApiOperation(value = "更新状态")
+ @GetMapping("updateEnabled")
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ return sysOrganizationService.updateEnabled(params);
+ }
+
/**
* 查询
*/
--
Gitblit v1.8.0