From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
index b44b659..9730df6 100644
--- a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
+++ b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
@@ -35,32 +35,32 @@
* 瀹氭椂浠诲姟锛氭瘡澶╁噷鏅�1鐐规墽琛�
* 鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑鍛樺伐
*/
-// @Scheduled(cron = "0 0 1 * * ?")
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0 0 1 * * ?")
public void generateAbsenceRecords() {
-
try {
// 鑾峰彇鏄ㄦ棩鏃ユ湡
LocalDate yesterday = LocalDate.now().minusDays(1);
- log.info("鐢熸垚鏃ユ湡锛歿} 鐨勭己鍕よ褰�", yesterday);
// 鐩存帴鏌ヨ鏄ㄥぉ娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑锛�
- List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecord(yesterday);
+ LocalDateTime todayStart = LocalDate.now().atStartOfDay();
+ List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecordBeforeTime(yesterday, todayStart);
// 閬嶅巻娌℃湁鑰冨嫟璁板綍鐨勫憳宸ワ紝鐢熸垚缂哄嫟璁板綍
for (StaffOnJob staff : staffWithoutAttendance) {
try {
+ boolean exists = personalAttendanceRecordsMapper.existsAttendanceRecord(staff.getId(), yesterday);
+ if (exists) {
+ continue;
+ }
+
PersonalAttendanceRecords absenceRecord = new PersonalAttendanceRecords();
absenceRecord.setStaffOnJobId(staff.getId());
absenceRecord.setDate(yesterday);
- absenceRecord.setWorkStartAt(null);
- absenceRecord.setWorkEndAt(null);
- absenceRecord.setWorkHours(BigDecimal.ZERO);
absenceRecord.setStatus(4); // 璁剧疆鐘舵�佷负缂哄嫟
absenceRecord.setRemark("绯荤粺鑷姩鐢熸垚-缂哄嫟");
- absenceRecord.setTenantId(staff.getTenantId());
absenceRecord.setCreateTime(LocalDateTime.now());
absenceRecord.setUpdateTime(LocalDateTime.now());
+ absenceRecord.setTenantId(staff.getTenantId());
personalAttendanceRecordsService.save(absenceRecord);
} catch (Exception e) {
--
Gitblit v1.9.3