From d4e67803e0748a4a7af58739e0ca3108482d86d7 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 12 十月 2023 09:14:00 +0800
Subject: [PATCH] bug修改
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java | 4 ++--
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcCertServiceImpl.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java
index 124c654..a6cf52d 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java
@@ -31,8 +31,8 @@
@ApiModelProperty(value = "IC卡编号")
private String icNum;
//作业时间
- @ApiModelProperty(value = "作业时间",required = true)
- @NotNull(message = "请填写做业时间")
+ @ApiModelProperty(value = "违章时间",required = true)
+ @NotNull(message = "请填写违章时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date violationTime;
//违章附件
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcCertServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcCertServiceImpl.java
index cb13f60..2bc8bf4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcCertServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcCertServiceImpl.java
@@ -39,7 +39,8 @@
public List<NcCert> getList(NcCertQuery query) {
List<NcCert> ncCerts = ncCertMapper.selectList(new LambdaQueryWrapper<NcCert>()
.eq(NcCert::getDelFlag, (byte) 0)
- .eq(StringUtils.isNotEmpty(query.getName()), NcCert::getName, query.getName())
+ .like(StringUtils.isNotEmpty(query.getName()), NcCert::getName, query.getName())
+ .eq(StringUtils.isNotEmpty(query.getIdcardNum()),NcCert::getIdcardNum,query.getIdcardNum())
);
return ncCerts;
}
--
Gitblit v1.9.2