加班管理功能调整

Lius

2024-01-26 09e22d89710364548fa896917506a372795a7bd3

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecgframework.minidao.annotation.Param;

import java.util.Date;
import java.util.List;

/**
@@ -17,17 +19,14 @@
public interface MdcTorqueConfigMapper extends BaseMapper<MdcTorqueConfig> {

    /**
     * 根据扭矩值和设备编号生成主轴运行曲线
     * @param torqueValue
     * @return
     */
    List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId);

    /**
     * 分页查询
     * @param pageData
     * @param equipmentId
     * @param mdcTorqueConfig
     * @return
     */
    IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("equipmentId") String equipmentId);
    IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData, @Param("mdcTorqueConfig") MdcTorqueConfig mdcTorqueConfig);

    MdcTorqueConfig findLast(@Param("equipmentId") String equipmentId);

    List<EquipmentMachingDto> getWorkLineList(@Param("equipmentId") String equipmentId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
}