From 0fe02f3eace81653ae47cf89ea019010df8b3423 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 10:03:52 +0800
Subject: [PATCH] 优化套餐功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java | 11 +++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java | 4 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java | 8 ++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java | 5 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java | 6 +++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 9 ++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 13 ++++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java | 8 ++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 13 ++++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 29 ++++++++------
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderRecordService.java | 5 ++
12 files changed, 94 insertions(+), 19 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
index d853939..fe8379d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
@@ -7,6 +7,8 @@
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
@@ -26,4 +28,10 @@
*/
@GetMapping(value = "/diagnostic/diagnosticitem")
ResultBody<PageResult> getDiagnosticItemList(@RequestParam Map<String, Object> params);
+
+ /**
+ * feign rpc访问远程 接口
+ */
+ @PostMapping(value = "/ReportRecord/operation/pdfname/{diagnosticId}/{reportType}/{hospitalId}/{departId}")
+ ResultBody getPdfPathForOperation(@PathVariable("diagnosticId") String diagnosticId,@PathVariable("reportType") Integer reportType,@PathVariable("hospitalId") Long hospitalId,@PathVariable("departId") Long departId);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
index b3ba0c6..ad4e281 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
@@ -3,6 +3,7 @@
import com.kidgrow.common.constant.ServiceNameConstants;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.feign.fallback.ProductOrderFallbackFactory;
+import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,4 +27,11 @@
*/
@PostMapping(value = "contract/saveTemp")
ResultBody saveProductDetail(@RequestBody Map<String,Object> params);
+ /**
+ *
+ * @param productOrder
+ * @return
+ */
+ @PostMapping(value = "/contract/getStatus")
+ ResultBody getStatus(@RequestBody ProductOrder productOrder);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java
index c610c2a..6edc94f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java
@@ -18,6 +18,11 @@
public ResultBody<PageResult> getDiagnosticItemList(Map<String, Object> params) {
return ResultBody.failed().msg("getDiagnosticItemList的FeignClient调用参数传递测试失败");
}
+
+ @Override
+ public ResultBody getPdfPathForOperation(String diagnosticId, Integer reportType, Long hospitalId, Long departId) {
+ return ResultBody.failed().msg("getPdfPathForOperation的FeignClient调用参数传递测试失败");
+ }
};
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
index 9f68d19..7f1bfce 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
@@ -2,6 +2,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.feign.ProductOrderService;
+import com.kidgrow.oprationcenter.model.ProductOrder;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -17,6 +18,11 @@
public ResultBody saveProductDetail(Map<String, Object> params) {
return ResultBody.failed().msg("saveProductDetail的FeignClient调用失败");
}
+
+ @Override
+ public ResultBody getStatus(ProductOrder productOrder) {
+ return ResultBody.failed().msg("获取正式和试用的的FeignClient接口失败");
+ }
};
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderRecordService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderRecordService.java
index d3a859d..fbf164c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderRecordService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderRecordService.java
@@ -59,5 +59,10 @@
* @return
*/
PageResult<GroupProductDetail> groupList(Map<String, Object> params);
+
+ /**
+ * 查看报告
+ */
+ ResultBody getPdfPathForOperation(String diagnosticId, Integer reportType, Long hospitalId, Long departId);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
index 775c24e..3a39e96 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
@@ -72,6 +72,15 @@
}
/**
+ * 查看报告
+ */
+ @Override
+ public ResultBody getPdfPathForOperation(String diagnosticId, Integer reportType, Long hospitalId, Long departId) {
+ ResultBody pdfPathForOperation = diagnosticService.getPdfPathForOperation(diagnosticId, reportType, hospitalId, departId);
+ return pdfPathForOperation;
+ }
+
+ /**
* 列表
*
* @param params
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
index fedef3d..26c9d2f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
@@ -113,6 +113,17 @@
return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
return productOrderRecordService.findAllDataList(params);
}
+ /**
+ * 查看报告
+ */
+ @ApiOperation(value = "查看报告")
+ @PostMapping("/pdfname/{diagnosticId}/{reportType}/{hospitalId}/{departId}")
+ public ResultBody getPdfPathForOperation(@PathVariable("diagnosticId") String diagnosticId,@PathVariable("reportType") Integer reportType,@PathVariable("hospitalId") Long hospitalId,@PathVariable("departId") Long departId) {
+ if (StringUtils.isBlank(diagnosticId)) {
+ return ResultBody.failed("请输入diagnosticId");
+ }
+ return productOrderRecordService.getPdfPathForOperation(diagnosticId,reportType,hospitalId,departId);
+ }
/**
* 列表
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
index ce17542..b4a11b6 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
@@ -110,4 +110,8 @@
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
+ /**
+ * 是否试用，true正式，false试用
+ */
+ private Boolean OrderType;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
index 799c9b4..7cf6c17 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
@@ -7,6 +7,8 @@
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.feign.ProductOrderService;
+import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.mapper.SysHospitalMapper;
import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
@@ -42,6 +44,8 @@
private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
@Autowired
private SysOrganizationMapper sysOrganizationMapper;
+ @Autowired
+ private ProductOrderService productOrderService;
/**
* 列表
* @param params
@@ -67,6 +71,15 @@
return PageResult.<HospitalListVo>builder().data(null).code(0).count(page.getTotal()).build();
}
List<HospitalListVo> list = baseMapper.findHospitalList(page, params);
+ for (HospitalListVo hospitalListVo : list) {
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setHospitalId(hospitalListVo.getHospitalId());
+ productOrder.setDepartmentId(hospitalListVo.getDepartmentId());
+ ResultBody status = productOrderService.getStatus(productOrder);
+ if (status.getCode()==0) {
+ hospitalListVo.setOrderType(status.getData() instanceof Boolean ? ((Boolean) status.getData()) : null);
+ }
+ }
return PageResult.<HospitalListVo>builder().data(list).code(0).count(page.getTotal()).build();
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index cdf70b6..407b48d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -24,7 +24,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="contract-table-bar">
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="contract-del" lay-event="del">删除</a> -->
-<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit"">修改</a>
+<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit">修改</a>
<a class=" layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save"
lay-event="detail">查看套餐</a>
</script>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index 1d69a23..7b7b905 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -136,24 +136,27 @@
return false;
}
});
+ //获取软件的服务周期
+ var getCycleTime = function (departmentId) {
+
+ }
// 工具条点击事件
table.on('tool(diagnostic-table)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === "select") {
- //查看报告 报告列数据缓存起来
- // admin.putTempData("t_diagnosis", data);
- // admin.popupCenter({
- // title: '查看报告',
- // path: 'pages/opration/recordNote.html',
- // area: '1200px',
- // offset: '10px',
- // finish: function () {
- // admin.putTempData("t_diagnosis", "");
- // }
- // });
- // console.log("vvvvvvvvvvvvv")
- window.open(config.base_server + "ReportRecord/operation/pdfname")
+ console.log(data,"333333")
+ admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
+ function (data) {
+ if (data.code == 0) {
+ //打开新的窗口
+ window.open(data.data)
+ }else{
+ layer.msg("查询报告失败")
+ }
+
+ }, "post")
+ admin.re
}
});
});
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index 05840bf..c5f67cb 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -114,11 +114,14 @@
width: "8%",
title: '联系方式'
},
- // {
- // field: 'enabled', width: 80, title: '状态', templet: function (d) {
- // return d.hospitalState == 0 ? "试用" : "正式"
- // }
- // },
+ {
+ field: 'orderType', width: 80, title: '状态', templet: function (d) {
+ if(d.orderType==null){
+ return "";
+ }
+ return d.orderType ? "试用" : "正式"
+ }
+ },
{
field: 'isScreen',
width: "4%",
--
Gitblit v1.8.0