From 0184bf471382f9328df9bdd47acf451e4e2c5cb0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 11 六月 2025 13:57:37 +0800
Subject: [PATCH] 达梦数据库及数据库脚本
---
medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
index bd9680f..4ae2a5c 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java
@@ -222,7 +222,7 @@
* @return
*/
public void hospitalReportExport(HospitalReportQuery query) throws IOException {
- List<List<String>> head = hospitalReportHead(query.getDepartmentId());
+ List<List<String>> head = hospitalReportHead(query);
System.out.println(JSONObject.toJSONString(head));
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -268,8 +268,8 @@
*
* @return
*/
- private List<List<String>> hospitalReportHead(Long departmentId) {
- SysDepartment department = sysDepartmentService.getById(departmentId);
+ private List<List<String>> hospitalReportHead(HospitalReportQuery query) {
+ SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
List<SysDictDataVO> wasteTypeList = sysDictDataService.medicalWasteTypeList();
List<List<String>> headTitles = Lists.newArrayList();
String title = "";
@@ -286,7 +286,9 @@
});
headTitles.add(Lists.newArrayList(title, "小计", "数量"));
headTitles.add(Lists.newArrayList(title, "小计", "重量（kg）"));
- headTitles.add(Lists.newArrayList(title, "是否超时", "是否超时"));
+ if (query.getDateType().equals(1)) {
+ headTitles.add(Lists.newArrayList(title, "是否超时", "是否超时"));
+ }
return headTitles;
}
--
Gitblit v1.7.1