From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index 74f7ae4..defb7ec 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,7 +1,11 @@
package com.aps.core.service.impl;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Optional;
+
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPlatePlanTemp;
@@ -67,6 +71,7 @@
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
apsPlatePlan.setId(IdUtils.fastUUID());
+ apsPlatePlan.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
@@ -108,6 +113,8 @@
@Override
public int confirmPlan(ApsPlatePlanTemp tempPlan) {
+ //鍏堝垹闄ゆ墍鏈�
+ apsPlatePlanMapper.removeAllPlatePlans();
//鏌ヨ涓存椂琛ㄦ暟鎹�
List<ApsPlatePlanTemp> apsPartPlanTemps=apsPlatePlanTempMapper.selectApsPlatePlanTempList(tempPlan);
int count=0;
@@ -118,6 +125,7 @@
ApsPlatePlan platePlan=new ApsPlatePlan();
BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
platePlan.setId(IdUtils.fastUUID());
+ platePlan.setCreateTime(DateUtils.getNowDate());
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsPlatePlanMapper.insertApsPlatePlan(platePlan);
count++;
@@ -134,15 +142,37 @@
String batchNum= IdUtils.fastUUID();
//鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
if (tempList.size() > 0) {
- List<SysDictData> dictDataList = DictUtils.getDictCache("aps_is_suspended");
+ /*
+ * aps_business_type aps_document_status aps_is_suspended aps_account
+ * */
+
+ List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
+ List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
+ List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
+ List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
for (int i = 0; i < tempList.size(); i++) {
+
ApsPlatePlanTemp planTemp = tempList.get(i);
- for (int j = 0; j < dictDataList.size(); j++) {
- if (planTemp.getIsSuspendedTxt().equals(dictDataList.get(j).getDictLabel())) {
- planTemp.setIsSuspended(Integer.parseInt(dictDataList.get(j).getDictValue()));
- break;
- }
- }
+
+ String isSuspendedTxt = planTemp.getIsSuspended().trim();
+ String businessType = planTemp.getBusinessType().trim();
+ String documentStatusText = planTemp.getDocumentStatus().trim();
+ String account = planTemp.getAccount().trim();
+
+ Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictLabel().equals(documentStatusText)).findFirst();
+ documentStatusFirst.ifPresent(sysDictData -> planTemp.setDocumentStatus(sysDictData.getDictValue()));
+
+ Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictLabel().equals(account)).findFirst();
+ accountFirst.ifPresent(sysDictData -> planTemp.setAccount(sysDictData.getDictValue()));
+
+ Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictLabel().equals(businessType)).findFirst();
+ businessTypeFirst.ifPresent(sysDictData -> planTemp.setBusinessType(sysDictData.getDictValue()));
+
+
+ Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictLabel().equals(isSuspendedTxt)).findFirst();
+ isSuspendedFirst.ifPresent(sysDictData -> planTemp.setIsSuspended(sysDictData.getDictValue()));
+
+ planTemp.setId(IdUtils.fastUUID());
//鎻掑叆鐗堟湰鍙�
planTemp.setBatchNumber(batchNum);
//鎻掑叆涓存椂琛�
--
Gitblit v1.9.3