From 32bcf3f12aef0de69f7cb83d3521b2452a01e50d Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期六, 12 四月 2025 17:28:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
index 9b209a0..3baf1a7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
@@ -2,7 +2,12 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.core.domain.ApsPartPlanTemp;
+import com.aps.core.mapper.ApsPartPlanTempMapper;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPartPlanMapper;
@@ -20,6 +25,8 @@
{
@Autowired
private ApsPartPlanMapper apsPartPlanMapper;
+ @Autowired
+ private ApsPartPlanTempMapper apsPartPlanTempMapper;
/**
* 鏌ヨ闆朵欢璁″垝绠＄悊
@@ -55,6 +62,7 @@
public int insertApsPartPlan(ApsPartPlan apsPartPlan)
{
apsPartPlan.setId(IdUtils.fastUUID());
+ apsPartPlan.setCreateTime(DateUtils.getNowDate());
return apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
}
@@ -93,4 +101,29 @@
{
return apsPartPlanMapper.deleteApsPartPlanById(id);
}
+
+ @Override
+ public int confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+ //鏌ヨ涓存椂琛ㄦ暟鎹�
+ List<ApsPartPlanTemp> apsPartPlanTemps=apsPartPlanTempMapper.selectApsPartPlanTempList(apsPartPlanTemp);
+ int count=0;
+ List<String> aids=apsPartPlanTemps.stream().map(ApsPartPlanTemp::getId).toList();
+ String[] ids=aids.toArray(new String[0]);
+// for (int i = 0; i <apsPartPlanTemps.size() ; i++) {
+// //璁板綍涓存椂琛╥d
+// ids[i]=apsPartPlanTemps.get(i).getId();
+// ApsPartPlan apsPartPlan=new ApsPartPlan();
+// BeanUtils.copyProperties(apsPartPlanTemps.get(i), apsPartPlan);
+// apsPartPlan.setId(IdUtils.fastUUID());
+// //鎻掑叆姝ｅ紡琛紝骞惰褰�
+// apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
+// count++;
+// }
+ count =apsPartPlanMapper.insertBatch(apsPartPlanTemps);
+ //鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
+ if (count==apsPartPlanTemps.size()) {
+ apsPartPlanTempMapper.deleteApsPartPlanTempByIds(ids);
+ }
+ return 1;
+ }
}
--
Gitblit v1.9.3