Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 dd571bf55de7f9a72d458adc179958ed2f9473c0

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java

@@ -4,7 +4,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.MeteringPlanAndInfoAndIns;
import com.yuanchu.limslaboratory.pojo.MetricalInfoAndIns;
import com.yuanchu.limslaboratory.pojo.dto.AddPlanDto;
import com.yuanchu.limslaboratory.pojo.dto.GetPlanMeasureInstrumentDto;
import com.yuanchu.limslaboratory.pojo.dto.SelectMeasurementLedgerDto;
import com.yuanchu.limslaboratory.pojo.dto.SelectMeteringPlanDto;
import com.yuanchu.limslaboratory.pojo.vo.UserAndInsVo;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -20,7 +28,15 @@

    Integer addMeteringPlanInformation(MeteringPlan meteringPlan);

    IPage<Map<String, Object>> pagingQueryOfMeteringPlan(String measureCodeOrNameOrUnit, Page<Objects> page);
    Map<String, Object> pagingQueryOfMeteringPlan(SelectMeteringPlanDto dto);

    IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page);
    IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto);

    Map<String, Object> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto);

    Map<String, Object> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto);

    UserAndInsVo getListUserAndListIns(List<Map<String, Object>> userNameAndId);

    boolean addPlanAndMeasure(Map<String, Object> userInfo, AddPlanDto addPlanDto);
}