From 9668e28daa836b97a5ae6440ee5b472306287732 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Tue, 22 Sep 2020 16:01:14 +0800 Subject: [PATCH] 添加支付页面的功能 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 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 f5e2de5..595630a 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; @@ -12,10 +14,12 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -25,6 +29,7 @@ /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> + * * @Description: 医生的数据需求 * @Project: 用户中心 * @CreateDate: Created in 2020-04-01 09:37:04 <br> @@ -35,7 +40,7 @@ @RestController @RequestMapping("/dataneed") @Api(tags = "医生的数据需求") -public class DataNeedController extends BaseController{ +public class DataNeedController extends BaseController { @Autowired private IDataNeedService dataNeedService; @@ -49,11 +54,29 @@ }) @GetMapping public PageResult list(@RequestParam Map<String, Object> params) { - if(params.size()==0){ - params.put("page",1); - params.put("limit",10); + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); } 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) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + if(MapUtils.getString(params,"page")==null){ + params.put("page", 1); + }if(MapUtils.getString(params,"limit")==null){ + params.put("limit", 10); + } + return dataNeedService.FindAllByHId(params, sysUser); } /** @@ -64,6 +87,24 @@ public ResultBody findById(@PathVariable Long id) { DataNeed model = dataNeedService.getById(id); return ResultBody.ok().data(model).msg("查询成功"); + } + + /** + * 更新状态和文件地址 + */ + @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); } /** @@ -89,7 +130,6 @@ return ResultBody.ok().data(dataNeed).msg("保存成功"); } } - /** * 删除 */ @@ -99,6 +139,7 @@ dataNeedService.removeById(id); return ResultBody.ok().msg("删除成功"); } + /** * 导出excel * -- Gitblit v1.8.0