From 79810458e869450fcdfa96b92f79e5c78cb46c04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 30 Jul 2020 16:37:55 +0800
Subject: [PATCH] 去掉 组织新增的按钮，修改添加医院的bug，添加Python 获取加密码的接口
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 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 71355b5..103ca15 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
@@ -6,6 +6,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
+import com.kidgrow.oprationcenter.model.HospitalInfo;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.ProductOrderRecord;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
@@ -13,6 +14,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
+import com.kidgrow.oprationcenter.vo.UserProductData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,7 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
@@ -69,7 +73,22 @@
}
return productOrderDetailService.findList(params);
}
-
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("all")
+ public PageResult all(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
+ }
+ return productOrderDetailService.all(params);
+ }
/**
* 列表
*/
@@ -107,6 +126,34 @@
}
/**
+ * 获取医院套餐是否到期和到期时间
+ * data内 isend为true说明套餐到期
+ * endtime上套餐的到期时间
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+
+ @ApiOperation(value = "获取医院套餐是否到期和到期时间")
+ @GetMapping("/UserProductDetailData")
+ public ResultBody UserProductDetailData(@RequestParam Long hospitalId,@RequestParam Long departmentId) {
+ return productOrderDetailService.UserProductDetailData(hospitalId,departmentId);
+ }
+
+ /**
+ * 获取医院套餐是否到期和到期时间
+ * data内 isend为true说明套餐到期
+ * endtime上套餐的到期时间
+ * @return
+ */
+
+ @ApiOperation(value = "获取医院套餐是否到期和到期时间")
+ @PostMapping("/serviceperiod")
+ public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
+ return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(),hospitalInfo.getDepartmentId());
+ }
+
+ /**
* 查询
*/
@ApiOperation(value = "查询")
--
Gitblit v1.8.0