计量管理-》计量台账

Fixiaobai

2023-08-17 58f820f804046e7fe82bef5a7b428b442a728e8a

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.yuanchu.limslaboratory.pojo.dto.SelectMeasurementLedgerDto;
import com.yuanchu.limslaboratory.service.MeteringPlanService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -49,7 +50,7 @@
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageNo", value = "起始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "每一页数量", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "测量编码/名称/单位", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/plan_page_list")
    public Result<?> pagingQueryOfMeteringPlan(Integer pageNo, Integer pageSize, String measureCodeOrNameOrUnit) {
@@ -58,13 +59,9 @@
    }

    @ApiOperation("计量台账分页查询")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageNo", value = "起始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/standing_page_list")
    public Result<?> pagingQueryOfMeasurementLedger(Integer pageNo, Integer pageSize) {
        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(new Page<Objects>(pageNo, pageSize));
    public Result<?> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto) {
        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(selectMeasurementLedgerDto);
        return Result.success(page);
    }
}