lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -1049,7 +1049,7 @@ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = user.getId(); if (StringUtils.isNotEmpty(user.getEquipmentIds())) { return this.baseMapper.selectList(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, Arrays.asList(user.getEquipmentIds().split(StringPool.COMMA)))); return this.baseMapper.selectList(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getEquipmentId, Arrays.asList(user.getEquipmentIds().split(StringPool.COMMA)))); } //获取所有产线数据 List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder)); lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentPunchServiceImpl.java
@@ -136,13 +136,16 @@ MdcEquipmentPunch equipmentPunch = new MdcEquipmentPunch(); if (first.isPresent()) { equipmentPunch = first.get(); //已存在记录说明已打下班卡，故将是否缺卡置为否 equipmentPunch.setIsAbsent(0); }else { equipmentPunch.setEquipmentId(equipment); equipmentPunch.setPunchUser(userId); equipmentPunch.setRecordDate(currentDate); equipmentPunch.setShiftSchedule(mdcEquipmentPunch.getShiftSchedule()); equipmentPunch.setIsAbsent(0); equipmentPunch.setIsEarly(0); //正常打卡时先将是否缺卡置为“是”，防止未打下班卡时无法调整状态 equipmentPunch.setIsAbsent(1); } equipmentPunch.setCheckInTime(mdcEquipmentPunch.getCheckInTime()); //打卡时间大于8：30/17:00时为迟到打卡 @@ -214,6 +217,7 @@ MdcEquipmentPunch equipmentPunch = new MdcEquipmentPunch(); if (mdcEquipmentPunchOptional.isPresent()) { equipmentPunch = mdcEquipmentPunchOptional.get(); equipmentPunch.setIsAbsent(0); }else { equipmentPunch.setIsAbsent(1); equipmentPunch.setIsLate(0);
