From 9e548566e75f1dd2de6d7e5c12d4ee2ba9d6971a Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 22 Dec 2023 09:50:18 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/rt/entity/RtRiskInventoryType.java |  2 +-
 .../controller/ProjectWorkerApiController.java      |  3 ++-
 .../service/impl/WorkerAttendanceServiceImpl.java   | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java
index 851249c95..23bce191f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java
@@ -118,7 +118,7 @@ public class RtRiskInventoryType implements Serializable {
      */
     @Excel(name = "预防措施", width = 15)
     @ApiModelProperty(value = "预防措施")
-    private java.lang.Object precaution;
+    private java.lang.String precaution;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "榕图-风险清册类型子集")
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
index de456d435..0eeb23887 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
@@ -352,7 +352,8 @@ public class ProjectWorkerApiController {
     @ApiOperation(value = "上报通行记录", notes = "上报通行记录", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "passTime", value = "通行时间,格式：2019-06-06 09:53:12", paramType = "query", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "idCard", value = "身份证号", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "idCard", value = "身份证号（idCard和attendanceNumber必须要传其中一个）", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "attendanceNumber", value = "考勤考号（项目里面唯一，idCard和attendanceNumber必须要传其中一个）", paramType = "query", required = true, dataType = "String"),
             @ApiImplicitParam(name = "direction", value = "通行方向  1:进 2出", paramType = "query", required = true, dataType = "String"),
             @ApiImplicitParam(name = "passType", value = "通行方式  1：IC卡；2：人脸识别；3：指纹识别；5：二维码；6：蓝牙", paramType = "query", required = true, dataType = "String"),
             @ApiImplicitParam(name = "projectCode", value = "项目SN", paramType = "query", required = true, dataType = "String"),
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
index deea2bc90..7c93ac4e8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
@@ -789,11 +789,22 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
             String idCard = MapUtils.getString(map, "idCard");
             Integer type = MapUtils.getInteger(map, "direction");
             String projectSn = MapUtils.getString(map, "projectCode");
+            String attendanceNumber = MapUtils.getString(map, "attendanceNumber");
             QueryWrapper<UfaceDev> devQueryWrapper = new QueryWrapper<>();
             devQueryWrapper.lambda().eq(UfaceDev::getDevSn, MapUtils.getString(map, "devCode")).eq(UfaceDev::getProjectSn, projectSn);
             UfaceDev ufaceDev = ufaceDevMapper.selectOne(devQueryWrapper);
             if (ufaceDev != null) {
-                WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(idCard, projectSn);
+                WorkerInfo info = null;
+                if (StringUtils.isNotBlank(idCard)) {
+                    info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(idCard, projectSn);
+                } else if (StringUtils.isNotBlank(attendanceNumber)) {
+                    info = workerInfoMapper.selectOne(new LambdaQueryWrapper<WorkerInfo>()
+                            .eq(WorkerInfo::getProjectSn, projectSn)
+                            .eq(WorkerInfo::getAttendanceNumber, attendanceNumber)
+                            .eq(WorkerInfo::getInserviceType, 1)
+                            .last("limit 1")
+                    );
+                }
                 if (info != null) {
                     WorkerAttendance workerAttendance = new WorkerAttendance();
                     workerAttendance.setPersonSn(info.getPersonSn());