From 0ca6ce89b67cafb94e40639cee8f1a1770dc47da Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 25 Jul 2024 20:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkerAttendanceController.java | 2 +- .../xmgl/modules/worker/entity/WorkerAttendance.java | 12 +++++++++--- .../service/impl/WorkerAttendanceServiceImpl.java | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java index 4eb12603e..42ad6dd33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java @@ -128,7 +128,7 @@ public class WorkerAttendanceController { @ApiImplicitParam(name = "projectSn", value = "项目Sn", dataType = "Integer", paramType = "body", required = true), @ApiImplicitParam(name = "type", value = "进出类型，1进，2出", dataType = "Integer", paramType = "body", required = true), @ApiImplicitParam(name = "time", value = "时间,格式2020-10-01 05:05:15", dataType = "String", paramType = "body", required = true), - @ApiImplicitParam(name = "personSn", value = "工号", dataType = "String", paramType = "body", required = true), + @ApiImplicitParam(name = "personSn", value = "personSn", dataType = "String", paramType = "body", required = true), @ApiImplicitParam(name = "photoUrl", value = "图片", dataType = "String", paramType = "body", required = false) }) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendance.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendance.java index df5a43792..5f63af173 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendance.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendance.java @@ -54,10 +54,10 @@ public class WorkerAttendance implements Serializable { @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; /** - * 卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证 + * 卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作(辅助考勤)，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证 */ - @Excel(name = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证", width = 15) - @ApiModelProperty(value = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证") + @Excel(name = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作(辅助考勤)，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证", width = 15) + @ApiModelProperty(value = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作(辅助考勤)，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证") private java.lang.Integer cardType; /** * 考勤图片URL @@ -128,6 +128,12 @@ public class WorkerAttendance implements Serializable { */ @ApiModelProperty(value = "疫苗接种次数，0未接种，1接种一针，2接种两针，3接种三针") private java.lang.Integer vaccinateState; + /** + * 辅助考勤（补卡）原因 + */ + @ApiModelProperty(value = "辅助考勤（补卡）原因") + private java.lang.String reissueCardReason; + /** * 出入时间的小时 */ 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 d2fbef75c..46fcaccea 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 @@ -155,6 +155,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl