Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -72,10 +72,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -909,23 +906,7 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			auditProecessDTO.setPageStatus(bills.getPageStatus());
 			auditProecessDTO.setPageLabel(bills.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
-			List<LosAuditPathsLevels> pathsLevelsList = bills.getAuditPathsLevels();
-			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
-				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
-				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
-				for (LosAuditPathsLevels item : auditPathsLevels) {
-					if (2 == item.getUserMold()) {
-						if (idList.contains(item.getId())) {
-							levelsList.add(item);
-						}
-					} else {
-						levelsList.add(item);
-					}
-				}
-				auditProecessDTO.setPathsLevelsList(levelsList);
-			} else {
-				auditProecessDTO.setPathsLevelsList(auditPathsLevels);
-			}
+			auditProecessDTO.setPathsLevelsList(auditPathsLevels);
 			auditProecessDTO.setActId(1);
 			auditProecessDTO.setSrcBillId(declare.getId());
 			auditProecessDTO.setBillId(declare.getId());
@@ -960,7 +941,19 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			auditProecessDTO.setGrossProfit(amountCnyD.subtract(amountCnyC));
 			auditProecessDTO.setGrossProfitUsd(amountUsdD.subtract(amountUsdC));
 			auditProecessDTO.setGrossProfitLoc(auditProecessDTO.getGrossProfit().add(bCurrencyService.converterCny("USD", auditProecessDTO.getGrossProfitUsd(), "", "1")));
-
+			auditProecessDTO.setCustomizeOne(declare.getMblno());
+			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
+			if (ObjectUtils.isNotNull(map)) {
+				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+			}
+			if ("AE".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEtd());
+			} else if ("AI".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEta());
+			}
+			auditProecessDTO.setCustomizeFour(declare.getCorpCnName());
+			auditProecessDTO.setCustomizeFive(declare.getCarrierCnName());
+			auditProecessDTO.setCustomizeSix("");
 			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -63,9 +63,9 @@ import java.math.MathContext;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -317,23 +317,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			auditProecessDTO.setPageStatus(amends.getPageStatus());
 			auditProecessDTO.setPageLabel(amends.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
-			List<LosAuditPathsLevels> pathsLevelsList = amends.getAuditPathsLevels();
-			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
-				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
-				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
-				for (LosAuditPathsLevels item : auditPathsLevels) {
-					if (2 == item.getUserMold()) {
-						if (idList.contains(item.getId())) {
-							levelsList.add(item);
-						}
-					} else {
-						levelsList.add(item);
-					}
-				}
-				auditProecessDTO.setPathsLevelsList(levelsList);
-			} else {
-				auditProecessDTO.setPathsLevelsList(auditPathsLevels);
-			}
+			auditProecessDTO.setPathsLevelsList(auditPathsLevels);
 			auditProecessDTO.setActId(1);
 			auditProecessDTO.setSrcBillId(declare.getId());
 			auditProecessDTO.setBillId(declare.getId());
@@ -387,6 +371,22 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			} else if ("SIA".equals(declare.getBusinessType())) {
 				auditProecessDTO.setEtd(declare.getEta());
 			}
+			auditProecessDTO.setCustomizeOne(declare.getMblno());
+			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
+			if (ObjectUtils.isNotNull(map)) {
+				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+			}
+			if ("AEA".equals(declare.getBusinessType()) || "SEA".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEtd());
+			} else if ("AIA".equals(declare.getBusinessType()) || "SIA".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEta());
+			} else if ("BGSEA".equals(declare.getBusinessType()) || "BGSIA".equals(declare.getBusinessType())
+				|| "BGAEA".equals(declare.getBusinessType()) || "BGAIA".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getCreateTime());
+			}
+			auditProecessDTO.setCustomizeFour(declare.getCorpCnName());
+			auditProecessDTO.setCustomizeFive("");
+			auditProecessDTO.setCustomizeSix("");
 			auditProecessDTO.setReferenceNumber(declare.getMblno());
 			auditProecessDTO.setMorderNo(declare.getMblno());
 			List<FeeCenter> feeCenterBills = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()

blade-service/blade-los/src/main/java/org/springblade/los/business/customsDeclaration/service/impl/CustomsDeclarationServiceImpl.java

@@ -65,6 +65,7 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -402,23 +403,7 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 			auditProecessDTO.setPageStatus(customsDeclaration.getPageStatus());
 			auditProecessDTO.setPageLabel(customsDeclaration.getPageLabel());
 			auditProecessDTO.setOrderRemark(declare.getRemarks());
-			List<LosAuditPathsLevels> pathsLevelsList = customsDeclaration.getAuditPathsLevels();
-			if (ObjectUtils.isNotNull(pathsLevelsList) && !pathsLevelsList.isEmpty()) {
-				List<Long> idList = pathsLevelsList.stream().map(LosAuditPathsLevels::getId).collect(Collectors.toList());
-				List<LosAuditPathsLevels> levelsList = new ArrayList<>();
-				for (LosAuditPathsLevels item : auditPathsLevels) {
-					if (2 == item.getUserMold()) {
-						if (idList.contains(item.getId())) {
-							levelsList.add(item);
-						}
-					} else {
-						levelsList.add(item);
-					}
-				}
-				auditProecessDTO.setPathsLevelsList(levelsList);
-			} else {
-				auditProecessDTO.setPathsLevelsList(auditPathsLevels);
-			}
+			auditProecessDTO.setPathsLevelsList(auditPathsLevels);
 			auditProecessDTO.setActId(1);
 			auditProecessDTO.setSrcBillId(declare.getId());
 			auditProecessDTO.setBillId(declare.getId());
@@ -453,8 +438,24 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 			auditProecessDTO.setGrossProfit(amountCnyD.subtract(amountCnyC));
 			auditProecessDTO.setGrossProfitUsd(amountUsdD.subtract(amountUsdC));
 			auditProecessDTO.setGrossProfitLoc(auditProecessDTO.getGrossProfit().add(bCurrencyService.converterCny("USD", auditProecessDTO.getGrossProfitUsd(), "", "1")));
-
 			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
+			auditProecessDTO.setCustomizeOne(declare.getMblno());
+			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
+			if (ObjectUtils.isNotNull(map)) {
+				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+			}
+			if ("BGSE".equals(declare.getBusinessType())) {
+				if (ObjectUtils.isNotNull(declare.getDeclareDate())) {
+					auditProecessDTO.setCustomizeThree(declare.getDeclareDate());
+				} else {
+					auditProecessDTO.setCustomizeThree(declare.getInspectionDeclarationDate());
+				}
+			} else {
+				auditProecessDTO.setCustomizeThree(declare.getDeclareDate());
+			}
+			auditProecessDTO.setCustomizeFour(declare.getCorpCnName());
+			auditProecessDTO.setCustomizeFive(declare.getCustomsDeclarationNumber());
+			auditProecessDTO.setCustomizeSix("");
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");