src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -18,14 +18,14 @@
@Service
@RequiredArgsConstructor
public class ProductionOperationTaskServiceImpl extends ServiceImpl<ProductionOperationTaskMapper, ProductionOperationTask>
        implements ProductionOperationTaskService {
public class ProductionOperationTaskServiceImpl extends ServiceImpl<ProductionOperationTaskMapper, ProductionOperationTask> implements ProductionOperationTaskService {
    @Override
    public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page,
                                                                         ProductionOperationTaskDto dto) {
        Page<ProductionOperationTask> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
        return this.page(entityPage, buildQueryWrapper(dto)).convert(item -> BeanUtil.copyProperties(item, ProductionOperationTaskVo.class));
    public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
        Page<ProductionOperationTaskVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
        return baseMapper.pageProductionOperationTask(voPage, dto);
    }
    @Override
@@ -54,11 +54,16 @@
        return Wrappers.<ProductionOperationTask>lambdaQuery()
                .eq(query.getId() != null, ProductionOperationTask::getId, query.getId())
                .eq(query.getProductionOrderId() != null, ProductionOperationTask::getProductionOrderId, query.getProductionOrderId())
                .eq(query.getTechnologyRoutingOperationId() != null,
                        ProductionOperationTask::getTechnologyRoutingOperationId, query.getTechnologyRoutingOperationId())
                .eq(query.getProductionOrderRoutingOperationId() != null,
                        ProductionOperationTask::getProductionOrderRoutingOperationId, query.getProductionOrderRoutingOperationId())
                .eq(query.getStatus() != null, ProductionOperationTask::getStatus, query.getStatus())
                .like(query.getWorkOrderNo() != null && !query.getWorkOrderNo().trim().isEmpty(),
                        ProductionOperationTask::getWorkOrderNo, query.getWorkOrderNo())
                .orderByDesc(ProductionOperationTask::getId);
    }
    @Override
    public int updateProductWorkOrder(ProductionOperationTaskDto dto) {
        return baseMapper.updateById(dto);
    }
}