From 2bc94fed189ef2da4112f9f836343a6a579b93c6 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 10 七月 2024 17:25:31 +0800
Subject: [PATCH] add a inputtime and outputtime
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java
index e7bed98..7b99040 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java
@@ -15,6 +15,7 @@
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -63,6 +64,10 @@
}
@Transactional
public int save(PrProductionProcess process){
+ //娴佺▼鍚嶇О涓嶈兘閲嶅
+ if (processDao.exists(process.name, process.id)) {
+ throw new RuntimeException("娴佺▼鍚嶇О涓嶈兘閲嶅");
+ }
prepareProcess(process);
int count = processDao.insertSelective(process);
saveNodesAndInstructions(process);
@@ -71,6 +76,10 @@
@Transactional
public int update(PrProductionProcess process){
+ //娴佺▼鍚嶇О涓嶈兘閲嶅
+ if (processDao.exists(process.name, process.id)) {
+ throw new RuntimeException("娴佺▼鍚嶇О涓嶈兘閲嶅");
+ }
prepareProcess(process);
int count = processDao.updateByPrimaryKeySelective(process);
// 浼樺寲锛氬彧鏈夊綋鑺傜偣鏈夊彉鏇存椂鎵嶅垹闄ゅ苟閲嶆柊鎻掑叆
@@ -116,7 +125,9 @@
}
return null;
}).filter(work -> work != null).toList();
- workDao.insertMany(workList);
+ if(CollectionUtils.isNotEmpty(workList)){
+ workDao.insertMany(workList);
+ }
}
@@ -159,8 +170,8 @@
return rsVo ;
}
- public List<Map<String,String>> queryAll(){
- return processDao.queryAll();
+ public List<Map<String,String>> queryAll(Long proId){
+ return processDao.queryAll(proId);
}
private void addUrl(PrWorkingInstruction ins){
--
Gitblit v1.8.0