Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

2 天以前 79054eef527c991f9a84ab3bc3fd2603a5521eb1

 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -3,18 +3,16 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;

@Api(tags = "设备报修管理")
@@ -28,19 +26,19 @@
    @Autowired
    private IDeviceLedgerService deviceLedgerService;

    @ApiModelProperty("设备报修列表")
    @ApiOperation("设备报修列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
        return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
    }

    @PostMapping()
    @ApiModelProperty("添加设备报修")
    @ApiOperation("添加设备报修")
    public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    }

    @ApiModelProperty("根据id查询设备报修")
    @ApiOperation("根据id查询设备报修")
    @GetMapping("/{id}")
    public AjaxResult detail(@PathVariable Long id) {
        DeviceRepairDto byId = deviceRepairService.detailById(id);
@@ -48,19 +46,19 @@
    }

    @PutMapping ()
    @ApiModelProperty("修改设备报修")
    @ApiOperation("修改设备报修")
    public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }

    @PostMapping ("repair")
    @ApiModelProperty("设备维修")
    @ApiOperation("设备维修")
    public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }

    @DeleteMapping("/{ids}")
    @ApiModelProperty("删除设备报修")
    @ApiOperation("删除设备报修")
    public AjaxResult delete(@PathVariable("ids") Long[] ids) {
        boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
        if (!b) {
@@ -70,7 +68,7 @@
    }

    @PostMapping("export")
    @ApiModelProperty("导出设备报修")
    @ApiOperation("导出设备报修")
    public void export(HttpServletResponse response, Long[] ids) {
        deviceRepairService.export(response, ids);
    }