Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

12 小时以前 620bb4712a31791231c4381581f0f60088f079fe

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

@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +23,7 @@
@RestController
@RequestMapping("/maintenanceTaskFile")
@Tag(name = "设备保养附件")
public class DeviceMaintenanceFileController extends BaseController {
public class DeviceMaintenanceFileController {

    @Resource
    private DeviceMaintenanceFileService deviceMaintenanceFileService;
@@ -36,8 +35,8 @@
     * @return
     */
    @PostMapping("/add")
    public R<?> add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
        return R.ok(deviceMaintenanceFileService.save(deviceMaintenanceFile));
    public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
    }

    /**
@@ -46,12 +45,12 @@
     * @return
     */
    @DeleteMapping("/del")
    public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return R.fail("请选择至少一条数据");
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return R.ok(deviceMaintenanceFileService.removeBatchByIds(ids));
        return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
    }

    /**
@@ -61,8 +60,8 @@
     * @return
     */
    @GetMapping("/listPage")
    public R<?> qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return R.ok(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
    public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
    }