From 5f5d5ef2b000349b26abdf842783c6357461c259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com> Date: Tue, 28 Oct 2025 16:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E4=BD=BF=E7=94=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BD=BF=E7=94=A8=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SwMedicineUsageController.java | 8 +++++++- .../biosafety/domain/SwMedicineUsage.java | 11 +++++----- .../domain/SwMedicineUsageDetails.java | 18 ++++++++--------- .../mapper/SwMedicineUsageMapper.java | 2 ++ .../service/ISwMedicineUsageService.java | 3 +++ .../impl/SwMedicineUsageServiceImpl.java | 5 +++++ .../java/com/zhyc/module/enums/UseType.java | 4 ++++ .../biosafety/SwMedicineUsageMapper.xml | 20 +++++++++++++++++++ 8 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 zhyc-module/src/main/java/com/zhyc/module/enums/UseType.java diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java index c3661aa..7e09fd5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java @@ -1,5 +1,6 @@ package com.zhyc.module.biosafety.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -56,8 +57,13 @@ public class SwMedicineUsageController extends BaseController public void export(HttpServletResponse response, SwMedicineUsage swMedicineUsage) { List list = swMedicineUsageService.selectSwMedicineUsageList(swMedicineUsage); + List resultList = new ArrayList<>(); + for (SwMedicineUsage medicineUsage : list) { + medicineUsage.setSwMedicineUsageDetailsList(swMedicineUsageService.selectSwMedicineUsageDetailsById(medicineUsage.getId())); + resultList.add(medicineUsage); + } ExcelUtil util = new ExcelUtil(SwMedicineUsage.class); - util.exportExcel(response, list, "药品使用记录数据"); + util.exportExcel(response, resultList, "药品使用记录数据"); } /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index c878cc9..dd837e9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -28,27 +28,28 @@ public class SwMedicineUsage extends BaseEntity private Integer id; /** 使用名称 */ - @Excel(name = "使用名称") + @Excel(name = "使用名称",width = 20, needMerge = true) private String name; /** 羊舍名称 */ - @Excel(name = "使用名称") + @Excel(name = "使用名称" ,width = 20, needMerge = true) private String sheepfoldName; private Integer sheepfoldId; /** 耳号 */ - @Excel(name = "耳号") + @Excel(name = "耳号",width = 20, needMerge = true) private String sheepNo; private Integer sheepId; /** 使用时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "使用日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "使用日期", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true) private Date datetime; /** 使用类型 */ - @Excel(name = "使用类型") + @Excel(name = "使用类型",width = 20, needMerge = true) private String useType; /** 药品使用记录详情信息 */ + @Excel private List swMedicineUsageDetailsList; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java index 1b67654..94ba417 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java @@ -26,40 +26,40 @@ public class SwMedicineUsageDetails extends BaseEntity private Long id; /** 药品使用记录id */ - @Excel(name = "药品使用记录id") +// @Excel(name = "药品使用记录id") private Integer mediUsage; /** 药品id */ - @Excel(name = "药品id") +// @Excel(name = "药品id") private Long mediId; /** 药品名称*/ - @Excel(name = "药品名称") + @Excel(name = "药品名称",cellType = Excel.ColumnType.STRING) private String mediName; /** 用量 */ - @Excel(name = "用量") + @Excel(name = "用量",cellType = Excel.ColumnType.STRING) private String dosage; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "单位",cellType = Excel.ColumnType.STRING) private String unit; /** 使用方法 */ - @Excel(name = "使用方法") + @Excel(name = "使用方法",cellType = Excel.ColumnType.STRING) private String usageId; /** 使用时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date usetime; /** 生产厂家 */ - @Excel(name = "生产厂家") + @Excel(name = "生产厂家",cellType = Excel.ColumnType.STRING) private String manufacturer; /** 生产批号 */ - @Excel(name = "生产批号") + @Excel(name = "生产批号",cellType = Excel.ColumnType.STRING) private String batchNumber; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java index 3d60eb0..32f3ef0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java @@ -87,4 +87,6 @@ public interface SwMedicineUsageMapper * @return 结果 */ public int deleteSwMedicineUsageDetailsByMediUsage(Integer id); + + List selectSwMedicineUsageDetailsById(Integer id); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java index 70e3dd8..af3d42f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service; import java.util.List; import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; /** * 药品使用记录Service接口 @@ -58,4 +59,6 @@ public interface ISwMedicineUsageService * @return 结果 */ public int deleteSwMedicineUsageById(Integer id); + + List selectSwMedicineUsageDetailsById(Integer id); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java index 31d13a6..3f63d29 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java @@ -113,6 +113,11 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService return swMedicineUsageMapper.deleteSwMedicineUsageById(id); } + @Override + public List selectSwMedicineUsageDetailsById(Integer id) { + return swMedicineUsageMapper.selectSwMedicineUsageDetailsById(id); + } + /** * 新增药品使用记录详情信息 * diff --git a/zhyc-module/src/main/java/com/zhyc/module/enums/UseType.java b/zhyc-module/src/main/java/com/zhyc/module/enums/UseType.java new file mode 100644 index 0000000..bfce1ec --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/enums/UseType.java @@ -0,0 +1,4 @@ +package com.zhyc.module.enums; + +public enum UseType { +} diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml index 08d090e..dac1a70 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml @@ -111,6 +111,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where medi_usage = #{medi_usage} + insert into sw_medicine_usage