From a39f95b78ebc0e42eb7bd60694ead48e36d22bda Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 23 Apr 2024 00:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/worker/entity/WorkerInfoAuditRecord.java | 8 +++++++-
 .../xz/controller/XzWorkerInfoAuditRecordController.java  | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java
index f6ab3be58..7a85c509a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfoAuditRecord.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.worker.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -219,5 +220,10 @@ public class WorkerInfoAuditRecord implements Serializable {
 	/**培训是否合格*/
 	@Excel(name = "培训是否合格", width = 15)
 	@ApiModelProperty(value="培训是否合格")
-	private java.lang.Boolean isExamPass;
+	private java.lang.Integer isExamPass;
+
+	/**培训时间*/
+	@Excel(name = "培训时间", width = 15)
+	@ApiModelProperty(value="培训时间")
+	private Date educationTime;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
index 43755066c..284953cf0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -121,7 +122,8 @@ public class XzWorkerInfoAuditRecordController {
         WorkerSafeEducationWorker workerSafeEducationWorker = safeEducationQuestionAnswerService.xzSaveQuestionAnswer(dataVo);
         WorkerInfoAuditRecord infoAuditRecord = new WorkerInfoAuditRecord();
         infoAuditRecord.setId(dataVo.getWorkerId());
-        infoAuditRecord.setIsExamPass(workerSafeEducationWorker.getIsQualified() == 1 ? true : false);
+        infoAuditRecord.setIsExamPass(workerSafeEducationWorker.getIsQualified() == 1 ? 1 : 0);
+        infoAuditRecord.setEducationTime(new Date());
         workerInfoAuditRecordService.updateById(infoAuditRecord);
         return Result.success(workerSafeEducationWorker);
     }
@@ -169,7 +171,7 @@ public class XzWorkerInfoAuditRecordController {
         WorkerInfoAuditRecord workerInfoAuditRecord = workerInfoAuditRecordService.getOne(Wrappers.<WorkerInfoAuditRecord>lambdaQuery()
                 .eq(WorkerInfoAuditRecord::getIdCard, idCard).eq(WorkerInfoAuditRecord::getProjectSn, projectSn));
         if (workerInfoAuditRecord == null) {
-            result.error500(MessageUtil.get("notFindErr"));
+            result.error500("未找到人员信息,请重新输入身份证号");
         } else {
             result.setResult(workerInfoAuditRecord);
             result.setSuccess(true);