Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-26 684399b665ef8c25c43faff0fdc821a0b72b39ba

 north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java

@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.sql.Date;
import java.util.Map;

@RestController
@@ -47,9 +48,12 @@
    }

    @ApiOperation("查询维修保养数据接口")
    @PostMapping  ("/selectMaintenance")
    public Result selectMaintenance()  {
        return  Result.seccess(deviceMaintenanceService.selectMaintenanceSv());
    @PostMapping  ("/selectMaintenance/{selectTime1}/{selectTime2}")
    public Result selectMaintenance(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2
    )  {
        return  Result.seccess(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
    }


@@ -64,4 +68,17 @@
        }
    }

    @ApiOperation("查询设备管理接口")
    @PostMapping  ("/selectMachine")
    public Result selectMachine()  {
        return  Result.seccess(deviceMaintenanceService.selectMachineSv());
    }

    @ApiOperation("根据Id查询对应数据接口")
    @PostMapping  ("/openSelectId/{id}")
    public Result openSelectId(
            @PathVariable String id){
        return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));

    }
}