巡检任务 设备维修新增是否生成工单字段 及 生成工单

shiyunteng

6 天以前 1eb6f4824c270de1a3d0bf766d44f1abb2c7f55d

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ReceivingNoteController.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.ReceivingNote;
import com.by4cloud.platformx.device.service.ReceivingNoteService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +21,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

/**
 * 验收表
@@ -40,15 +40,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param receivingNote 验收表
     * @param queryDTO 验收表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('device_receivingNote_view')" )
    public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNote receivingNote) {
        LambdaQueryWrapper<ReceivingNote> wrapper = Wrappers.lambdaQuery();
        return R.ok(receivingNoteService.page(page, wrapper));
    public R getReceivingNotePage(@ParameterObject Page page, @ParameterObject ReceivingNoteQueryDTO queryDTO) {
        return R.ok(receivingNoteService.pageNew(page, queryDTO));
    }


@@ -61,7 +60,7 @@
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('device_receivingNote_view')" )
    public R getById(@PathVariable("id" ) Long id) {
        return R.ok(receivingNoteService.getById(id));
        return R.ok(receivingNoteService.getByIdDeep(id));
    }

    /**
@@ -74,7 +73,7 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('device_receivingNote_add')" )
    public R save(@RequestBody ReceivingNote receivingNote) {
        return R.ok(receivingNoteService.save(receivingNote));
        return receivingNoteService.saveDeep(receivingNote);
    }

    /**
@@ -87,7 +86,7 @@
    @PutMapping
    @PreAuthorize("@pms.hasPermission('device_receivingNote_edit')" )
    public R updateById(@RequestBody ReceivingNote receivingNote) {
        return R.ok(receivingNoteService.updateById(receivingNote));
        return R.ok(receivingNoteService.updateByIdDeep(receivingNote));
    }

    /**