From daf9f8dbb7ba36eb283221d2c6022039aefaf97d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 00:40:38 +0800
Subject: [PATCH] feat(aftersales): 售后退货单同步MES批次信息并优化工单处理流程
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 8c38076..0e41948 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -83,14 +83,21 @@
@Override
public HrmAttendanceMyStatusRespVO getMyStatus(Long loginUserId, LocalDate date) {
LocalDate queryDate = date != null ? date : LocalDate.now();
+ HrmAttendanceMyStatusRespVO respVO = new HrmAttendanceMyStatusRespVO();
+ respVO.setUserId(loginUserId);
+ respVO.setDate(queryDate);
+ respVO.setServerTime(LocalDateTime.now());
// 1. 鐧诲綍鐢ㄦ埛 -> 鍛樺伐妗ｆ
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ HrmAttendanceMyStatusRespVO.Clockable clockable = new HrmAttendanceMyStatusRespVO.Clockable();
+ clockable.setClockIn(false);
+ clockable.setClockOut(false);
+ clockable.setNextAction("none");
+ clockable.setMessage("褰撳墠璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝璇疯仈绯荤鐞嗗憳鍦ㄥ憳宸ョ鐞嗕腑瀹屾垚鍏宠仈");
+ respVO.setClockable(clockable);
+ return respVO;
}
- HrmAttendanceMyStatusRespVO respVO = new HrmAttendanceMyStatusRespVO();
- respVO.setUserId(loginUserId);
respVO.setEmployeeId(employee.getId());
respVO.setEmployeeName(employee.getName());
respVO.setDeptId(employee.getDeptId());
@@ -100,8 +107,6 @@
respVO.setDeptName(dept.getName());
}
}
- respVO.setDate(queryDate);
- respVO.setServerTime(LocalDateTime.now());
// 2. 鏄惁宸ヤ綔鏃� + 浼戞伅鍘熷洜
boolean workDay = attendanceHolidayService.isWorkDay(queryDate);
--
Gitblit v1.9.3