From 60abe7113d747ff3755bd0f46756b2c45388e765 Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 16 Jan 2024 11:37:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AE=AE=E3=80=81=E5=8D=AB?= =?UTF-8?q?=E7=94=9F=E3=80=81=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safeproduct/enums/CarMaintenanceTypeEnum.java | 30 +++++++++++++++++++++ .../safeproduct/vo/CarMaintenanceDetailVO.java | 3 +++ .../safeproduct/vo/ConferenceRecordDetailVO.java | 3 +++ .../safeproduct/mapper/CarMaintenanceMapper.xml | 2 +- .../service/impl/CarMaintenanceServiceImpl.java | 8 ++++++ .../service/impl/HygieneRecordServiceImpl.java | 6 ++--- .../main/resources/template/会议记录表.docx | Bin 11775 -> 11789 bytes .../main/resources/template/培训记录表.docx | Bin 11813 -> 11819 bytes .../main/resources/template/演练记录表.docx | Bin 12003 -> 11999 bytes 9 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceTypeEnum.java diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceTypeEnum.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceTypeEnum.java new file mode 100644 index 0000000..d19ccf3 --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/CarMaintenanceTypeEnum.java @@ -0,0 +1,30 @@ +package com.hnac.hzims.safeproduct.enums; + +/** + * 车辆维保类型枚举类 + * + * @author liwen + * @date 2024-01-16 + */ +public enum CarMaintenanceTypeEnum { + + MAINTAIN("MAINTAIN", "保养"), + REPAIR("REPAIR", "维修"); + + private final String value; + + private final String desc; + + CarMaintenanceTypeEnum(String value, String desc) { + this.value = value; + this.desc = desc; + } + + public String getValue() { + return value; + } + + public String getDesc() { + return desc; + } +} diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailVO.java index 278e6b7..dbeec77 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailVO.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailVO.java @@ -58,4 +58,7 @@ public class CarMaintenanceDetailVO { @ApiModelProperty("车牌号") private String plateNumber; + + @ApiModelProperty("维保类型") + private String maintenanceType; } diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailVO.java index 87880ad..515a252 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailVO.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailVO.java @@ -14,6 +14,9 @@ import java.util.Date; @ApiModel(value = "会议记录表VO类") public class ConferenceRecordDetailVO { + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("会议实际开始时间") private Date actualStartTime; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml index b77ecf2..e9f9afc 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml @@ -5,7 +5,7 @@