From a57390bfc4f92178e2adba3a2973ef6df0807656 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 15:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
index cfb2f8a..b2fee3c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java
@@ -1,60 +1,65 @@
package com.aps.core.service.impl;
import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.StringUtils;
+import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
+import com.aps.core.domain.ApsShop;
import com.aps.core.domain.ApsStandardProcess;
+import com.aps.core.mapper.ApsShopMapper;
import com.aps.core.mapper.ApsStandardProcessMapper;
import com.aps.core.service.IApsStandardProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鏍囧噯宸ュ簭Service涓氬姟灞傚鐞�
- *
+ *
* @author hjy
* @date 2025-04-23
*/
@Service
-public class ApsStandardProcessServiceImpl implements IApsStandardProcessService
-{
+public class ApsStandardProcessServiceImpl implements IApsStandardProcessService {
@Autowired
private ApsStandardProcessMapper apsStandardProcessMapper;
+ @Autowired
+ private ApsShopMapper apsShopMapper;
+
/**
* 鏌ヨ鏍囧噯宸ュ簭
- *
+ *
* @param id 鏍囧噯宸ュ簭涓婚敭
* @return 鏍囧噯宸ュ簭
*/
@Override
- public ApsStandardProcess selectApsStandardProcessById(Long id)
- {
+ public ApsStandardProcess selectApsStandardProcessById(Long id) {
return apsStandardProcessMapper.selectApsStandardProcessById(id);
}
/**
* 鏌ヨ鏍囧噯宸ュ簭鍒楄〃
- *
+ *
* @param apsStandardProcess 鏍囧噯宸ュ簭
* @return 鏍囧噯宸ュ簭
*/
@Override
- public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess)
- {
+ public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess) {
return apsStandardProcessMapper.selectApsStandardProcessList(apsStandardProcess);
}
/**
* 鏂板鏍囧噯宸ュ簭
- *
+ *
* @param apsStandardProcess 鏍囧噯宸ュ簭
* @return 缁撴灉
*/
@Override
- public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess)
- {
+ public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess) {
apsStandardProcess.setCreateTime(DateUtils.getNowDate());
apsStandardProcess.setCreateBy(SecurityUtils.getUsername());
return apsStandardProcessMapper.insertApsStandardProcess(apsStandardProcess);
@@ -62,13 +67,12 @@
/**
* 淇敼鏍囧噯宸ュ簭
- *
+ *
* @param apsStandardProcess 鏍囧噯宸ュ簭
* @return 缁撴灉
*/
@Override
- public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess)
- {
+ public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess) {
apsStandardProcess.setUpdateTime(DateUtils.getNowDate());
apsStandardProcess.setUpdateBy(SecurityUtils.getUsername());
return apsStandardProcessMapper.updateApsStandardProcess(apsStandardProcess);
@@ -76,30 +80,29 @@
/**
* 鎵归噺鍒犻櫎鏍囧噯宸ュ簭
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏍囧噯宸ュ簭涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteApsStandardProcessByIds(Long[] ids)
- {
+ public int deleteApsStandardProcessByIds(Long[] ids) {
return apsStandardProcessMapper.deleteApsStandardProcessByIds(ids);
}
/**
* 鍒犻櫎鏍囧噯宸ュ簭淇℃伅
- *
+ *
* @param id 鏍囧噯宸ュ簭涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteApsStandardProcessById(Long id)
- {
+ public int deleteApsStandardProcessById(Long id) {
return apsStandardProcessMapper.deleteApsStandardProcessById(id);
}
/**
* 瀵煎叆鏁版嵁
+ *
* @param tempList
* @return true/false
*/
@@ -107,11 +110,26 @@
public boolean importData(List<ApsStandardProcess> tempList) {
try {
if (!tempList.isEmpty()) {
- tempList.forEach(temp->{
+ DictUtils.CacheValue cacheFactory = DictUtils.getCacheValue("aps_factory");
+ DictUtils.CacheValue cacheDomain = DictUtils.getCacheValue("aps_domain");
+
+ List<ApsShop> shops = apsShopMapper.selectApsByName(tempList.stream()
+ .map(ApsStandardProcess::getWorkShop)
+ .filter(StringUtils::isNotEmpty)
+ .collect(Collectors.toSet()));
+ tempList.forEach(temp -> {
temp.setCreateBy(SecurityUtils.getUsername());
temp.setCreateTime(DateUtils.getNowDate());
- apsStandardProcessMapper.insertApsStandardProcess(temp);
+ temp.setMajor(cacheDomain.get(temp.getMajor()));
+ temp.setPlant(cacheFactory.get(temp.getPlant()));
+ temp.setWorkShop(shops.stream()
+ .filter(shop -> Objects.equals(shop.getShopName(), temp.getWorkShop()))
+ .filter(shop -> Objects.equals(shop.getPlantCode(), temp.getPlant()))
+ .map(ApsShop::getShopCode)
+ .findFirst()
+ .orElse(null));
});
+ apsStandardProcessMapper.insert(tempList);
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3