src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
@@ -1,8 +1,11 @@ package com.ruoyi.production.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.production.dto.ProductProcessParamDto; import com.ruoyi.production.dto.ProductProcessParamSortDTO; import com.ruoyi.production.pojo.ProductProcessParam; import com.ruoyi.production.service.ProductProcessParamService; @@ -33,8 +36,9 @@ @GetMapping("/list/{productProcessId}") @Log(title = "根据工序ID查询对应的参数", businessType = BusinessType.OTHER) @ApiOperation("根据工序ID查询对应的参数") public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId) { return AjaxResult.success(productProcessParamService.listByProcessId(productProcessId)); public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId, Page<ProductProcessParamDto> page) { IPage<ProductProcessParamDto> list = productProcessParamService.listByProcessId(productProcessId, page); return AjaxResult.success(list); } @PostMapping("/add") src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
@@ -1,11 +1,12 @@ package com.ruoyi.production.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.production.dto.ProductProcessParamDto; import com.ruoyi.production.pojo.ProductProcessParam; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <br> @@ -18,7 +19,7 @@ */ public interface ProductProcessParamMapper extends BaseMapper<ProductProcessParam> { List<ProductProcessParamDto> selectDtoListByProcessId(@Param("processId") Long processId); IPage<ProductProcessParamDto> selectDtoListByProcessId(@Param("page") IPage<ProductProcessParamDto> page, @Param("processId") Long processId); } src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
@@ -1,5 +1,7 @@ package com.ruoyi.production.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.production.dto.ProductProcessParamDto; import com.ruoyi.production.dto.ProductProcessParamSortDTO; @@ -18,7 +20,7 @@ */ public interface ProductProcessParamService extends IService<ProductProcessParam> { List<ProductProcessParamDto> listByProcessId(Long processId); IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page); void add(ProductProcessParam productProcessParam);
@@ -1,9 +1,10 @@ package com.ruoyi.production.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.basic.mapper.BaseParamMapper; import com.ruoyi.basic.pojo.BaseParam; import com.ruoyi.basic.service.BaseParamService; import com.ruoyi.production.dto.ProductProcessParamDto; import com.ruoyi.production.dto.ProductProcessParamSortDTO; import com.ruoyi.production.mapper.ProductProcessParamMapper; @@ -34,11 +35,11 @@ BaseParamMapper baseParamMapper; @Override public List<ProductProcessParamDto> listByProcessId(Long processId) { public IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page) { if (processId == null) { throw new IllegalArgumentException("工序ID不能为空"); } return baseMapper.selectDtoListByProcessId(processId); return baseMapper.selectDtoListByProcessId(page, processId); } @Override
