lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-10-29 15:57:06 +08:00
parent 866f2336c3 e4132ea540
commit 4faff3b0bc
6 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java
View File

@ -318,11 +318,13 @@ public class BusMrpBaseServiceImpl extends ServiceImpl<BusMrpBaseMapper, BusMrpB
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
map.put("remainingQuantity",quantity.subtract(reduce));
map.put("specification",busBillofquantities.getSpecification());
map.put("suppliespriceId",limitListId);
map.put("unit",busBillofquantities.getUnit());
map.put("remark",busBillofquantities.getRemark());
map.put("name",busBillofquantities.getName());
if (busBillofquantities != null) {
map.put("specification",busBillofquantities.getSpecification());
map.put("unit",busBillofquantities.getUnit());
map.put("remark",busBillofquantities.getRemark());
map.put("name",busBillofquantities.getName());
}
return map;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java
View File

@ -87,8 +87,7 @@ public class AttendanceJob {
.lt(BusAttendanceRule::getClockInResultTime, end));
}
//获取当前日期
LocalDate date = LocalDate.now();
//管理员关联多个项目，需要记录是否已生成缺卡记录
// HashSet<Long> manageUserIds = new HashSet<>();
@ -97,6 +96,8 @@ public class AttendanceJob {
for (BusAttendanceRule rule : list) {
LocalTime clockInTime = rule.getClockInTime();
LocalTime clockInResultTime = rule.getClockInResultTime();
//获取当前日期
LocalDate date = LocalDate.now();
//计算考勤日期
if (start.isAfter(end)) { // 跨天情况

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceDeviceController.java
View File

@ -78,6 +78,7 @@ public class BusAttendanceDeviceController extends BaseController {
req.setUserId(userId);
req.setPunchTime(localDateTime);
req.setSource("1");
req.setSn(dto.getSn());
//打印req
log.info("请求参数：{}", req);
//base64转MultipartFile

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java
View File

@ -118,4 +118,9 @@ public class BusAttendance extends BaseEntity {
* 来源
*/
private String source;
/**
* 设备序列号
*/
private String sn;
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java
View File

@ -53,4 +53,6 @@ public class BusAttendancePunchCardByFaceReq implements Serializable {
*/
private String source;
private String sn;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -420,6 +420,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
attendance.setReplaceId(replaceId);
if(req.getSource() != null){
attendance.setSource(req.getSource());
attendance.setSn(req.getSn());
}
// 记录打卡坐标
attendance.setLat(req.getLat());
@ -465,6 +466,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
}
busAttendance.setSource(req.getSource());
busAttendance.setSn(req.getSn());
//如果是缺卡需要上传人脸
if(oldStatus.equals(BusAttendanceClockStatusEnum.UNCLOCK.getValue())){
SysOssVo upload = ossService.upload(file);
@ -480,6 +482,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
BusAttendance busAttendance = outAttendances.getFirst();
if("1".equals(req.getSource())){
busAttendance.setSource(req.getSource());
busAttendance.setSn(req.getSn());
if(busAttendance.getClockStatus().equals(BusAttendanceClockStatusEnum.UNCLOCK.getValue())){
SysOssVo upload = ossService.upload(file);
busAttendance.setFacePic(upload.getOssId().toString());
@ -532,6 +535,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
attendance.setReplaceId(replaceId);
if(req.getSource() != null){
attendance.setSource(req.getSource());
attendance.setSn(req.getSn());
}
// 记录打卡坐标
attendance.setLat(req.getLat());