admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

辅助考勤

Browse Source
This commit is contained in:
guoshengxiong 2024-07-25 20:36:45 +08:00
parent 931153d8b5
commit 0ca6ce89b6
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
View File

@ -128,7 +128,7 @@ public class WorkerAttendanceController {
@ApiImplicitParam(name = "projectSn", value = "项目Sn", dataType = "Integer", paramType = "body", required = true), @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 = "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 = "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) @ApiImplicitParam(name = "photoUrl", value = "图片", dataType = "String", paramType = "body", required = false)
}) })

12
src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerAttendance.java
View File

@ -54,10 +54,10 @@ public class WorkerAttendance implements Serializable {
@ApiModelProperty(value = "项目sn") @ApiModelProperty(value = "项目sn")
private java.lang.String projectSn; 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) @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身份证") @ApiModelProperty(value = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作(辅助考勤)，5二维码，6蓝牙,7手机打卡,8车辆通行,9身份证")
private java.lang.Integer cardType; private java.lang.Integer cardType;
/** /**
* 考勤图片URL * 考勤图片URL
@ -128,6 +128,12 @@ public class WorkerAttendance implements Serializable {
*/ */
@ApiModelProperty(value = "疫苗接种次数，0未接种，1接种一针，2接种两针，3接种三针") @ApiModelProperty(value = "疫苗接种次数，0未接种，1接种一针，2接种两针，3接种三针")
private java.lang.Integer vaccinateState; private java.lang.Integer vaccinateState;
/**
* 辅助考勤（补卡）原因
*/
@ApiModelProperty(value = "辅助考勤（补卡）原因")
private java.lang.String reissueCardReason;
/** /**
* 出入时间的小时 * 出入时间的小时
*/ */

1
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
View File

@ -155,6 +155,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
workerAttendance.setAttendanceType(2); workerAttendance.setAttendanceType(2);
workerAttendance.setCardType(4); workerAttendance.setCardType(4);
workerAttendance.setImageUrl(MapUtils.getString(map, "photoUrl")); workerAttendance.setImageUrl(MapUtils.getString(map, "photoUrl"));
workerAttendance.setReissueCardReason(MapUtils.getString(map, "reissueCardReason"));
String time = MapUtils.getString(map, "time"); String time = MapUtils.getString(map, "time");
time = time.substring(0, 10); time = time.substring(0, 10);
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");