From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index af81a36..56a9a0d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -31,13 +31,6 @@
import java.util.*;
import java.util.stream.Collectors;
-/**
- * @Description: TODO
- * @Author: zhangherong
- * @Date: Created in 2020/9/20 9:19
- * @Version: 1.0
- * @Modified By:
- */
@Service
public class WorkStepServiceImpl extends ServiceImpl<WorkStepMapper, WorkStep> implements IWorkStepService {
@Autowired
@@ -182,8 +175,8 @@
ExceptionCast.cast(ProcessInfoCode.WORKSTEP_NOT_EXIST);
//鍚屾淇敼缁撴瀯鏍�
ProductMix productMix = productMixService.getById(Long.parseLong(id));
- productMix.setName(workStep.getStepName());
- productMix.setCode(workStep.getStepCode());
+ productMix.setTreeName(workStep.getStepName());
+ productMix.setTreeCode(workStep.getStepCode());
productMixService.updateById(productMix);
return super.updateById(workStep);
}
@@ -476,10 +469,10 @@
List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(workStepIds,
DocAttributionTypeEnum.WORKSITE.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
- List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getDeviceManagementId).collect(Collectors.toList());
+ List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
BeanUtil.copyProperties(treeInfoRequest,docQuery);
- docQuery.setAttributionIds(String.join(",",deviceManagementIds));
+ docQuery.setAttributionIds(String.join(",",deviceTypeIds));
docQuery.setDocClassCode("NC");
docQuery.setAttributionType(DocAttributionTypeEnum.WORKSITE.getCode());
docInfos=docInfoService.findListByDocQuery(docQuery);
--
Gitblit v1.9.3