值班日志管理

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;
 	/**
 	 * 登记人

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);
+//        QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = getQueryWrapper(imsDutyEmergencyVo);
-        IPage<ImsDutyEmergencyEntity> imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), queryWrapper);
+        IPage<ImsDutyEmergencyEntity> imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), new LambdaQueryWrapper<>());
         List<ImsDutyEmergencyEntity> records = imsDutyEmergencyEntityIPage.getRecords();
         List<ImsDutyEmergencyEntity> collect;
         if (CollectionUtils.isNotEmpty(records)) {