From cf3482e6a4d40713cc09d107f11092c8db2e245a Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 17:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index b6c7548..5032e5f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -6,7 +6,6 @@
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.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
@@ -19,12 +18,15 @@
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductProcessRouteItem;
import com.ruoyi.production.service.ProductProcessService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -40,15 +42,33 @@
@Autowired
private DeviceLedgerMapper deviceLedgerMapper;
- @Override
- public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
- return productProcessMapper.listPage(page, productProcessDto);
- }
+ @Autowired
+ private SysUserMapper userMapper;
@Override
+ public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
+ IPage<ProductProcessDto> productProcessDtoIPage = productProcessMapper.listPage(page, productProcessDto);
+ productProcessDtoIPage.getRecords().forEach(item -> {
+ if (ObjectUtils.isNotEmpty(item.getUserIds())) {
+ List<Long> userIds = Arrays.stream(item.getUserIds().split(","))
+ .filter(s -> !s.trim().isEmpty() && !"null".equals(s))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ item.setIds(userIds);
+ if (!userIds.isEmpty()) {
+ List<SysUser> sysUsers = userMapper.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds));
+ item.setUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ }
+ }
+ });
+ return productProcessDtoIPage;
+ }
+ @Override
public AjaxResult add(ProductProcessDto productProcessDto) {
+ String idStr = String.join(",", productProcessDto.getUserIds());
ProductProcess productProcess = new ProductProcess();
- BeanUtils.copyProperties(productProcessDto,productProcess);
+ BeanUtils.copyProperties(productProcessDto, productProcess);
+ productProcess.setUserIds(idStr);
boolean save = productProcessMapper.insert(productProcess) > 0;
if (save && ObjectUtils.isNull(productProcessDto.getNo())) {
// 鏍规嵁id鐢熸垚no瀛楁锛欸X + 8浣嶆暟瀛楋紙涓嶈冻8浣嶅墠闈㈣ˉ0锛�
@@ -66,7 +86,7 @@
try {
ExcelUtil<ProductProcess> util = new ExcelUtil<ProductProcess>(ProductProcess.class);
List<ProductProcess> productProcessList = util.importExcel(file.getInputStream());
- if(CollectionUtils.isEmpty(productProcessList)){
+ if (CollectionUtils.isEmpty(productProcessList)) {
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
productProcessList.forEach(productProcess -> {
@@ -83,7 +103,7 @@
// 閫氳繃鏈哄彴鍚嶇О鏌ヨ鏈哄彴淇℃伅
List<String> deviceNames = productProcessList.stream().map(ProductProcess::getDeviceName).collect(Collectors.toList());
List<DeviceLedger> deviceLedgerList = deviceLedgerMapper.selectList(Wrappers.<DeviceLedger>lambdaQuery().in(DeviceLedger::getDeviceName, deviceNames));
- if(CollectionUtils.isEmpty(deviceLedgerList)){
+ if (CollectionUtils.isEmpty(deviceLedgerList)) {
throw new RuntimeException("鏈兘鏌ヨ鍒拌鏈哄彴淇℃伅锛岃妫�鏌ユ満鍙板悕绉版槸鍚︽纭�");
}
Map<String, DeviceLedger> deviceNameMap = deviceLedgerList.stream().collect(Collectors.toMap(DeviceLedger::getDeviceName, deviceLedger -> deviceLedger));
@@ -91,7 +111,7 @@
DeviceLedger deviceLedger = deviceNameMap.get(productProcess.getDeviceName());
productProcess.setDeviceLeaderId(deviceLedger.getId());
this.save(productProcess);
- if(StrUtil.isEmpty(productProcess.getNo())){
+ if (StrUtil.isEmpty(productProcess.getNo())) {
String no = "GX" + String.format("%08d", productProcess.getId());
productProcess.setNo(no);
productProcessMapper.updateById(productProcess);
@@ -100,7 +120,7 @@
});
return AjaxResult.success(true);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error(e.getMessage());
}
@@ -111,10 +131,22 @@
//鏌ヨ鏄惁鐢熶骇涓凡缁忓紩鐢ㄤ簡杩欎簺宸ュ簭
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getProcessId, ids));
List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().in(ProductProcessRouteItem::getProcessId, ids));
- if (!CollectionUtils.isEmpty(processRouteItems) || !CollectionUtils.isEmpty(productProcessRouteItems)){
+ if (!CollectionUtils.isEmpty(processRouteItems) || !CollectionUtils.isEmpty(productProcessRouteItems)) {
throw new RuntimeException("璇ュ伐搴忓凡缁忚浣跨敤锛屾棤娉曞垹闄�");
}
productProcessMapper.deleteBatchIds(ids);
return null;
}
+
+ @Override
+ public String updateProcess(ProductProcessDto productProcess) {
+ if (ObjectUtils.isEmpty(productProcess.getIds())) {
+ throw new RuntimeException("鎶ュ伐鐢ㄦ埛涓嶈兘涓虹┖");
+ }
+ productProcess.setUserIds(productProcess.getIds().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",")));
+ productProcessMapper.updateById(productProcess);
+ return "";
+ }
}
--
Gitblit v1.9.3