From 06a36f032e50dc60978c6440a0fec52cb682733c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 25 十二月 2024 10:30:26 +0800
Subject: [PATCH] 预警记录增加字段
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
index b4d3dbb..d8e0d40 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
@@ -1,11 +1,11 @@
package com.sinata.system.service.impl;
-import com.alibaba.excel.EasyExcel;
+import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwCollectRecord;
-import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.MwCollectRecordDTO;
import com.sinata.system.domain.query.MwCollectRecordQuery;
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
@@ -43,13 +43,9 @@
*/
@Override
public PageDTO<MwCollectRecordVO> pageList(MwCollectRecordQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
Page<MwCollectRecordVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
@@ -93,13 +89,17 @@
@Override
public void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException {
- List<MwCollectRecordVO> vo = baseMapper.getExportList(query);
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
+ }
+ List<MwCollectRecordVO> vo = baseMapper.getExportList(query, treeCode);
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
String fileName = URLEncoder.encode("医废收集记录", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
+ FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
}
}
--
Gitblit v1.7.1