From 410816823c81d680e39af2ed6d7a0b93fe90e622 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Wed, 3 Jan 2024 14:03:09 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=BC=94=E7=BB=83/=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?/=E4=BC=9A=E8=AE=AE/=E5=8D=AB=E7=94=9F=E8=87=AA=E6=9F=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=8C=89=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/safeproduct/controller/ConferenceController.java | 4 ++--
 .../com/hnac/hzims/safeproduct/controller/HygieneController.java    | 2 --
 .../com/hnac/hzims/safeproduct/controller/RehearsalController.java  | 4 ++--
 .../java/com/hnac/hzims/safeproduct/controller/TrainController.java | 6 ++++--
 .../java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml | 2 ++
 .../java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml  | 2 ++
 .../java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java   | 6 ++++++
 .../java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml  | 2 ++
 .../src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml  | 4 ++++
 .../com/hnac/hzims/safeproduct/service/IHygieneZoneService.java     | 6 ++++++
 .../hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java   | 1 +
 .../hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java | 1 +
 .../hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java    | 3 ---
 .../hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java | 6 ++++++
 .../hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java    | 1 +
 .../hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java   | 3 ++-
 .../hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java | 2 +-
 17 files changed, 42 insertions(+), 13 deletions(-)

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 aa12908..2a09af6 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
@@ -114,8 +114,8 @@ public class ConferenceController extends BladeController {
     @ApiOperation(value = "会议记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<ConferenceRecordEntity>> recordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<ConferenceRecordEntity> page = conferenceRecordService.page(Condition.getPage(query),
-                Condition.getQueryWrapper(param, ConferenceRecordEntity.class));
+        IPage<ConferenceRecordEntity> page = conferenceRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
+                param, ConferenceRecordEntity.class).lambda().orderByDesc(ConferenceRecordEntity::getCreateTime));
         return R.data(page);
     }
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
index f73fc03..e0e36e9 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
@@ -2,11 +2,9 @@ package com.hnac.hzims.safeproduct.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.hnac.hzims.common.utils.Condition;
 import com.hnac.hzims.safeproduct.dto.HygienePlanDTO;
 import com.hnac.hzims.safeproduct.dto.HygieneRecordDTO;
 import com.hnac.hzims.safeproduct.entity.HygienePlanEntity;
-import com.hnac.hzims.safeproduct.entity.HygieneRecordEntity;
 import com.hnac.hzims.safeproduct.service.IHygienePlanService;
 import com.hnac.hzims.safeproduct.service.IHygieneRecordService;
 import com.hnac.hzims.safeproduct.vo.HygienePlanDetailVO;
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 58b036e..21d6442 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
@@ -116,8 +116,8 @@ public class RehearsalController extends BladeController {
     @ApiOperation(value = "演练记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<RehearsalRecordEntity>> rehearsalRecordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<RehearsalRecordEntity> page = rehearsalRecordService.page(Condition.getPage(query),
-                Condition.getQueryWrapper(param, RehearsalRecordEntity.class));
+        IPage<RehearsalRecordEntity> page = rehearsalRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
+                param, RehearsalRecordEntity.class).lambda().orderByDesc(RehearsalRecordEntity::getCreateTime));
         return R.data(page);
     }
 
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 172a59b..50d64a1 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
@@ -128,7 +128,8 @@ public class TrainController extends BladeController {
     @ApiOperation(value = "培训记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<TrainRecordEntity>> trainRecordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<TrainRecordEntity> page = trainRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TrainRecordEntity.class));
+        IPage<TrainRecordEntity> page = trainRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
+                param, TrainRecordEntity.class).lambda().orderByDesc(TrainRecordEntity::getCreateTime));
         return R.data(page);
     }
 
@@ -176,7 +177,8 @@ public class TrainController extends BladeController {
     @ApiOperation(value = "考试记录分页")
     @ApiOperationSupport(order = 16)
     public R<IPage<TestEntity>> testPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<TestEntity> page = testService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TestEntity.class));
