From 1fd9e721593f0d22d16cdbac6b341553b1168cf7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 02 四月 2025 20:49:44 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
index 735cdf0..2b6976d 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
@@ -312,7 +312,7 @@
@Override
public void staticsExport(MwMicroEquipmentStaticsQuery query, HttpServletResponse response) throws IOException {
- List<List<String>> head = head();
+ List<List<String>> head = head(query);
System.out.println(JSONObject.toJSONString(head));
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -355,16 +355,26 @@
*
* @return
*/
- private List<List<String>> head() {
+ private List<List<String>> head(MwMicroEquipmentStaticsQuery query) {
List<SysDictData> medicalWasteTypeList = sysDictDataService.lambdaQuery().eq(SysDictData::getDictType, "medical_waste_type").list();
List<List<String>> headTitles = Lists.newArrayList();
- headTitles.add(Lists.newArrayList("日期"));
+ SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
+ MwMicroEquipment microEquipment = mwMicroEquipmentService.getById(query.getEquipmentId());
+ //修改代码判断department不为空才拼接
+ String title = "";
+ if (Objects.nonNull(department) && Objects.nonNull(microEquipment)) {
+ title = department.getDepartmentName() + microEquipment.getEquipmentName() + "处置报表";
+ } else {
+ title = "处置报表";
+ }
+ headTitles.add(Lists.newArrayList(title, "日期", "日期"));
+ String finalTitle = title;
medicalWasteTypeList.forEach(item -> {
- headTitles.add(Lists.newArrayList(item.getDictLabel(), "总重量（KG）"));
- headTitles.add(Lists.newArrayList(item.getDictLabel(), "总数量"));
+ headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总重量（KG）"));
+ headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总数量"));
});
- headTitles.add(Lists.newArrayList("小计", "总重量（KG）"));
- headTitles.add(Lists.newArrayList("小计", "总数量"));
+ headTitles.add(Lists.newArrayList(title, "小计", "总重量（KG）"));
+ headTitles.add(Lists.newArrayList(title, "小计", "总数量"));
return headTitles;
}
--
Gitblit v1.7.1