From 3e71c0cad7aab5c77b4646a83c167747ec5a637f Mon Sep 17 00:00:00 2001
From: fengliu <fl7620218@163.com>
Date: Fri, 5 Dec 2025 17:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E6=97=A5=E5=BF=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java           | 2 +-
 .../duty/service/impl/ImsDutyEmergencyServiceImpl.java               | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java
index 9316e16..9049ee1 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java
@@ -48,7 +48,7 @@ public class ImsDutyEmergencyEntity extends BaseEntity {
 	 * 班次
 	 */
 	@TableField(exist=false)
-	@ApiModelProperty(value = "班次")
+	@ApiModelProperty(value = "班次名称")
 	private String dutyClassName;
 	/**
 	 * 登记人
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java
index 5d30caf..6062d45 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java
@@ -58,7 +58,6 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl<ImsDutyEmergencyMap
             return R.fail("您当前未值班");
         }
         imsDutyEmergencyEntity.setDutyClass(entity.getClassId());
-        imsDutyEmergencyEntity.setDutyClassName(entity.getClassName());
         imsDutyEmergencyEntity.setDutyTime(entity.getDutyDate());
         this.saveOrUpdate(imsDutyEmergencyEntity);
         return R.success("保存成功");
@@ -72,8 +71,8 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl<ImsDutyEmergencyMap
 
     @Override
     public R queryEntity(ImsDutyEmergencyVo imsDutyEmergencyVo, Query query) {
-        QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = getQueryWrapper(imsDutyEmergencyVo);
-        IPage<ImsDutyEmergencyEntity> imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), queryWrapper);
+//        QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = getQueryWrapper(imsDutyEmergencyVo);
+        IPage<ImsDutyEmergencyEntity> imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), new LambdaQueryWrapper<>());
         List<ImsDutyEmergencyEntity> records = imsDutyEmergencyEntityIPage.getRecords();
         List<ImsDutyEmergencyEntity> collect;
         if (CollectionUtils.isNotEmpty(records)) {