From e3c3a4edbc11f5fd467dfacf077717457f655a96 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Mon, 20 May 2024 16:55:37 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=9F=B9=E8=AE=AD=E3=80=81=E6=BC=94?=
 =?UTF-8?q?=E7=BB=83=E7=9A=84=E6=9C=88=E5=BA=A6=E7=BB=9F=E8=AE=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/safeproduct/controller/RehearsalController.java  | 3 ++-
 .../java/com/hnac/hzims/safeproduct/controller/TrainController.java | 3 ++-
 .../main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml | 3 +++
 .../hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java    | 6 +++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

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 ae78443..14cdc89 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
@@ -82,7 +82,8 @@ public class RehearsalController extends BladeController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
-            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
+            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "rehearsalStatus", value = "演练状态", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "演练计划分页")
     @ApiOperationSupport(order = 5)
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 57ef4ba..7eda44c 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
@@ -91,7 +91,8 @@ public class TrainController extends BladeController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
-            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
+            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "trainStatus", value = "培训计划状态", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "培训计划分页")
     @ApiOperationSupport(order = 5)
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml
index a9ca3f6..19ef188 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml
@@ -87,6 +87,9 @@
         <if test="param.endTime != null and param.endTime != ''">
             AND scheduled_end_time &lt;= #{param.endTime}
         </if>
+        <if test="param.trainStatus != null and param.trainStatus != ''">
+            AND train_status = #{param.trainStatus}
+        </if>
         ORDER BY
             create_time DESC
     </select>
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 1714714..9cd63ef 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
@@ -275,7 +275,8 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         QueryWrapper<RehearsalPlanEntity> queryWrapper = new QueryWrapper<>();
         String unit = String.valueOf(param.get("unit"));
         String startTime = String.valueOf(param.get("scheduledStartTime"));
-        String endTime = String.valueOf((param.get("scheduledEndTime")));
+        String endTime = String.valueOf(param.get("scheduledEndTime"));
+        String rehearsalStatus = String.valueOf(param.get("rehearsalStatus"));
         if (!unit.equals("null") && !unit.equals("")) {
             queryWrapper.lambda().like(RehearsalPlanEntity::getUnit, unit);
         }
@@ -285,6 +286,9 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(RehearsalPlanEntity::getScheduledEndTime, endTime);
         }
+        if (!rehearsalStatus.equals("null") && !rehearsalStatus.equals("")) {
+            queryWrapper.lambda().eq(RehearsalPlanEntity::getRehearsalStatus, rehearsalStatus);
+        }
         queryWrapper.lambda().orderByDesc(RehearsalPlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }