From d8a39f67c87a9d575ebe45495dab4f32527fefdd Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 27 May 2026 14:57:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/attendance):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=BF=9E=E7=BB=AD=E6=97=B7=E5=B7=A5=E5=A4=A9?=
 =?UTF-8?q?=E6=95=B0=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=BA?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=80=9F=E5=BA=A6=E6=8A=8A=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=88=90=E4=B8=A4=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 前端新增“计算连续旷工”按钮，调用后端重算接口并优化加载状态管理
2. 后端新增recalcContinuousAbsent方法及接口，支持按指定员工或时间范围重算连续旷工天数
3. 优化考勤检查页面按钮布局，明确“生成考勤结果”操作
---
 klp-ui/src/api/wms/attendanceCheck.js         |  9 ++++++
 .../wms/hrm/attendance/attendanceCheck.vue    | 32 ++++++++++++++++---
 .../WmsAttendanceCheckController.java         |  7 ++++
 .../service/IWmsAttendanceCheckService.java   |  2 ++
 .../impl/WmsAttendanceCheckServiceImpl.java   | 26 ++++++++++++---
 5 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/klp-ui/src/api/wms/attendanceCheck.js b/klp-ui/src/api/wms/attendanceCheck.js
index 3f061550..7faf1eb5 100644
--- a/klp-ui/src/api/wms/attendanceCheck.js
+++ b/klp-ui/src/api/wms/attendanceCheck.js
@@ -51,3 +51,12 @@ export function generateAttendanceCheck(data) {
     data: data
   })
 }
