From b473b8de811b86fd7da321f1148b5c17de9b1394 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:07:46 +0800
Subject: [PATCH] refactor(production): 移除生产订单中的强度字段
---
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index ee245d6..66e1aaa 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -1,20 +1,64 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
+import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
import com.ruoyi.production.pojo.ProductionOperationTask;
import com.ruoyi.production.service.ProductionOperationTaskService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-/**
- * <p>
- * 鐢熶骇宸ュ崟琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-21 03:55:52
- */
-@Service
-public class ProductionOperationTaskServiceImpl extends ServiceImpl<ProductionOperationTaskMapper, ProductionOperationTask> implements ProductionOperationTaskService {
+import java.util.List;
+@Service
+@RequiredArgsConstructor
+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));
+ }
+
+ @Override
+ public List<ProductionOperationTaskVo> listProductionOperationTask(ProductionOperationTaskDto dto) {
+ return BeanUtil.copyToList(this.list(buildQueryWrapper(dto)), ProductionOperationTaskVo.class);
+ }
+
+ @Override
+ public ProductionOperationTaskVo getProductionOperationTaskInfo(Long id) {
+ ProductionOperationTask item = this.getById(id);
+ return item == null ? null : BeanUtil.copyProperties(item, ProductionOperationTaskVo.class);
+ }
+
+ @Override
+ public boolean saveProductionOperationTask(ProductionOperationTask productionOperationTask) {
+ return this.saveOrUpdate(productionOperationTask);
+ }
+
+ @Override
+ public boolean removeProductionOperationTask(List<Long> ids) {
+ return ids != null && !ids.isEmpty() && this.removeByIds(ids);
+ }
+
+ private LambdaQueryWrapper<ProductionOperationTask> buildQueryWrapper(ProductionOperationTaskDto dto) {
+ ProductionOperationTask query = dto == null ? new ProductionOperationTask() : dto;
+ 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.getStatus() != null, ProductionOperationTask::getStatus, query.getStatus())
+ .like(query.getWorkOrderNo() != null && !query.getWorkOrderNo().trim().isEmpty(),
+ ProductionOperationTask::getWorkOrderNo, query.getWorkOrderNo())
+ .orderByDesc(ProductionOperationTask::getId);
+ }
}
--
Gitblit v1.9.3