From 970e7b9336aeb7e35c2bbef18bb1d6c1be0f41f7 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 20 八月 2024 09:29:06 +0800 Subject: [PATCH] 8.20合并代码 --- performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java index 8f3c971..fd84bcd 100644 --- a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java +++ b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java @@ -1,11 +1,14 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto; +import com.yuanchu.mom.dto.HoursDay; import com.yuanchu.mom.pojo.AuxiliaryWorkingHours; import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay; import com.baomidou.mybatisplus.extension.service.IService; import java.time.LocalDateTime; +import java.util.List; import java.util.Map; /** @@ -18,13 +21,13 @@ */ public interface AuxiliaryWorkingHoursDayService extends IService<AuxiliaryWorkingHoursDay> { - Map<String, Object> selectAuxiliaryWorkingHoursDay(Page page, AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay); + Map<String, Object> selectAuxiliaryWorkingHoursDay(Page page, AuxiliaryWorkingHoursDayDto auxiliaryWorkingHoursDayDto); int insertAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay); AuxiliaryWorkingHoursDay selectAuxiliaryWorkingHoursByNumber(String number); - int checkOrApprove(Integer id, String state); + boolean checkOrApprove(HoursDay hoursDay); int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay); -- Gitblit v1.9.3