From 4b1a7e68b61e20fc8e7483b385905ca04a7b6c42 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Wed, 20 Mar 2024 11:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AE=B0=E5=BD=95=E8=A1=A8+?=
 =?UTF-8?q?=E6=BC=94=E7=BB=83=E8=AE=B0=E5=BD=95=E8=A1=A8+=E5=9F=B9?=
 =?UTF-8?q?=E8=AE=AD=E8=AE=B0=E5=BD=95+=E8=80=83=E8=AF=95=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2=E6=88=90=EF=BC=9Ayyyy-MM-d?=
 =?UTF-8?q?d=20HH:mm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safeproduct/entity/CarMaintenanceEntity.java   |   8 +-
 .../safeproduct/entity/ConferenceRecordEntity.java |  14 ++
 .../safeproduct/entity/RehearsalRecordEntity.java  |  15 ++
 .../safeproduct/entity/TrainRecordEntity.java      |  14 ++
 .../safeproduct/vo/CarMaintenanceDetailVO.java     |   6 +-
 .../safeproduct/vo/ConferenceRecordDetailVO.java   |   4 +-
 .../safeproduct/vo/RehearsalRecordDetailVO.java    |   4 +-
 .../hnac/hzims/safeproduct/vo/TestScoreSumVO.java  |  24 +++
 .../com/hnac/hzims/safeproduct/vo/TestScoreVO.java |   6 +
 .../hzims/safeproduct/vo/TrainRecordDetailVO.java  |   4 +-
 .../safeproduct/controller/TrainController.java    |  13 +-
 .../safeproduct/mapper/CarMaintenanceMapper.xml    |   4 +-
 .../safeproduct/service/ITestScoreService.java     |   3 +
 .../service/impl/CarMaintenanceServiceImpl.java    |   2 +-
 .../service/impl/ConferenceRecordServiceImpl.java  |  12 ++
 .../service/impl/RehearsalRecordServiceImpl.java   |   8 +
 .../service/impl/TestScoreServiceImpl.java         |  33 +++-
 .../service/impl/TrainRecordServiceImpl.java       |   7 +
 .../hnac/hzims/safeproduct/utils/TimeUtils.java    | 195 +++++++++++++++++++++
 .../safeproduct/src/main/resources/db/2.0.0.sql.1  |   1 -
 .../resources/template/车辆维保记录单.docx  | Bin 12112 -> 11958 bytes
 21 files changed, 353 insertions(+), 24 deletions(-)
 create mode 100644 hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreSumVO.java
 create mode 100644 hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/TimeUtils.java

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java
index 10da28b..172f7b5 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java
@@ -43,10 +43,10 @@ public class CarMaintenanceEntity extends BaseEntity {
     @ApiModelProperty("维保开始时间")
     private Date startTime;
 
-    @NotNull
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("维保结束时间")
-    private Date endTime;
+//    @NotNull
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @ApiModelProperty("维保结束时间")
+//    private Date endTime;
 
     @NotNull
     @Size(max = 255, message = "维保地点长度不能超过255")
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferenceRecordEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferenceRecordEntity.java
index 99e3341..5ad107a 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferenceRecordEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferenceRecordEntity.java
@@ -1,11 +1,13 @@
 package com.hnac.hzims.safeproduct.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Size;
 import java.util.Date;
@@ -32,9 +34,21 @@ public class ConferenceRecordEntity extends BaseEntity {
     private String peopleName;
 
     @ApiModelProperty("会议实际开始时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualStartTime;
 
     @ApiModelProperty("会议实际结束时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualEndTime;
 
     @Size(max = 20, message = "记录人字段长度不能超过20")
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalRecordEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalRecordEntity.java
index 1b139d9..f9a8af9 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalRecordEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalRecordEntity.java
@@ -1,16 +1,19 @@
 package com.hnac.hzims.safeproduct.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -41,10 +44,22 @@ public class RehearsalRecordEntity extends BaseEntity {
 
     @NotNull
     @ApiModelProperty("演练实际开始时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualStartTime;
 
     @NotNull
     @ApiModelProperty("演练实际结束时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualEndTime;
 
     @NotNull
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainRecordEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainRecordEntity.java
index ad42f8a..33cb4f0 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainRecordEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainRecordEntity.java
@@ -1,11 +1,13 @@
 package com.hnac.hzims.safeproduct.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Size;
 import java.util.Date;
@@ -39,9 +41,21 @@ public class TrainRecordEntity extends BaseEntity {
     private String content;
 
     @ApiModelProperty("实际培训开始时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualStartTime;
 
     @ApiModelProperty("实际培训结束时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm"
+    )
     private Date actualEndTime;
 
     @Size(max = 250, message = "培训评价字段长度不能超过250")
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 2fe4817..554bd7b 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
@@ -21,9 +21,9 @@ public class CarMaintenanceDetailVO {
 
     @ApiModelProperty("维保开始时间")
     private Date startTime;
-
-    @ApiModelProperty("维保结束时间")
-    private Date endTime;
+//    和需求方确定暂时不用了
+//    @ApiModelProperty("维保结束时间")
+//    private Date endTime;
 
     @ApiModelProperty("维保地点")
     private String location;
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 c876c9a..6bfaadb 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
@@ -20,10 +20,10 @@ public class ConferenceRecordDetailVO {
     private String code;
 
     @ApiModelProperty("会议实际开始时间")
-    private Date actualStartTime;
+    private String actualStartTime;
 
     @ApiModelProperty("会议实际结束时间")
-    private Date actualEndTime;
+    private String actualEndTime;
 
     @ApiModelProperty("单位")
     private String unit;
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailVO.java
index 9b57e9c..e1d414f 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalRecordDetailVO.java
@@ -23,10 +23,10 @@ public class RehearsalRecordDetailVO {
     private String peopleName;
 
     @ApiModelProperty("演练实际开始时间")
-    private Date actualStartTime;
+    private String actualStartTime;
 
     @ApiModelProperty("演练实际结束时间")
-    private Date actualEndTime;
+    private String actualEndTime;
 
     @ApiModelProperty("演练记录")
     private String record;
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreSumVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreSumVO.java
new file mode 100644
index 0000000..518ebb5
--- /dev/null
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreSumVO.java
@@ -0,0 +1,24 @@
+package com.hnac.hzims.safeproduct.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liwen
+ * @date 2023-12-25
+ */
+@Data
+@ApiModel(value = "考试成绩VO类")
+public class TestScoreSumVO {
+
+    @ApiModelProperty("应考人数")
+    private Integer peopleNum=0;
+
+    @ApiModelProperty("实考人数")
+    private Integer actualPeopleNum=0;
+
+    @ApiModelProperty("及格率")
+    private Double percentage=0.0;
+
+}
diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreVO.java
index 019d7b0..7de3c9a 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreVO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreVO.java
@@ -15,6 +15,12 @@ public class TestScoreVO {
     @ApiModelProperty("考试成绩id")
     private Long id;
 
+    @ApiModelProperty("单位")
+    private Long dept;
+
+    @ApiModelProperty("单位名")
+    private String  deptName;
+
     @ApiModelProperty("姓名")
     private String name;
 
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 e7a6dff..e8850de 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
@@ -20,10 +20,10 @@ public class TrainRecordDetailVO {
     private String code;
 
     @ApiModelProperty("实际培训开始时间")
-    private Date actualStartTime;
+    private String actualStartTime;
 
     @ApiModelProperty("实际培训结束时间")
-    private Date actualEndTime;
+    private String actualEndTime;
 
     @ApiModelProperty("单位")
     private String unit;
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 f65f90d..e5cef0f 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
@@ -12,10 +12,7 @@ import com.hnac.hzims.safeproduct.service.ITestScoreService;
 import com.hnac.hzims.safeproduct.service.ITestService;
 import com.hnac.hzims.safeproduct.service.ITrainPlanService;
 import com.hnac.hzims.safeproduct.service.ITrainRecordService;
-import com.hnac.hzims.safeproduct.vo.TestScoreVO;
-import com.hnac.hzims.safeproduct.vo.TrainMonthVO;
-import com.hnac.hzims.safeproduct.vo.TrainRecordDetailVO;
-import com.hnac.hzims.safeproduct.vo.TrainYearVO;
+import com.hnac.hzims.safeproduct.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -199,7 +196,13 @@ public class TrainController extends BladeController {
         List<TestScoreVO> list = testScoreService.testScoreList(testId, name);
         return R.data(list);
     }
-
+    @GetMapping("/testScoreSum")
+    @ApiOperation(value = "考试总计")
+    @ApiOperationSupport(order = 18)
+    public R<TestScoreSumVO> testScoreSum(@RequestParam Long testId, String name) {
+        TestScoreSumVO list = testScoreService.testScoreSum(testId, name);
+        return R.data(list);
+    }
     @PostMapping("/updateBatchScore")
     @ApiOperation(value = "批量填写分数")
     @ApiOperationSupport(order = 19)
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 122440d..47ef050 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
@@ -4,7 +4,7 @@
 
     <select id="getCarMaintenance" resultType="com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailVO">
         SELECT
-            t1.code, t1.start_time, t1.end_time, t1.location, t1.cost, t1.maintainer, t1.content, t1.img_path, t1.file_path,
+            t1.code, t1.start_time,  t1.location, t1.cost, t1.maintainer, t1.content, t1.img_path, t1.file_path,
             t1.manager_advice, t1.confirmation_time, t2.plate_number, t2.unit, t2.car_brand, t2.car_type, t1.maintenance_type
         FROM
             hzims_car_maintenance t1
@@ -35,7 +35,7 @@
             AND t1.start_time >= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime != ''">
-            AND t1.end_time &lt;= #{param.endTime}
+            AND t1.end_time &lt;= #{param.startTime}
         </if>
         <if test="param.carId != null and param.carId != ''">
             AND t1.car_id = #{param.carId}
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITestScoreService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITestScoreService.java
index 85d8e4e..ce7e884 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITestScoreService.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITestScoreService.java
@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.TestScoreDTO;
 import com.hnac.hzims.safeproduct.entity.TestScoreEntity;
+import com.hnac.hzims.safeproduct.vo.TestScoreSumVO;
 import com.hnac.hzims.safeproduct.vo.TestScoreVO;
 
 import java.util.List;
@@ -43,4 +44,6 @@ public interface ITestScoreService extends IService<TestScoreEntity> {
      * @return 考试成绩列表
      */
     List<TestScoreEntity> getRelativeTestScore(Long testId);
+
+    TestScoreSumVO testScoreSum(Long testId, String name);
 }
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 8158b6c..2efcd40 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
@@ -104,7 +104,7 @@ public class CarMaintenanceServiceImpl extends ServiceImpl<CarMaintenanceMapper,
         // 若确认成功，更新台账相关信息
         if (update) {
             CarEntity carEntity = carService.getById(carMaintenanceEntity.getCarId());
-            carEntity.setMaintenanceLastTime(carMaintenanceEntity.getEndTime());
+            carEntity.setMaintenanceLastTime(carMaintenanceEntity.getStartTime());
             carEntity.setMaintenanceNextTime(confirmationDTO.getMaintenanceNextTime());
             carEntity.setMaintenanceMileage(confirmationDTO.getMaintenanceMileage());
             carEntity.setMaintenanceStatus(CarMaintenanceStatusEnum.MAINTAINED.getValue());
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 8803898..5b6c913 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,14 +17,18 @@ import com.hnac.hzims.safeproduct.mapper.ConferencePlanMapper;
 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.ConferenceRecordDetailVO;
+import com.hnac.hzims.ticket.constants.TicketConstants;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -94,6 +98,12 @@ public class ConferenceRecordServiceImpl extends ServiceImpl<ConferenceRecordMap
     @Override
     public void exportConferenceRecordData(Long id, HttpServletResponse response) {
         ConferenceRecordDetailVO conferenceRecordDetailVO = this.getConferenceRecordDetailById(id);
+        if (StringUtils.isNotEmpty(conferenceRecordDetailVO.getActualStartTime())){
+            conferenceRecordDetailVO.setActualStartTime(TimeUtils.format(conferenceRecordDetailVO.getActualStartTime()));
+        }
+        if (StringUtils.isNotEmpty(conferenceRecordDetailVO.getActualEndTime())){
+            conferenceRecordDetailVO.setActualEndTime(TimeUtils.format(conferenceRecordDetailVO.getActualEndTime()));
+        }
         // 数据处理
         // 会议方式
         String conferenceMethod = conferenceRecordDetailVO.getConferenceMethod();
@@ -129,6 +139,8 @@ public class ConferenceRecordServiceImpl extends ServiceImpl<ConferenceRecordMap
         BaseUtil.exportDocument(templateFile, params, wordPath, pdfPath,"filePath", response);
     }
 
+
+
     /**
      * 查询会议记录表详情
      */
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
index 05b91cf..c4b7203 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java
@@ -17,6 +17,7 @@ import com.hnac.hzims.safeproduct.mapper.RehearsalPlanMapper;
 import com.hnac.hzims.safeproduct.mapper.RehearsalRecordMapper;
 import com.hnac.hzims.safeproduct.service.IRehearsalRecordService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
+import com.hnac.hzims.safeproduct.utils.TimeUtils;
 import com.hnac.hzims.safeproduct.vo.RehearsalRecordDetailVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.support.Query;
@@ -140,6 +141,13 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
         RehearsalRecordDetailVO rehearsalRecordDetailVO = this.getRecordDetailVOById(id);
         // 数据处理
         // 图片
+        if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getActualStartTime())){
+            rehearsalRecordDetailVO.setActualStartTime(TimeUtils.format(rehearsalRecordDetailVO.getActualStartTime()));
+        }
+        if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getActualEndTime())){
+            rehearsalRecordDetailVO.setActualEndTime(TimeUtils.format(rehearsalRecordDetailVO.getActualEndTime()));
+        }
+
         List<ImageEntity> list = new ArrayList<>();
         if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getImgPath())) {
             String[] imgArr = rehearsalRecordDetailVO.getImgPath().split(",");
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
index bf49c4b..6e6b952 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
@@ -1,16 +1,21 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.TestScoreDTO;
+import com.hnac.hzims.safeproduct.entity.TestEntity;
 import com.hnac.hzims.safeproduct.entity.TestScoreEntity;
+import com.hnac.hzims.safeproduct.mapper.TestMapper;
 import com.hnac.hzims.safeproduct.mapper.TestScoreMapper;
 import com.hnac.hzims.safeproduct.service.ITestScoreService;
+import com.hnac.hzims.safeproduct.vo.TestScoreSumVO;
 import com.hnac.hzims.safeproduct.vo.TestScoreVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,7 +28,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScoreEntity> implements ITestScoreService {
-
+    @Resource
+    TestMapper testMapper;
     /**
      * 查询考试成绩列表
      */
@@ -75,4 +81,27 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
         queryWrapper.lambda().eq(TestScoreEntity::getTestId, testId);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public TestScoreSumVO testScoreSum(Long testId, String name) {
+        TestScoreSumVO testScoreSumVO = new TestScoreSumVO();
+        TestEntity testEntity = testMapper.selectById(testId);
+        String peopleName = testEntity.getPeopleName();
+        if (StringUtils.isNotBlank(peopleName)){
+            String[] split = peopleName.split(",");
+            testScoreSumVO.setPeopleNum( split.length);
+
+        }
+        QueryWrapper<TestScoreEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TestScoreEntity::getTestId, testId);
+        List<TestScoreEntity> list = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list)){
+            testScoreSumVO.setPeopleNum( list.size());
+            List<TestScoreEntity> collect = list.stream().filter(s -> s.getScore() > 60).collect(Collectors.toList());
+          if (CollectionUtils.isNotEmpty(list)) {
+              testScoreSumVO.setPercentage(new Double(collect.size() / list.size()));
+          }
+        }
+        return testScoreSumVO;
+    }
 }
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 7ad24bb..a47cd6b 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,6 +19,7 @@ import com.hnac.hzims.safeproduct.mapper.TrainRecordMapper;
 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.TrainRecordDetailVO;
 import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -142,6 +143,12 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         // 数据处理
         // 培训方式
         String trainMethod = trainRecordDetailVO.getTrainMethod();
+        if (StringUtils.isNotEmpty(trainRecordDetailVO.getActualStartTime())){
+            trainRecordDetailVO.setActualStartTime(TimeUtils.format(trainRecordDetailVO.getActualStartTime()));
+        }
+        if (StringUtils.isNotEmpty(trainRecordDetailVO.getActualEndTime())){
+            trainRecordDetailVO.setActualEndTime(TimeUtils.format(trainRecordDetailVO.getActualEndTime()));
+        }
         if (trainMethod.equals(TrainMethodEnum.MIXED.getValue())) {
             trainRecordDetailVO.setTrainMethod(TrainMethodEnum.MIXED.getDesc());
         } else if (trainMethod.equals(TrainMethodEnum.ONLINE.getValue())) {
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/TimeUtils.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/TimeUtils.java
new file mode 100644
index 0000000..c3a2a56
--- /dev/null
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/TimeUtils.java
@@ -0,0 +1,195 @@
+package com.hnac.hzims.safeproduct.utils;
+
+import com.hnac.hzims.safeproduct.vo.ConferenceRecordDetailVO;
+import org.springblade.core.tool.utils.DateUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public class TimeUtils {
+
+    private static int sheet1NowRow, sheet2NowRow;
+
+
+    /**
+     * 相差时数
+     *
+     * @param endDate
+     * @param nowDate
+     * @return
+     * @author ty
+     */
+    public static Long getDifferTime(Date nowDate, Date endDate) {
+        long nh = 1000 * 60 * 60L;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少小时
+        long hour = diff / nh;
+        return hour;
+    }
+
+    public static String getYear(Integer year) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为1（即一月）
+        calendar.set(Calendar.MONTH, Calendar.JANUARY);
+        // 设置日期为1
+        calendar.set(Calendar.DATE, 1);
+        // 设置时间为0点0分0秒
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
+        return start;
+    }
+
+    public static String getYearEnd(Integer year) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为12（即十二月）
+        calendar.set(Calendar.MONTH, Calendar.DECEMBER);
+        // 设置日期为31
+        calendar.set(Calendar.DATE, 31);
+        String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
+        return end;
+    }
+    public static String getYearEndV2(Integer year) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为12（即十二月）
+        calendar.set(Calendar.MONTH, Calendar.DECEMBER);
+        // 设置日期为31
+        calendar.set(Calendar.DATE, 31);
+        String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 23:59:59";
+        return end;
+    }
+
+    public static String getMonthStart(Integer year, Integer mon) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份
+        calendar.set(Calendar.MONTH,mon-1);
+        // 设置日期为1
+        calendar.set(Calendar.DATE, 1);
+        String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
+        return start;
+    }
+
+    public static String getMonthEnd(Integer year, Integer mon) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为1（即一月）
+        calendar.set(Calendar.MONTH, mon);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        // 将日期对象减去一天，即为当月的最后一天
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
+        return end;
+    }
+    public static String getMonthEndV2(Integer year, Integer mon) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为1（即一月）
+        calendar.set(Calendar.MONTH, mon);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        // 将日期对象减去一天，即为当月的最后一天
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 23:59:59";
+        return end;
+    }
+    public static List<String> getListByYear(Integer year) {
+        List<String> monthList=new ArrayList<>();
+        for (int i = 0; i <12; i++) {
+            // 创建一个Calendar对象
+            Calendar calendar = Calendar.getInstance();
+            // 设置年份
+            calendar.set(Calendar.YEAR, year);
+            // 设置月份为1（即一月）
+            calendar.set(Calendar.MONTH, i);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            // 将日期对象减去一天，即为当月的最后一天
+            String mon = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE);
+
+            monthList.add(mon);
+        }
+       return monthList;
+    }
+    public static List<String> getListByYearMon(Integer year,Integer mon) {
+        List<String> monthList=new ArrayList<>();
+        for (int i = 0; i <mon; i++) {
+            // 创建一个Calendar对象
+            Calendar calendar = Calendar.getInstance();
+            // 设置年份
+            calendar.set(Calendar.YEAR, year);
+            // 设置月份为1（即一月）
+            calendar.set(Calendar.MONTH, i);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            String monTime = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE);
+            monthList.add(monTime);
+        }
+        return monthList;
+    }
+    public static String getMon(Integer year,Integer month) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为1（即一月）
+        calendar.set(Calendar.MONTH, month-1);
+        // 设置日期为1
+        calendar.set(Calendar.DATE, 1);
+        // 设置时间为0点0分0秒
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) ;
+        return start;
+    }
+
+
+    public static String  getEarlyTime(Integer year, Integer month) {
+        // 创建一个Calendar对象
+        Calendar calendar = Calendar.getInstance();
+        // 设置年份
+        calendar.set(Calendar.YEAR, year);
+        // 设置月份为1（即一月）
+        calendar.set(Calendar.MONTH, month-1);
+        // 设置日期为1
+        calendar.set(Calendar.DATE, 1);
+        // 设置时间为0点0分0秒
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.add(Calendar.MONTH, -1);
+        String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) ;
+        return start;
+    }
+    public static String  format(String  time) {
+        String formattedDateString="";
+        SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = originalFormat.parse(time);
+            SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
+            formattedDateString = targetFormat.format(date);
+            return formattedDateString;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return time;
+        }
+    }
+}
diff --git a/hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1 b/hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1
index d54fb2a..109b0e1 100644
--- a/hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1
+++ b/hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1
@@ -276,7 +276,6 @@ CREATE TABLE `HZIMS_CAR_MAINTENANCE` (
      `MAINTENANCE_TYPE` VARCHAR(50) NOT NULL COMMENT '维保类型',
      `CONTENT` MEDIUMTEXT NOT NULL COMMENT '维保内容',
      `START_TIME` DATE NOT NULL COMMENT '维保开始时间',
-     `END_TIME` DATE NOT NULL COMMENT '维保结束时间',
      `LOCATION` VARCHAR(255) NOT NULL COMMENT '维保地点',
      `COST` BIGINT(20) NOT NULL COMMENT '维保费用',
      `MAINTAINER` VARCHAR(20) NOT NULL COMMENT '维保人',
diff --git a/hzims-service/safeproduct/src/main/resources/template/车辆维保记录单.docx b/hzims-service/safeproduct/src/main/resources/template/车辆维保记录单.docx
index 4d5fd9cbd689d924ee39535d1639610160eea3ff..9a8dcfc80d7147888f534374de02fd15437af5b9 100644
GIT binary patch
delta 5712
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

delta 5914
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%0DVdTX7z<6_-RjbuaPSFX6A1w&@i&Ug
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
P)esR}tXTH!|G4m9k9iA(