From d980de3c45ed1c352f3e05d8c9d1fc85aac7667f Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 14 May 2020 11:46:18 +0800
Subject: [PATCH] 修改了医生管理页面的权限按钮显示隐藏 医生管理修改医院名称查询的方式。 调整页面的展示布局
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index 81aad5a..61332a8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -1,12 +1,16 @@
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.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
+import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -73,12 +77,30 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping("/all")
- public PageResult findAllList(@RequestParam Map<String, Object> params) {
+ public PageResult findAllList(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderDetailService.findAllList(params);
+ return productOrderDetailService.findAllList(params,sysUser);
+ }
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @PostMapping("/alldata")
+ public PageResult findAllDataList(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
+ }
+ if(params.get("diagnosticHospitalId")==null)
+ return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
+ return productOrderDetailService.findAllDataList(params);
}
/**
@@ -123,7 +145,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -131,6 +153,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
--
Gitblit v1.8.0