From 93cec81bc04d7722e8c82d699f434709d5dd47ce Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Fri, 18 Dec 2020 13:35:19 +0800
Subject: [PATCH] 修改模板下载
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/template/机构导入模板.xlsx | 0
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java | 9 +++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
index 9169434..d691e1d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
@@ -20,6 +20,7 @@
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
@@ -249,7 +250,11 @@
@PostMapping("/export")
public void export(HttpServletResponse response) {
try {
- InputStream inStream =this.getClass().getResourceAsStream("/static/pages/template/机构导入模板.xlsx");
+ InputStream inStream = null;
+ ClassPathResource resource = new ClassPathResource(File.separator + "template" + File.separator + "机构导入模板.xlsx");
+ if (resource.exists()) {
+ inStream = resource.getInputStream();
+ }
// 设置输出的格式
response.reset();
response.setContentType("bin");
@@ -274,7 +279,7 @@
@PostMapping("/getOrganizationListByHospitalId")
public ResultBody getOrganizationListByHospitalId(@RequestBody String id) {
List<ScreeningOrganizationInfo> byHospitalId = organizationInfoService.findByHospitalId(Long.valueOf(id));
- if(byHospitalId != null && byHospitalId.size() > 0){
+ if (byHospitalId != null && byHospitalId.size() > 0) {
return ResultBody.ok().data(byHospitalId).msg("查询成功");
}
return ResultBody.failed().msg("查询失败");
diff --git "a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/template/\346\234\272\346\236\204\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/template/\346\234\272\346\236\204\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
similarity index 100%
rename from "kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/template/\346\234\272\346\236\204\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
rename to "kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/template/\346\234\272\346\236\204\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.8.0