From 6bc7940b24b227afc1e6bf42a8fd2fca83e0592c Mon Sep 17 00:00:00 2001 From: zch Date: Sat, 7 Jun 2025 20:32:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加备注字段并调整列名称 - 新增详情查看功能和右击菜单 - 优化表格样式和布局 - 添加数据导入功能- 调整 WebSocket URL --- .../os/ems/info/domain/DailyFaultRecord.java | 22 +++++++++++++++---- .../info/domain/SparePartsUsageRecord.java | 14 ++++++++++++ .../ems/info/DailyFaultRecordMapper.xml | 7 +++++- .../ems/info/SparePartsUsageRecordMapper.xml | 7 +++++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java index 7d8b508..2f14a73 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java @@ -26,12 +26,12 @@ public class DailyFaultRecord extends BaseEntity @Excel(name = "位置" , cellType = Excel.ColumnType.STRING) private String location; - /** 当日值班长 */ - @Excel(name = "当日值班长" , cellType = Excel.ColumnType.STRING) + /** 科室值班 */ + @Excel(name = "科室值班" , cellType = Excel.ColumnType.STRING) private String dailyDutySupervisor; - /** 天达当日值班长 */ - @Excel(name = "天达当日值班长" , cellType = Excel.ColumnType.STRING) + /** 外包值班 */ + @Excel(name = "外包值班" , cellType = Excel.ColumnType.STRING) private String tendaDailyDutySupervisor; /** 故障情况 */ @@ -58,6 +58,10 @@ public class DailyFaultRecord extends BaseEntity @Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC) private Long handlingDuration; + /** 备注 */ + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) + private String remarks; + public void setId(Long id) { this.id = id; @@ -157,6 +161,15 @@ public class DailyFaultRecord extends BaseEntity { return handlingDuration; } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } @Override public String toString() { @@ -172,6 +185,7 @@ public class DailyFaultRecord extends BaseEntity .append("faultOccurrenceTime", getFaultOccurrenceTime()) .append("handlingCompletionTime", getHandlingCompletionTime()) .append("handlingDuration", getHandlingDuration()) + .append("remarks", getRemarks()) .toString(); } } diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java index 2c8a860..4eb754e 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java @@ -62,6 +62,10 @@ public class SparePartsUsageRecord extends BaseEntity @Excel(name = "部门仓库", cellType = Excel.ColumnType.STRING) private String departmentWarehouse; + /** 备注 */ + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) + private String remarks; + public void setId(Long id) { this.id = id; @@ -170,6 +174,15 @@ public class SparePartsUsageRecord extends BaseEntity { return departmentWarehouse; } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } @Override public String toString() { @@ -186,6 +199,7 @@ public class SparePartsUsageRecord extends BaseEntity .append("warehouseManagerConfirmation", getWarehouseManagerConfirmation()) .append("inventoryStatus", getInventoryStatus()) .append("departmentWarehouse", getDepartmentWarehouse()) + .append("remarks", getRemarks()) .toString(); } } diff --git a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml index 41cb072..75affb3 100644 --- a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml @@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, date, location, daily_duty_supervisor, tenda_daily_duty_supervisor, fault_situation, handling_measures, fault_type, fault_occurrence_time, handling_completion_time, handling_duration from daily_fault_record + select id, date, location, daily_duty_supervisor, tenda_daily_duty_supervisor, fault_situation, handling_measures, fault_type, fault_occurrence_time, handling_completion_time, handling_duration, remarks from daily_fault_record @@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fault_occurrence_time, handling_completion_time, handling_duration, + remarks, #{date}, @@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{handlingDuration}, + #{remarks}, @@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{handlingDuration} , + remarks = #{remarks}, where id = #{id} diff --git a/os-ems/src/main/resources/mapper/ems/info/SparePartsUsageRecordMapper.xml b/os-ems/src/main/resources/mapper/ems/info/SparePartsUsageRecordMapper.xml index f980e39..2f4d879 100644 --- a/os-ems/src/main/resources/mapper/ems/info/SparePartsUsageRecordMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/info/SparePartsUsageRecordMapper.xml @@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, date, spare_part_name, spare_part_model, quantity_used, remaining_quantity, issuing_warehouse, replacement_location, person_received, warehouse_manager_confirmation, inventory_status, department_warehouse from spare_parts_usage_record + select id, date, spare_part_name, spare_part_model, quantity_used, remaining_quantity, issuing_warehouse, replacement_location, person_received, warehouse_manager_confirmation, inventory_status, department_warehouse, remarks from spare_parts_usage_record @@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_manager_confirmation, inventory_status, department_warehouse, + remarks, #{date}, @@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warehouseManagerConfirmation}, #{inventoryStatus}, #{departmentWarehouse}, + #{remarks}, @@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_manager_confirmation = #{warehouseManagerConfirmation}, inventory_status = #{inventoryStatus}, department_warehouse = #{departmentWarehouse}, + remarks = #{remarks}, where id = #{id}