From 3b55e5954a872f26f996c3c2f6debfbb9f72801c Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Mon, 26 Aug 2024 09:20:47 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AE=89=E5=85=A8=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safeproduct/vo/CarMaintenanceDetailImgVO.java  |  22 ++++++++++++
 .../safeproduct/vo/CarMaintenanceDetailStrVO.java  |  21 +++++++++++
 .../safeproduct/vo/CarMaintenanceDetailVO.java     |   5 ---
 .../safeproduct/vo/CarUsedRecordDetailImgVO.java   |  22 ++++++++++++
 .../safeproduct/vo/CarUsedRecordDetailStrVO.java   |  21 +++++++++++
 .../safeproduct/vo/CarUsedRecordDetailVO.java      |   5 ---
 .../vo/ConferenceRecordDetailImgVO.java            |  22 ++++++++++++
 .../vo/ConferenceRecordDetailStrVO.java            |  21 +++++++++++
 .../safeproduct/vo/ConferenceRecordDetailVO.java   |   7 ----
 .../safeproduct/vo/RehearsalRecordDetailImgVO.java |   6 ++--
 .../safeproduct/vo/RehearsalRecordDetailStrVO.java |   6 ++--
 .../safeproduct/vo/TrainRecordDetailImgVO.java     |  22 ++++++++++++
 .../safeproduct/vo/TrainRecordDetailStrVO.java     |  21 +++++++++++
 .../hzims/safeproduct/vo/TrainRecordDetailVO.java  |   7 ----
 .../safeproduct/controller/CarController.java      |   3 +-
 .../controller/ConferenceController.java           |   3 +-
 .../controller/RehearsalController.java            |   3 +-
 .../safeproduct/controller/TrainController.java    |   3 +-
 .../service/ICarMaintenanceService.java            |   1 -
 .../service/impl/CarMaintenanceServiceImpl.java    |  40 +++++++++++++--------
 .../service/impl/CarUsedRecordServiceImpl.java     |  28 ++++++++++-----
 .../service/impl/ConferenceRecordServiceImpl.java  |  22 ++++++++----
 .../service/impl/TrainRecordServiceImpl.java       |  35 ++++++++++++------
 .../template/卫生考核表(五周).docx          | Bin 12280 -> 12350 bytes
 .../template/卫生考核表(四周).docx          | Bin 12116 -> 12196 bytes
 25 files changed, 268 insertions(+), 78 deletions(-)
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailImgVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailStrVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailImgVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailStrVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailImgVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailStrVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailImgVO.java
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailStrVO.java

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailImgVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailImgVO.java
new file mode 100644
index 0000000..c75df94
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailImgVO.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import cn.afterturn.easypoi.entity.ImageEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "车辆维保记录VO类-图片实体类")
+public class CarMaintenanceDetailImgVO extends CarMaintenanceDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<ImageEntity> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailStrVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailStrVO.java
new file mode 100644
index 0000000..c8f8e75
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarMaintenanceDetailStrVO.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "车辆维保记录VO类-图片字符串类")
+public class CarMaintenanceDetailStrVO extends CarMaintenanceDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<String> images;
+}
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 554bd7b..8d18ae4 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
@@ -1,12 +1,10 @@
 package com.hnac.hzims.safeproduct.vo;
 
-import cn.afterturn.easypoi.entity.ImageEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author liwen
@@ -64,9 +62,6 @@ public class CarMaintenanceDetailVO {
     @ApiModelProperty("维保类型")
     private String maintenanceType;
 
-    @ApiModelProperty("图片列表")
-    private List<ImageEntity> images;
-
     @ApiModelProperty("年份")
     private String year;
 
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailImgVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailImgVO.java
new file mode 100644
index 0000000..6310c23
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailImgVO.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import cn.afterturn.easypoi.entity.ImageEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "车辆用车记录VO类-图片实体类")
+public class CarUsedRecordDetailImgVO extends CarUsedRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<ImageEntity> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailStrVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailStrVO.java
new file mode 100644
index 0000000..2d5f620
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailStrVO.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "车辆用车记录VO类-图片字符串类")
+public class CarUsedRecordDetailStrVO extends CarUsedRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<String> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailVO.java
index 50564f4..5f496bd 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/CarUsedRecordDetailVO.java
@@ -1,13 +1,11 @@
 package com.hnac.hzims.safeproduct.vo;
 
