Fixiaobai
2023-08-28 1865de1cd0255f7c42a326018a8cc3b5a1ee5253
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.yuanchu.limslaboratory.pojo.dto.AddPlanDto;
@@ -48,6 +49,7 @@
    @ApiOperation("添加计量计划")
    @PostMapping("/add")
    @AuthHandler
    public Result<?> addMeteringPlanInformation(@RequestBody MeteringPlan meteringPlan) {
        Integer isInsertSuccess = meteringPlanService.addMeteringPlanInformation(meteringPlan);
        if (isInsertSuccess == 1){
@@ -58,12 +60,14 @@
    @ApiOperation("计量计划分页查询")
    @GetMapping("/plan_page_list")
    @AuthHandler
    public Result<?> pagingQueryOfMeteringPlan(SelectMeteringPlanDto dto) {
        return Result.success(meteringPlanService.pagingQueryOfMeteringPlan(dto));
    }
    @ApiOperation("计量台账分页查询")
    @GetMapping("/standing_page_list")
    @AuthHandler
    public Result<?> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto) {
        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(selectMeasurementLedgerDto);
        return Result.success(page);
@@ -71,23 +75,28 @@
    @ApiOperation("单询计划信息")
    @GetMapping("/getPlanMeasureInstrument")
    @AuthHandler
    public Result<?> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
        return Result.success(meteringPlanService.getPlanMeasureInstrument(dto));
    }
    @ApiOperation("计划信息之下分页")
    @GetMapping("/limitGetPlanMeasureInstrument")
    @AuthHandler
    public Result<?> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
        return Result.success(meteringPlanService.limitGetPlanMeasureInstrument(dto));
    }
    @ApiOperation("获取user列表和仪器列表")
    @GetMapping("/getListUserAndListIns")
    @AuthHandler
    public Result<?>getListUserAndListIns(){
        return Result.success(meteringPlanService.getListUserAndListIns(userService.getUserNameAndId()));
    }
    @ApiOperation("添加计划和计量信息")
    @PostMapping("/addPlanAndMeasure")
    @AuthHandler
    public Result<?>addPlanAndMeasure(@RequestBody AddPlanDto addPlanDto){
        return Result.success(meteringPlanService.addPlanAndMeasure(userService.getUserInfo(ServletUtils.getRequest().getHeader("X-Token")),addPlanDto));
    }