Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.github.pagehelper.PageInfo;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;

@@ -97,11 +98,20 @@
     */
    public void checkWellAllowed(ArdAlarmpointsWell well);

    /**
     * 核对井号是否唯一
     *
     * @param id 需要核对的井的主键
     * @return 结果
     */

    public Boolean checkWellIdExists(ArdAlarmpointsWell well);

    List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList);

    ArdAlarmpointsWell wellById(String id);

    List<ArdAlarmpointsWell> wellList(List<Long> deptList);

    List<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
    PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
}