From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index 19f9335..ecc3eec 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -1,8 +1,10 @@
package com.kidgrow.oprationcenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.utils.ExcelUtil;
import com.kidgrow.oprationcenter.model.DataNeed;
import com.kidgrow.oprationcenter.service.IDataNeedService;
@@ -55,7 +57,14 @@
}
return dataNeedService.findList(params);
}
-
+ /**
+ * H端列表 需要医院和科室id
+ */
+ @ApiOperation(value = "H端列表,需要医院和科室id")
+ @GetMapping("/hlist")
+ public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true)SysUser sysUser) {
+ return dataNeedService.FindAllByHId(params,sysUser);
+ }
/**
* 查询
*/
@@ -68,11 +77,19 @@
/**
*更新状态和文件地址
*/
- @ApiOperation(value = "查询")
+ @ApiOperation(value = "更新状态和文件地址")
@GetMapping("updateEnabled")
public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
return dataNeedService.updateEnabled(map);
}
+ /**
+ *更新使用状态
+ */
+ @ApiOperation(value = "更新使用状态")
+ @GetMapping("updateDelete")
+ public ResultBody updateDelete(@RequestParam Long id,@LoginUser(isFull = true) SysUser sysUser) {
+ return dataNeedService.updateDelete(id,sysUser);
+ }
/**
* 根据DataNeed当做查询条件进行查询
--
Gitblit v1.8.0