-import cn.afterturn.easypoi.entity.ImageEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author liwen
@@ -65,9 +63,6 @@ public class CarUsedRecordDetailVO {
     @ApiModelProperty("确认时间")
     private Date confirmationTime;
 
-    @ApiModelProperty("图片列表")
-    private List<ImageEntity> images;
-
     @ApiModelProperty("年份")
     private String year;
 
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailImgVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailImgVO.java
new file mode 100644
index 0000000..839ac6a
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailImgVO.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import cn.afterturn.easypoi.entity.ImageEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "会议记录VO类-图片实体类")
+public class ConferenceRecordDetailImgVO extends ConferenceRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<ImageEntity> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailStrVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailStrVO.java
new file mode 100644
index 0000000..2650b11
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/ConferenceRecordDetailStrVO.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "会议记录VO类-图片实体类")
+public class ConferenceRecordDetailStrVO extends ConferenceRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<String> images;
+}
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 6bfaadb..7abdf86 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
@@ -1,13 +1,9 @@
 package com.hnac.hzims.safeproduct.vo;
 
-import cn.afterturn.easypoi.entity.ImageEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author liwen
  * @date 2024-01-15
@@ -55,9 +51,6 @@ public class ConferenceRecordDetailVO {
     @ApiModelProperty("会议附件")
     private String filePath;
 
-    @ApiModelProperty("图片列表")
-    private List<ImageEntity> images;
-
     @ApiModelProperty("年份")
     private String year;
 
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailImgVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailImgVO.java
index abb312d..bbd34fa 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailImgVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailImgVO.java
@@ -4,12 +4,14 @@ import cn.afterturn.easypoi.entity.ImageEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
-@ApiModel(value = "演练记录表VO类")
-public class RehearsalRecordDetailImgVO extends  RehearsalRecordDetailVO{
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "演练记录表VO类-图片实体类")
+public class RehearsalRecordDetailImgVO extends RehearsalRecordDetailVO {
 
     @ApiModelProperty("图片列表")
     private List<ImageEntity> images;
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailStrVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailStrVO.java
index 2a7c8bf..953a997 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailStrVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailStrVO.java
@@ -3,12 +3,14 @@ package com.hnac.hzims.safeproduct.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
-@ApiModel(value = "演练记录表VO类")
-public class RehearsalRecordDetailStrVO extends RehearsalRecordDetailVO{
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "演练记录表VO类-图片字符串类")
+public class RehearsalRecordDetailStrVO extends RehearsalRecordDetailVO {
 
     @ApiModelProperty("图片列表")
     private List<String> images;
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailImgVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailImgVO.java
new file mode 100644
index 0000000..6d5724a
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailImgVO.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import cn.afterturn.easypoi.entity.ImageEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "培训记录表VO类-图片实体类")
+public class TrainRecordDetailImgVO extends TrainRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<ImageEntity> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailStrVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailStrVO.java
new file mode 100644
index 0000000..a5a23f9
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailStrVO.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author liwen
+ * @date 2024-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "培训记录表VO类-图片字符串类")
+public class TrainRecordDetailStrVO extends TrainRecordDetailVO {
+
+    @ApiModelProperty("图片列表")
+    private List<String> images;
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailVO.java
index e8850de..2eb2148 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainRecordDetailVO.java
@@ -1,13 +1,9 @@
 package com.hnac.hzims.safeproduct.vo;
 
-import cn.afterturn.easypoi.entity.ImageEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author liwen
  * @date 2024-01-15
@@ -55,9 +51,6 @@ public class TrainRecordDetailVO {
     @ApiModelProperty("培训附件")
     private String filePath;
 
-    @ApiModelProperty("图片列表")
-    private List<ImageEntity> images;
-
     @ApiModelProperty("年份")
     private String year;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CarController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CarController.java
index d88ca90..33d77e2 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CarController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CarController.java
@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -41,7 +40,7 @@ import java.util.Map;
 @AllArgsConstructor
 @Business(module = Constants.APP_NAME, value = "车辆管理", ignore = false)
 @Api(value = "车辆管理", tags = "车辆管理接口")
-public class CarController extends BladeController {
+public class CarController {
 
     private final ICarService carService;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java
index 119188f..fcd7aac 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java
@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +37,7 @@ import java.util.Map;
 @RequestMapping("/conference")
 @Business(module = Constants.APP_NAME, value = "会议管理", ignore = false)
 @Api(value = "会议管理", tags = "会议管理接口")
-public class ConferenceController extends BladeController {
+public class ConferenceController {
 
     private final IConferencePlanService conferencePlanService;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalController.java
index 08d28ce..af81138 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalController.java
@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +39,7 @@ import java.util.Map;
 @RequestMapping("/rehearsal")
 @Business(module = Constants.APP_NAME, value = "演练管理", ignore = false)
 @Api(value = "演练管理", tags = "演练管理接口")
-public class RehearsalController extends BladeController {
+public class RehearsalController {
 
     private final IRehearsalRecordService rehearsalRecordService;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java
index ef252f9..3c39c65 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java
@@ -23,7 +23,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +44,7 @@ import java.util.Map;
 @RequestMapping("/train")
 @Business(module = Constants.APP_NAME, value = "培训管理", ignore = false)
 @Api(value = "培训管理", tags = "培训管理接口")
-public class TrainController extends BladeController {
+public class TrainController {
 
     private final ITrainPlanService trainPlanService;
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarMaintenanceService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarMaintenanceService.java
index 7f6531a..1e48db1 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarMaintenanceService.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarMaintenanceService.java
@@ -10,7 +10,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java
index dec42a9..8da1751 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java
@@ -17,11 +17,14 @@ import com.hnac.hzims.safeproduct.mapper.CarMaintenanceMapper;
 import com.hnac.hzims.safeproduct.mapper.CarMapper;
 import com.hnac.hzims.safeproduct.service.ICarMaintenanceService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
+import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailImgVO;
+import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailStrVO;
 import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarMaintenancePageVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -123,20 +126,6 @@ public class CarMaintenanceServiceImpl extends ServiceImpl<CarMaintenanceMapper,
     public void exportCarMaintenanceData(Long id, HttpServletResponse response) {
         CarMaintenanceDetailVO carMaintenanceDetailVO = this.getCarMaintenance(id);
         // 数据处理
-        // 图片
-        List<ImageEntity> list = new ArrayList<>();
-        if (StringUtils.isNotEmpty(carMaintenanceDetailVO.getImgPath())) {
-            String[] imgArr = carMaintenanceDetailVO.getImgPath().split(",");
-            for (String img : imgArr) {
-                ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
-                        BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
-                list.add(imageEntity);
-            }
-        } else {
-            // 添加空的ImageEntity，防止数据填入时显示"{{"
-            list.add(new ImageEntity());
-        }
-        carMaintenanceDetailVO.setImages(list);
         // 表头年月
         String code = carMaintenanceDetailVO.getCode();
         carMaintenanceDetailVO.setYear(code.substring(4, 8));
@@ -148,7 +137,28 @@ public class CarMaintenanceServiceImpl extends ServiceImpl<CarMaintenanceMapper,
         } else {
             carMaintenanceDetailVO.setMaintenanceType(CarMaintenanceTypeEnum.REPAIR.getDesc());
         }
-        Map<String, Object> params = BaseUtil.obj2Map(carMaintenanceDetailVO);
+        // 图片
+        Map<String, Object> params;
+        if (StringUtils.isNotEmpty(carMaintenanceDetailVO.getImgPath())) {
+            List<ImageEntity> list = new ArrayList<>();
+            CarMaintenanceDetailImgVO imgVO = new CarMaintenanceDetailImgVO();
+            BeanUtils.copyProperties(carMaintenanceDetailVO, imgVO);
+            String[] imgArr = carMaintenanceDetailVO.getImgPath().split(",");
+            for (String img : imgArr) {
+                ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
+                        BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
+                list.add(imageEntity);
+            }
+            imgVO.setImages(list);
+            params = BaseUtil.obj2Map(imgVO);
+        } else {
+            List<String> list = new ArrayList<>();
+            list.add("");
+            CarMaintenanceDetailStrVO strVO = new CarMaintenanceDetailStrVO();
+            BeanUtils.copyProperties(carMaintenanceDetailVO, strVO);
+            strVO.setImages(list);
+            params = BaseUtil.obj2Map(strVO);
+        }
         String templateFile = "template/车辆维保记录单" + SafeProductConstant.DOCX_SUFFIX;
         String wordPath = savePath + "/车辆维保记录单" + SafeProductConstant.DOCX_SUFFIX;
         String pdfPath = savePath + "/车辆维保记录单" + SafeProductConstant.PDF_SUFFIX;
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java
index 386e7c5..9c8de83 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java
@@ -14,11 +14,14 @@ import com.hnac.hzims.safeproduct.enums.CarUsedRecordEnum;
 import com.hnac.hzims.safeproduct.mapper.CarUsedRecordMapper;
 import com.hnac.hzims.safeproduct.service.ICarUsedRecordService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
+import com.hnac.hzims.safeproduct.vo.CarUsedRecordDetailImgVO;
+import com.hnac.hzims.safeproduct.vo.CarUsedRecordDetailStrVO;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordPageVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -117,25 +120,32 @@ public class CarUsedRecordServiceImpl extends ServiceImpl<CarUsedRecordMapper, C
     public void exportCarUsedRecordData(Long id, HttpServletResponse response) {
         CarUsedRecordDetailVO carUsedRecordDetailVO = this.getCarUsedRecord(id);
         // 数据处理
+        // 表头年月
+        String code = carUsedRecordDetailVO.getCode();
+        carUsedRecordDetailVO.setYear(code.substring(4, 8));
+        carUsedRecordDetailVO.setMonth(code.substring(8, 10));
         // 图片
-        List<ImageEntity> list = new ArrayList<>();
+        Map<String, Object> params;
         if (StringUtils.isNotEmpty(carUsedRecordDetailVO.getImgPath())) {
+            List<ImageEntity> list = new ArrayList<>();
+            CarUsedRecordDetailImgVO imgVO = new CarUsedRecordDetailImgVO();
+            BeanUtils.copyProperties(carUsedRecordDetailVO, imgVO);
             String[] imgArr = carUsedRecordDetailVO.getImgPath().split(",");
             for (String img : imgArr) {
                 ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
                         BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
                 list.add(imageEntity);
             }
+            imgVO.setImages(list);
+            params = BaseUtil.obj2Map(imgVO);
         } else {
-            // 添加空的ImageEntity，防止数据填入时显示"{{"
-            list.add(new ImageEntity());
+            List<String> list = new ArrayList<>();
+            list.add("");
+            CarUsedRecordDetailStrVO strVO = new CarUsedRecordDetailStrVO();
+            BeanUtils.copyProperties(carUsedRecordDetailVO, strVO);
+            strVO.setImages(list);
+            params = BaseUtil.obj2Map(strVO);
         }
-        carUsedRecordDetailVO.setImages(list);
-        // 表头年月
-        String code = carUsedRecordDetailVO.getCode();
-        carUsedRecordDetailVO.setYear(code.substring(4, 8));
-        carUsedRecordDetailVO.setMonth(code.substring(8, 10));
-        Map<String, Object> params = BaseUtil.obj2Map(carUsedRecordDetailVO);
         String templateFile = "template/用车记录单" + SafeProductConstant.DOCX_SUFFIX;
         String wordPath = savePath + "/用车记录单" + SafeProductConstant.DOCX_SUFFIX;
         String pdfPath = savePath + "/用车记录单" + SafeProductConstant.PDF_SUFFIX;
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java
index b8b4ed6..205a5f5 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java
@@ -17,9 +17,12 @@ import com.hnac.hzims.safeproduct.mapper.ConferenceRecordMapper;
 import com.hnac.hzims.safeproduct.service.IConferenceRecordService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
 import com.hnac.hzims.safeproduct.utils.TimeUtils;
+import com.hnac.hzims.safeproduct.vo.ConferenceRecordDetailImgVO;
+import com.hnac.hzims.safeproduct.vo.ConferenceRecordDetailStrVO;
 import com.hnac.hzims.safeproduct.vo.ConferenceRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.ConferenceRecordVO;
 import org.springblade.core.mp.support.Query;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -120,28 +123,33 @@ public class ConferenceRecordServiceImpl extends ServiceImpl<ConferenceRecordMap
         String standardContent = conferenceRecordDetailVO.getContent().replaceAll("\n", "\r\n");
         conferenceRecordDetailVO.setContent(standardContent);
         // 图片
-        List<ImageEntity> list = new ArrayList<>();
+        Map<String, Object> params;
         if (StringUtils.isNotEmpty(conferenceRecordDetailVO.getImgPath())) {
+            List<ImageEntity> list = new ArrayList<>();
+            ConferenceRecordDetailImgVO imgVO = new ConferenceRecordDetailImgVO();
+            BeanUtils.copyProperties(conferenceRecordDetailVO, imgVO);
             String[] imgArr = conferenceRecordDetailVO.getImgPath().split(",");
             for (String img : imgArr) {
                 ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
                         BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
                 list.add(imageEntity);
             }
+            imgVO.setImages(list);
+            params = BaseUtil.obj2Map(imgVO);
         } else {
-            // 添加空的ImageEntity，防止数据填入时显示"{{"
-            list.add(new ImageEntity());
+            List<String> list = new ArrayList<>();
+            list.add("");
+            ConferenceRecordDetailStrVO strVO = new ConferenceRecordDetailStrVO();
+            BeanUtils.copyProperties(conferenceRecordDetailVO, strVO);
+            strVO.setImages(list);
+            params = BaseUtil.obj2Map(strVO);
         }
-        conferenceRecordDetailVO.setImages(list);
-        Map<String, Object> params = BaseUtil.obj2Map(conferenceRecordDetailVO);
         String templateFile = "template/会议记录表" + SafeProductConstant.DOCX_SUFFIX;
         String wordPath = savePath + "/会议记录表" + SafeProductConstant.DOCX_SUFFIX;
         String pdfPath = savePath + "/会议记录表" + SafeProductConstant.PDF_SUFFIX;
         BaseUtil.exportDocument(templateFile, params, wordPath, pdfPath,"filePath", response);
     }
 
-
-
     /**
      * 查询会议记录表详情
      */
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
index 4d96ddd..5551eec 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java
@@ -19,10 +19,13 @@ import com.hnac.hzims.safeproduct.service.ITestService;
 import com.hnac.hzims.safeproduct.service.ITrainRecordService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
 import com.hnac.hzims.safeproduct.utils.TimeUtils;
+import com.hnac.hzims.safeproduct.vo.TrainRecordDetailImgVO;
+import com.hnac.hzims.safeproduct.vo.TrainRecordDetailStrVO;
 import com.hnac.hzims.safeproduct.vo.TrainRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.TrainRecordVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -163,20 +166,32 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         // 评价：换行符使用\r\n
         String standardCommand = trainRecordDetailVO.getCommand().replaceAll("\n", "\r\n");
         trainRecordDetailVO.setCommand(standardCommand);
-        // 图片
-        if (StringUtils.isNotEmpty(trainRecordDetailVO.getImgPath())) {
-            trainRecordDetailVO.setImages(Arrays.stream(trainRecordDetailVO.getImgPath().split(",")).map(img->
-                    new ImageEntity(BaseUtil.imgToByte(savePath + BaseUtil.downloadFileByUrl(img, savePath)), 180, 150)
-            ).collect(Collectors.toList()));
-        } else {
-            // 添加空的ImageEntity，防止数据填入时显示"{{"
-            trainRecordDetailVO.setImages(Collections.singletonList(new ImageEntity()));
-        }
         // 表头年月
         String code = trainRecordDetailVO.getCode();
         trainRecordDetailVO.setYear(code.substring(4, 8));
         trainRecordDetailVO.setMonth(code.substring(8, 10));
-        Map<String, Object> params = BaseUtil.obj2Map(trainRecordDetailVO);
+        // 图片
+        Map<String, Object> params;
+        if (StringUtils.isNotEmpty(trainRecordDetailVO.getImgPath())) {
+            List<ImageEntity> list = new ArrayList<>();
+            TrainRecordDetailImgVO imgVO = new TrainRecordDetailImgVO();
+            BeanUtils.copyProperties(trainRecordDetailVO, imgVO);
+            String[] imgArr = trainRecordDetailVO.getImgPath().split(",");
+            for (String img : imgArr) {
+                ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
+                        BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
+                list.add(imageEntity);
+            }
+            imgVO.setImages(list);
+            params = BaseUtil.obj2Map(imgVO);
+        } else {
+            List<String> list = new ArrayList<>();
+            list.add("");
+            TrainRecordDetailStrVO strVO = new TrainRecordDetailStrVO();
+            BeanUtils.copyProperties(trainRecordDetailVO, strVO);
+            strVO.setImages(list);
+            params = BaseUtil.obj2Map(strVO);
+        }
         String templateFile = "template/培训记录表" + SafeProductConstant.DOCX_SUFFIX;
         String wordPath = savePath + "/培训记录表" + SafeProductConstant.DOCX_SUFFIX;
         String pdfPath = savePath + "/培训记录表" + SafeProductConstant.PDF_SUFFIX;
diff --git a/hzims-service/safeproduct/src/main/resources/template/卫生考核表(五周).docx b/hzims-service/safeproduct/src/main/resources/template/卫生考核表(五周).docx
index 812968828b622a3764d4ad135c21a0b23a3b51c6..e217f447f9309c7afd602d95f59eaa4e0aa7288d 100644
GIT binary patch
delta 4877
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
S{u4&^XH5}+K$Zgk-2M+;C?Pxm

delta 4732
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
K1`;d)00020&HK0j

diff --git a/hzims-service/safeproduct/src/main/resources/template/卫生考核表(四周).docx b/hzims-service/safeproduct/src/main/resources/template/卫生考核表(四周).docx
index a91c9f02db9d96bf047eef72ba2cfde21051ed0b..0043a37dbad27dd689defcc2b322ff2b4cd35ed3 100644
GIT binary patch
delta 4660
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

delta 4574
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
E2esm~O8@`>