From becb020492248fbf5a2920c954e03fd08d4b0e6f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 17:21:59 +0800
Subject: [PATCH] fix: 流程工序排序功能
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
index 4834dcc..9bcbad1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -1,9 +1,9 @@
package com.ruoyi.production.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.common.exception.ServiceException;
import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.pojo.ProcessRouteItem;
@@ -21,11 +21,11 @@
public class ProcessRouteItemServiceImpl extends ServiceImpl<ProcessRouteItemMapper, ProcessRouteItem> implements ProcessRouteItemService {
@Autowired
- private ProcessRouteItemMapper processRouteItemMapper;
+ private ProcessRouteItemMapper processRouteItemMapper;
@Override
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
- return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
+ return processRouteItemMapper.listProcessRouteItemDto(processRouteItemDto);
}
//鎺掑簭
@@ -37,21 +37,19 @@
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
.eq(ProcessRouteItem::getRouteId, oldProcessRouteItem.getRouteId())
.orderByAsc(ProcessRouteItem::getDragSort));
- //鏌ヨ琚洿鏀圭殑閭ｆ潯鏁版嵁鍘熸潵鏄鍑犳潯
- int oldIndex = processRouteItems.indexOf(oldProcessRouteItem);
// 鑾峰彇鐩爣浣嶇疆锛堢Щ鍔ㄥ埌绗嚑涓箣鍚庯級
Integer targetPosition = processRouteItem.getDragSort();
if (targetPosition != null && targetPosition >= 0) {
// 绉诲姩鍏冪礌鍒版柊鐨勪綅缃�
processRouteItems.remove(oldProcessRouteItem);
- processRouteItems.add(targetPosition-1, oldProcessRouteItem);
+ processRouteItems.add(targetPosition - 1, oldProcessRouteItem);
// 鏇存柊鎵�鏈夊彈褰卞搷鐨勬帓搴忓瓧娈�
for (int i = 0; i < processRouteItems.size(); i++) {
ProcessRouteItem item = processRouteItems.get(i);
if (!item.getId().equals(oldProcessRouteItem.getId())) {
// 妫�鏌ユ槸鍚﹂渶瑕佹洿鏂版帓搴忓��
- if (item.getDragSort() != i+1) {
- item.setDragSort(i+1);
+ if (item.getDragSort() != i + 1) {
+ item.setDragSort(i + 1);
processRouteItemMapper.updateById(item);
}
} else {
@@ -63,6 +61,26 @@
return 1;
}
return 0;
+ }
+
+ @Override
+ public void saveOrUpdateRouteItem(ProcessRouteItem processRouteItem) {
+ if (processRouteItem == null) {
+ throw new ServiceException("鏂板/淇敼澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ // 濡傛灉id涓簄ull鍒欐柊澧�,鍚﹀垯灏辨洿鏂�
+ if (processRouteItem.getId() == null) {
+ // 鏌ヨ鍑哄綋鍓嶆湁澶氬皯涓瓙闆�
+ Long selectCount = baseMapper.selectCount(new LambdaQueryWrapper<ProcessRouteItem>().eq(ProcessRouteItem::getRouteId, processRouteItem.getRouteId()));
+ if (selectCount == null) {
+ selectCount = 0L;
+ }
+ processRouteItem.setDragSort((int) (selectCount + 1));
+ baseMapper.insert(processRouteItem);
+ return;
+ }
+ baseMapper.updateById(processRouteItem);
}
@Override
@@ -82,8 +100,8 @@
// 閲嶆柊璁剧疆鎺掑簭鍊硷紝浣垮簭鍙疯繛缁�
for (int i = 0; i < processRouteItems.size(); i++) {
ProcessRouteItem item = processRouteItems.get(i);
- if (!item.getDragSort().equals(i+1)) {
- item.setDragSort(i+1);
+ if (!item.getDragSort().equals(i + 1)) {
+ item.setDragSort(i + 1);
processRouteItemMapper.updateById(item);
}
}
--
Gitblit v1.9.3