+        IPage<TestEntity> page = testService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TestEntity.class)
+                .lambda().orderByDesc(TestEntity::getCreateTime));
         return R.data(page);
     }
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
index c71d0dc..b6cd857 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
@@ -19,5 +19,7 @@
         <if test="endTime != 'null' and endTime != ''">
             AND t1.scheduled_end_time &lt; #{endTime}
         </if>
+        ORDER BY
+            t1.create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
index 68efbe5..7536baa 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml
@@ -22,5 +22,7 @@
         <if test="param.hygienePlanId != null and param.hygienePlanId != ''">
             AND hygiene_plan_id = #{hygienePlanId}
         </if>
+        ORDER BY
+            create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java
index b3d0e5c..6614aff 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java
@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 卫生自查责任区Mapper类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 @Mapper
 public interface HygieneZoneMapper extends BaseMapper<HygieneZoneEntity> {
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml
index e3f1b14..63c26df 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml
@@ -80,5 +80,7 @@
         <if test="endTime != 'null' and endTime != ''">
             AND t1.scheduled_end_time &lt; #{endTime}
         </if>
+        ORDER BY
+            t1.create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml
index f6ded92..7b1556d 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml
@@ -9,6 +9,10 @@
             hzims_test
         WHERE
             is_deleted = 0
+        <if test="trainPlanId != null and trainPlanId != ''">
             AND train_plan_id = #{trainPlanId}
+        </if>
+        ORDER BY
+            create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneZoneService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneZoneService.java
index 3c62284..add6ee3 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneZoneService.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneZoneService.java
@@ -5,6 +5,12 @@ import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity;
 
 import java.util.List;
 
+/**
+ * 卫生自查责任区服务类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 public interface IHygieneZoneService extends IService<HygieneZoneEntity> {
 
     /**
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java
index 803b972..08255fc 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java
@@ -73,6 +73,7 @@ public class ConferencePlanServiceImpl extends ServiceImpl<ConferencePlanMapper,
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(ConferencePlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(ConferencePlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
index 659fc88..7299e93 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
@@ -85,6 +85,7 @@ public class HygienePlanServiceImpl extends ServiceImpl<HygienePlanMapper, Hygie
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(HygienePlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(HygienePlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java
index 469d5fa..ccc7785 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java
@@ -6,7 +6,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.converters.longconverter.LongStringConverter;
 import com.alibaba.excel.util.CollectionUtils;
-import com.alibaba.excel.write.merge.LoopMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,8 +24,6 @@ import com.hnac.hzims.safeproduct.utils.BaseUtil;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordPageVO;
 import com.hnac.hzims.safeproduct.vo.HygieneZoneDetailVO;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordDetailVO;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java
index 2cedf06..a0f42cb 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java
@@ -11,6 +11,12 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.stream.Collectors;
 
+/**
+ * 卫生自查责任区服务实现类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 @Service
 public class HygieneZoneServiceImpl extends ServiceImpl<HygieneZoneMapper, HygieneZoneEntity> implements IHygieneZoneService {
 
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java
index 1d1932c..308df13 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java
@@ -259,6 +259,7 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(RehearsalPlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(RehearsalPlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 }
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java
index 27a8d8e..027430b 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java
@@ -256,6 +256,7 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(TrainPlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(TrainPlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 
@@ -277,7 +278,7 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         if (!endTime.equals("null")) {
             queryWrapper.lt(TrainPlanEntity::getScheduledEndTime, endTime);
         }
-        queryWrapper.orderByDesc(TrainPlanEntity::getScheduledEndTime);
+        queryWrapper.orderByDesc(TrainPlanEntity::getCreateTime);
         return this.list(queryWrapper);
     }
 }
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 79d9c05..3405311 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
@@ -213,7 +213,7 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         if (!trainPlanId.equals("null")) {
             queryWrapper.ge(TrainRecordEntity::getTrainPlanId, trainPlanId);
         }
-        queryWrapper.orderByDesc(TrainRecordEntity::getActualEndTime);
+        queryWrapper.orderByDesc(TrainRecordEntity::getCreateTime);
         return this.list(queryWrapper);
     }
 }