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

bug修复

Browse Source
This commit is contained in:
guo 2023-12-22 09:50:18 +08:00
parent 6be05fecb8
commit 9e548566e7
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java
View File

@ -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 = "榕图-风险清册类型子集")

3
src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
View File

@ -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"),

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

@ -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());