From 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 一月 2026 18:07:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index 0fc3807..ff8faa5 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -1,15 +1,104 @@
package com.ruoyi.staff.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.staff.pojo.StaffLeave;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+import static com.ruoyi.common.enums.StaffLeaveReason.StaffLeaveReasonOther;
@AllArgsConstructor
@Service
public class StaffLeaveServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements StaffLeaveService {
+ @Autowired
+ private StaffLeaveMapper staffLeaveMapper;
+ @Autowired
+ private StaffOnJobMapper staffOnJobMapper;
+
+ //鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
+ @Override
+ public IPage<StaffLeaveDto> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return staffLeaveMapper.staffLeaveListPage(page,staffLeaveDto);
+ }
+
+ //鏂板绂昏亴
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int add(StaffLeaveDto staffLeaveDto) {
+ // 鏍￠獙鍦ㄨ亴鍛樺伐鏄惁瀛樺湪
+ StaffOnJob staffOnJob = staffOnJobMapper.selectById(staffLeaveDto.getStaffOnJobId());
+ if (staffOnJob == null) {
+ throw new IllegalArgumentException("鍛樺伐涓嶅瓨鍦�");
+ }
+
+ // 鏍￠獙鍛樺伐鏄惁绂昏亴
+ if (staffOnJob.getStaffState() == 0) {
+ throw new IllegalArgumentException("鍛樺伐宸茬鑱�");
+ }
+
+ // 鏂板绂昏亴璁板綍
+ StaffLeave staffLeave = new StaffLeave();
+ staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
+ String reason = staffLeaveDto.getReason();
+ if (!StaffLeaveReasonOther.getCode().equals(reason)){
+ staffLeave.setRemark("");
+ }
+ staffLeaveMapper.insert(staffLeave);
+
+ // 鏇存柊绂昏亴鐘舵�佷负绂昏亴
+ staffOnJob.setStaffState(0);
+ return staffOnJobMapper.updateById(staffOnJob);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int update(Long id, StaffLeaveDto staffLeaveDto) {
+ // 鍒ゆ柇瀵硅薄鏄惁瀛樺湪
+ StaffLeave leave = staffLeaveMapper.selectById(id);
+ if (leave == null){
+ throw new BaseException("璇ョ鑱岃褰曚笉瀛樺湪,鏃犳硶鏇存柊!!!");
+ }
+
+ String reason = staffLeaveDto.getReason();
+ leave.setReason(reason);
+ // 鏍￠獙绂昏亴鍘熷洜鏄惁涓哄叾浠栵紝濡傛灉鏄叾浠栵紝澶囨敞璧嬪��
+ if (StaffLeaveReasonOther.getCode().equals(reason)){
+ leave.setRemark(staffLeaveDto.getRemark());
+ } else {
+ leave.setRemark("");
+ }
+ return staffLeaveMapper.updateById(leave);
+ }
+
+ //鍒犻櫎绂昏亴
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int del(List<Integer> ids) {
+ // 鍒犻櫎绂昏亴鏁版嵁
+ return staffLeaveMapper.deleteBatchIds(ids);
+ }
+
+ //瀵煎嚭
+ @Override
+ public void export(HttpServletResponse response, StaffLeaveDto staffLeaveDto) {
+ List<StaffLeaveDto> staffLeaves =staffLeaveMapper.staffLeaveList(staffLeaveDto);
+ ExcelUtil<StaffLeaveDto> util = new ExcelUtil<StaffLeaveDto>(StaffLeaveDto.class);
+ util.exportExcel(response, staffLeaves, "鍛樺伐绂昏亴瀵煎嚭");
+ }
}
--
Gitblit v1.9.3