提交和查询隐患检查

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/checkrecord/ReqCreateCheckRecord.java

@@ -53,7 +53,7 @@ public class ReqCreateCheckRecord {
 	/**
 	 * 检查人员
 	 */
-	private String checkPerson;
+	private String checkPersonName;
 	/**
 	 * 联系方式
 	 */

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

@@ -76,7 +76,7 @@ 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::getCheckPerson, search.getCheckPerson());
+        queryWrapper.like(StringUtil.isNotNullOrEmpty(search.getCheckPerson()), CheckRecordPO::getCheckPersonName, search.getCheckPerson());
         // 是否有隐患
         queryWrapper.eq(NumericUtil.tryParseInt(search.getHasDanger()).compareTo(0) > -1, CheckRecordPO::getHasDanger, search.getHasDanger());
 

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/CheckRecordService.java

@@ -126,6 +126,8 @@ public class CheckRecordService extends BasicService {
         item.setCustomsName(mapDicData.get(request.getCustoms()));
         // 检查时间
         item.setCheckTime(LocalDateTimeUtil.getTimeStamp(request.getCheckTime(), Constants.STR_DATE).getTime());
+        // 检查人员
+        item.setCheckPerson(loginUser.getUserId().toString());
         // 网格类型
         item.setGridCategory(grid.getGridCategory());
         // 隐患分类
@@ -222,6 +224,9 @@ public class CheckRecordService extends BasicService {
 
     public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search) {
         LoginUser loginUser = LoginHelper.getLoginUser();
+        if (Objects.isNull(loginUser)) {
+            throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
+        }
         // 获取用户
         SysUser user = userMapper.selectUserById(Long.parseLong(loginUser.getLoginId()));
         // 获取网格员信息

secure-producting-vue/src/views/grid/components/SubmitDangerCheck.vue

@@ -33,9 +33,9 @@
           placeholder="请选择"
         />
       </el-form-item>
-      <el-form-item label="检查人员" prop="checkPerson">
+      <el-form-item label="检查人员" prop="checkPersonName">
         <span class="form-line-left">
-          <el-input v-model="formSubmit.checkPerson" placeholder="请输入" style="width:215px;" />
+          <el-input v-model="formSubmit.checkPersonName" placeholder="请输入" style="width:215px;" />
         </span>
         <span class="form-line-right">联系方式</span>
         <el-input v-model="formSubmit.contactInfo" placeholder="请输入" style="width:220px;" />
@@ -215,7 +215,7 @@ const formSubmit = ref({
   checkFormId: props.checkFormId,
   customs: undefined,
   checkTime: parseTime(new Date(), '{y}-{m}-{d}'),
-  checkPerson: '',
+  checkPersonName: '',
   contactInfo: '',
   listAttachment: [],
   listItem: [],
@@ -229,7 +229,7 @@ const rulesSubmit = ref({
   checkFormId: [{ required: true, message: "所属检查表不能为空", trigger: "blur" }],
   customs: [{ required: true, message: "关区代码不能为空", trigger: "blur" }],
   checkTime: [{ required: true, message: "检查时间不能为空", trigger: "blur" }],
-  checkPerson: [{ required: true, message: "检查人员不能为空", trigger: "blur" }],
+  checkPersonName: [{ required: true, message: "检查人员不能为空", trigger: "blur" }],
   contactInfo: [{ required: true, message: "联系方式不能为空", trigger: "blur" }],
   listItem: [{ required: true, message: "检查项列表不能为空", trigger: "blur" }],
   isSubmit: [{ required: true, message: "是否直接提交不能为空", trigger: "blur" }],
@@ -334,7 +334,7 @@ function getLoginUser() {
   .then((response) => {
     loginUser.value = response.data.user;
 
-    formSubmit.value.checkPerson = loginUser.value.nickName;
+    formSubmit.value.checkPersonName = loginUser.value.nickName;
     formSubmit.value.contactInfo = loginUser.value.phonenumber;
   });
 }