feat:完成出差申请提前结束功能

fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmTravelReqController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.hrm.controller;
 
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.AjaxResult;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
@@ -28,6 +29,7 @@ import java.util.List;
 public class HrmTravelReqController extends BaseController {
 
     private final IHrmTravelReqService service;
+    private final IHrmTravelReqService hrmTravelReqService;
 
     @GetMapping("/list")
     public TableDataInfo<HrmTravelReqVo> list(HrmTravelReqBo bo, PageQuery pageQuery) {
@@ -56,6 +58,10 @@ public class HrmTravelReqController extends BaseController {
     public R<Void> remove(@PathVariable @NotEmpty Long[] bizIds) {
         return toAjax(service.deleteWithValidByIds(Arrays.asList(bizIds), true));
     }
+    @PutMapping("/earlyEnd/{bizId}")
+    public R<Void> earlyEnd(@PathVariable Long bizId) {
+        return toAjax(hrmTravelReqService.earlyEnd(bizId));
+    }
 
     @GetMapping("/all")
     public R<List<HrmTravelReqVo>> all(HrmTravelReqBo bo) {

fad-hrm/src/main/java/com/ruoyi/hrm/domain/HrmTravelReq.java

@@ -32,6 +32,7 @@ public class HrmTravelReq extends BaseEntity {
     private String bankName;
     private String bankAccount;
     private String remark;
+    private Date actualEndTime;
     @TableLogic
     private Integer delFlag;
 }

fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmTravelReqService.java

@@ -22,5 +22,7 @@ public interface IHrmTravelReqService {
 
     Boolean updateByBo(HrmTravelReqBo bo);
 
+    int earlyEnd(Long bizId);
+
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }

fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmTravelReqServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Date;
 
 @RequiredArgsConstructor
 @Service
@@ -128,4 +129,36 @@ public class HrmTravelReqServiceImpl implements IHrmTravelReqService {
     private String defaultStatus(String status) {
         return status == null ? "draft" : status;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int earlyEnd(Long bizId) {
+        HrmTravelReq travelReq = baseMapper.selectById(bizId);
+        if (travelReq == null) {
+            throw new RuntimeException("出差申请不存在");
+        }
+
+        String status = travelReq.getStatus();
+        if (!"approved".equals(status) && !"in_progress".equals(status)) {
+            throw new RuntimeException("当前状态不能提前结束，只有已通过或进行中的出差才能提前结束");
+        }
+
+        // 3. 检查是否已经提前结束过
+        if (travelReq.getActualEndTime() != null) {
+            throw new RuntimeException("该出差已经提前结束过了");
+        }
+
+        // 4. 更新实际结束时间为当前时间
+        travelReq.setActualEndTime(new Date());
+        // 5. 可选：更新状态为已完成
+        travelReq.setStatus("completed");
+
+        // 6. 执行更新
+        int result = baseMapper.updateById(travelReq);
+        if (result <= 0) {
+            throw new RuntimeException("提前结束失败");
+        }
+
+        return result;
+    }
 }