From e1a6e20d22fbcb862247fac0a671a2a2722e7755 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期五, 29 八月 2025 14:07:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy --- main-business/src/main/java/com/ruoyi/business/service/impl/StaffOnJobServiceImpl.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/StaffOnJobServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/StaffOnJobServiceImpl.java index 9a0b4cd..1fb68a8 100644 --- a/main-business/src/main/java/com/ruoyi/business/service/impl/StaffOnJobServiceImpl.java +++ b/main-business/src/main/java/com/ruoyi/business/service/impl/StaffOnJobServiceImpl.java @@ -10,6 +10,9 @@ import com.ruoyi.business.mapper.StaffJoinLeaveRecordMapper; import com.ruoyi.business.mapper.StaffOnJobMapper; import com.ruoyi.business.service.IStaffOnJobService; +import com.ruoyi.business.vo.SaveStaffOnJobVo; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import jakarta.servlet.http.HttpServletResponse; @@ -17,7 +20,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.util.Collection; import java.util.List; +import java.util.Objects; @AllArgsConstructor @Service @@ -31,6 +36,9 @@ //鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ @Override public IPage<StaffOnJob> staffOnJobListPage(Page page, StaffOnJob staffOnJob) { + + + return staffOnJobMapper.staffOnJobListPage(page,staffOnJob); } @@ -67,5 +75,17 @@ } } + @Override + public void saveStaffOnJob(SaveStaffOnJobVo vo) { + StaffOnJob staffOnJob = new StaffOnJob(); + BeanUtils.copyProperties(vo, staffOnJob); + if (Objects.isNull(staffOnJob.getId())){ + // todo 鏆傛椂鏈湁鏂板瑕佹眰 + throw new ServiceException("鍚庡彴鏆傛湭纭畾寮�鍙�"); + } + + staffOnJobMapper.insertOrUpdate(staffOnJob); + } + } -- Gitblit v1.9.3