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

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java

@@ -1,14 +1,18 @@
package com.ruoyi.technology.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/technologyRoutingOperation")
@@ -20,19 +24,19 @@

    @GetMapping("/page")
    @ApiOperation("工艺路线工序分页查询")
    public R page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
    public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
        return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
    }

    @GetMapping("/list")
    @ApiOperation("工艺路线工序列表")
    public R list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
    public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
        return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
    }

    @GetMapping("/{id}")
    @ApiOperation("工艺路线工序详情")
    public R getInfo(@PathVariable("id") Long id) {
    public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
        return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
    }