Merge branch 'dev' into dev_dz

zhuo

2025-03-04 32ba5ac318edf01cccc7b4d8827c4c1dc9c90f30

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java

@@ -43,7 +43,7 @@

    @ApiOperation(value = "作业指导书 分页")
    @GetMapping("/pageByPageQueryOfHomeworkInstructions")
    public Result<IPage<DeviceInstruction>> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto){
    public Result<IPage<DeviceOperationInstructionDto>> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto){
        return Result.success(deviceInstructionService.pageByPageQueryOfHomeworkInstructions(page, operationInstructionDto));
    }

@@ -54,7 +54,7 @@
        return Result.success();
    }

    @ApiOperation(value = "作业指导书编辑")
    @ApiOperation(value = "作业指导书详情")
    @GetMapping("/homeworkGuidebookEditor")
    public Result<Map<String, Object>> homeworkGuidebookEditor(Integer instructionId){
        DeviceInstruction instruction = deviceInstructionService.getById(instructionId);
@@ -66,7 +66,7 @@
    }

    @ApiOperation(value = "作业指导书受控文件删除")
    @GetMapping("/deleteHomeworkGuidebook")
    @DeleteMapping("/deleteHomeworkGuidebook")
    public Result deleteHomeworkGuidebook(String ids){
        if (ObjectUtils.isNotEmpty(ids)) {
            String[] idArray = ids.split(",");
@@ -76,7 +76,7 @@
    }

    @ApiOperation(value = "作业指导书删除")
    @GetMapping("/homeworkGuidebook")
    @DeleteMapping("/homeworkGuidebook")
    public Result homeworkGuidebook(String id, String instructionId){
        // 删除子表数据
        deviceOperationInstructionService.removeById(id);
@@ -91,8 +91,10 @@
    }

    @ApiOperation(value = "作业指导书审批")
    @GetMapping("/approvalOfHomeworkInstructionManual")
    public Result approvalOfHomeworkInstructionManual(String id, Boolean status){
    @PostMapping("/approvalOfHomeworkInstructionManual")
    public Result approvalOfHomeworkInstructionManual(@RequestBody Map<String,Object> map){
        Integer id =(Integer) map.get("id");
        Boolean status =(Boolean) map.get("status");
        deviceOperationInstructionService.update(Wrappers.<OperationInstruction>lambdaUpdate()
                .eq(OperationInstruction::getId, id)
                .set(OperationInstruction::getStatus, status)