查询隐患检查单

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/search/SearchCheckRecord.java

@@ -48,8 +48,13 @@ public class SearchCheckRecord extends SearchBasicDTO {
 	private Long checkTimeEnd;
 	/**
 	 * 检查人员
+	 * @ignore
 	 */
 	private String checkPerson;
+	/**
+	 * 检查人员名称
+	 */
+	private String checkPersonName;
 	/**
 	 * 是否有隐患 EYesOrNo
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/CheckRecordMapperImpl.java

@@ -76,7 +76,9 @@ public class CheckRecordMapperImpl extends BasicMapper<CheckRecordPO> {
         // 检查时间-截止
         queryWrapper.le(NumericUtil.tryParseLong(search.getCheckTimeEnd()).compareTo(0L) > 0, CheckRecordPO::getCheckTime, search.getCheckTimeEnd());
         // 检查人员
-        queryWrapper.like(StringUtil.isNotNullOrEmpty(search.getCheckPerson()), CheckRecordPO::getCheckPersonName, search.getCheckPerson());
+        queryWrapper.eq(StringUtil.isNotNullOrEmpty(search.getCheckPerson()), CheckRecordPO::getCheckPerson, search.getCheckPerson());
+        // 检查人员名称
+        queryWrapper.like(StringUtil.isNotNullOrEmpty(search.getCheckPersonName()), CheckRecordPO::getCheckPersonName, search.getCheckPersonName());
         // 是否有隐患
         queryWrapper.eq(NumericUtil.tryParseInt(search.getHasDanger()).compareTo(0) > -1, CheckRecordPO::getHasDanger, search.getHasDanger());
 

secure-producting-vue/src/views/form/DangerCheckRecord.vue

@@ -50,9 +50,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="检查人员" prop="checkPerson">
+      <el-form-item label="检查人员" prop="checkPersonName">
         <el-input
-          v-model="queryParams.checkPerson"
+          v-model="queryParams.checkPersonName"
           placeholder="请输入"
           clearable
           style="width:200px"
@@ -156,7 +156,7 @@
       <el-table-column label="检查表名称" width="300" align="left" prop="checkFormName" />
       <el-table-column label="所属部门" align="center" prop="departmentTxt" />
       <el-table-column label="所属关区" align="center" prop="customsName" />
-      <el-table-column label="检查人员" align="center" prop="checkPerson" />
+      <el-table-column label="检查人员" align="center" prop="checkPersonName" />
       <el-table-column label="是否有隐患" width="89" align="center" prop="hasDangerTxt" />
       <el-table-column label="整改期限" width="96" align="center" prop="rectifyDeadlineView">
         <template #default="scope">