+
+// 重算连续旷工天数
+export function recalcContinuousAbsent(data) {
+  return request({
+    url: '/wms/attendanceCheck/recalcContinuousAbsent',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
index 6c4e8004..bbd29626 100644
--- a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
@@ -425,7 +425,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="checkLoading" type="primary" @click="submitCheck">确 定</el-button>
+        <el-button :loading="recalcLoading" type="warning" @click="submitRecalc">计算连续旷工</el-button>
+        <el-button :loading="checkLoading" type="primary" @click="submitCheck">确 定(生成考勤结果)</el-button>
         <el-button @click="cancelCheck">取 消</el-button>
       </div>
     </el-dialog>
@@ -433,7 +434,7 @@
 </template>
 
 <script>
-import { listAttendanceCheck, getAttendanceCheck, delAttendanceCheck, generateAttendanceCheck, updateAttendanceCheck } from "@/api/wms/attendanceCheck";
+import { listAttendanceCheck, getAttendanceCheck, delAttendanceCheck, generateAttendanceCheck, updateAttendanceCheck, recalcContinuousAbsent } from "@/api/wms/attendanceCheck";
 import TimeRangePicker from "@/views/wms/report/components/timeRangePicker";
 import { listOutRequest } from "@/api/wms/outRequest";
 import { listLeaveRequest } from "@/api/wms/leaveRequest";
@@ -450,6 +451,7 @@ export default {
     return {
       loading: true,
       checkLoading: false,
+      recalcLoading: false,
       showSearch: true,
       attendanceData: [],
       dateList: [],
@@ -759,13 +761,13 @@ export default {
 
       Object.values(dataMap).forEach(employeeData => {
         const dates = Object.keys(employeeData).filter(key => key !== 'employeeName' && key !== 'employeeId').sort()
-        
+
         dates.forEach((date, index) => {
           const currentRecord = employeeData[date]
           if (currentRecord && currentRecord.shiftName === '生产倒班夜班') {
             const nextDate = dayjs(date).add(1, 'day').format('YYYY-MM-DD')
             const nextRecord = employeeData[nextDate]
-            
+
             if (nextRecord && nextRecord.shiftName === '夜转白') {
               currentRecord.p1EndTime = ''
               currentRecord.p1LastCheck = ''
@@ -875,6 +877,8 @@ export default {
 
     cancelCheck() {
       this.checkOpen = false
+      this.checkLoading = false
+      this.recalcLoading = false
       this.checkForm = { startDate: undefined, endDate: undefined }
       this.selectedUserIds = []
       this.checkDept = ''
@@ -907,6 +911,24 @@ export default {
       })
     },
 
+    submitRecalc() {
+      this.$refs["checkForm"].validate(valid => {
+        if (valid) {
+          this.recalcLoading = true
+          const params = {
+            ...this.checkForm,
+            userIds: this.selectedUserIds
+          }
+          recalcContinuousAbsent(params).then(response => {
+            this.$modal.msgSuccess("重算成功")
+            this.getList()
+          }).finally(() => {
+            this.recalcLoading = false
+          })
+        }
+      })
+    },
+
     handleUpdate() {
       if (this.currentDetail) {
         const checkId = this.currentDetail.checkId
@@ -1207,4 +1229,4 @@ export default {
   margin-right: 10px;
   white-space: nowrap;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java
index 5f4cada4..ab04d77d 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java
@@ -58,6 +58,13 @@ public class WmsAttendanceCheckController extends BaseController {
         return R.ok();
     }
 
+    @Log(title = "重算连续旷工", businessType = BusinessType.UPDATE)
+    @PostMapping("/recalcContinuousAbsent")
+    public R<Void> recalcContinuousAbsent(@Validated @RequestBody AttendanceCheckBo bo) {
+        iWmsAttendanceCheckService.recalcContinuousAbsent(bo);
+        return R.ok();
+    }
+
     @Log(title = "考勤比对", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAttendanceCheckBo bo) {
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java
index 5a78ba07..782a38e0 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java
@@ -21,5 +21,7 @@ public interface IWmsAttendanceCheckService {
 
     void checkAttendance(AttendanceCheckBo bo);
 
+    void recalcContinuousAbsent(AttendanceCheckBo bo);
+
     Boolean updateByBo(WmsAttendanceCheckBo bo);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
index 6b26483a..d1c51848 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
@@ -124,9 +124,9 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
         // 获取当前有效的考勤规则
         WmsAttendanceRule rule = getActiveRule();
 
-        // 将日期转换为LocalDate类型
-        LocalDate startLocal = toLocalDate(bo.getStartDate());
-        LocalDate endLocal = toLocalDate(bo.getEndDate());
+//        // 将日期转换为LocalDate类型
+//        LocalDate startLocal = toLocalDate(bo.getStartDate());
+//        LocalDate endLocal = toLocalDate(bo.getEndDate());
 
         // 创建待处理的考勤计划列表
         List<WmsAttendanceScheduleVo> toProcess = new ArrayList<>();
@@ -205,8 +205,26 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
 
         // 批量插入考勤检查记录
         baseMapper.insertBatch(checksToInsert, BATCH_SIZE);
+    }
 
-        // 更新连续缺勤记录
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void recalcContinuousAbsent(AttendanceCheckBo bo) {
+        LocalDate startLocal = toLocalDate(bo.getStartDate());
+        LocalDate endLocal = toLocalDate(bo.getEndDate());
+        Set<Long> affectedUserIds;
+        if (bo.getUserIds() != null && !bo.getUserIds().isEmpty()) {
+            affectedUserIds = new HashSet<>(bo.getUserIds());
+        } else {
+            List<WmsAttendanceCheck> checks = baseMapper.selectList(Wrappers.<WmsAttendanceCheck>lambdaQuery()
+                .select(WmsAttendanceCheck::getUserId)
+                .ge(WmsAttendanceCheck::getWorkDate, toDate(startLocal.atStartOfDay()))
+                .le(WmsAttendanceCheck::getWorkDate, toDate(endLocal.atTime(LocalTime.of(23, 59, 59))))
+                .eq(WmsAttendanceCheck::getDelFlag, 0));
+            affectedUserIds = checks.stream()
+                .map(WmsAttendanceCheck::getUserId)
+                .collect(Collectors.toSet());
+        }
         updateContinuousAbsent(startLocal, endLocal, affectedUserIds);
     }