From a432f19ca0671b6ed4e0344bdaef128c55000b5b Mon Sep 17 00:00:00 2001 From: yujh_java Date: Tue, 9 Sep 2025 15:39:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BE=99=E7=89=8C=E9=9D=9E=E9=BE=99=E7=89=8C?= =?UTF-8?q?=EF=BC=8C=E6=B3=B0=E5=B1=B1=E9=9D=9E=E6=B3=B0=E5=B1=B1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datalinkup/service/impl/SaleCountDimensionImpl.java | 3 ++- .../awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java index c3a6a2f..04fe8b8 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java @@ -414,9 +414,10 @@ public class SaleCountDimensionImpl implements DataSummaryService { Double xe = map.getDouble("XE"); bo.set("XE", ssjermb!=null?ssjermb:xe!=null?(xe*0.13):0.00); // 匹配公装家装类别，如果未匹配到，则默认未其他 - String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"), gzjzList, "其他", "其他"); + String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, map.getString("LB_1"), map.getString("LB_2"), gzjzList, "其他", "其他","其他"); bo.set("JZ_GZ", gzjzStrings[0]); bo.set("MC_JC", gzjzStrings[1]); + bo.set("PROD_CAT", gzjzStrings[2]); bos.add(bo); } diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java index ba1e26d..33f2abe 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java @@ -15,18 +15,18 @@ public class SaleUtil { * @return 匹配结果数组 [JZGZ, JCMC] */ public static String[] matchSingleField(String bbgsSource, String cpmcSource,String cppb_l2Source, - List boList, String defaultJzgz, String defaultJcmc) { + List boList, String defaultJzgz, String defaultJcmc,String defaultProdCat) { if (boList == null || boList.isEmpty()) { - return new String[]{defaultJzgz, defaultJcmc}; + return new String[]{defaultJzgz, defaultJcmc,defaultProdCat}; } for (BO bo : boList) { String bbgs = bo.getString("BBGS"); String cpmc = bo.getString("CPMC"); String cppb_l2 = bo.getString("CPLB_L2"); if(bbgs.equals(bbgsSource) && cpmcSource.contains(cpmc) && cppb_l2Source.contains(cppb_l2)) { - return new String[]{bo.getString("JZGZ"), bo.getString("JCMC")}; + return new String[]{bo.getString("JZGZ"), bo.getString("JCMC"), bo.getString("TYPE_PP")}; } } - return new String[]{defaultJzgz, defaultJcmc}; + return new String[]{defaultJzgz, defaultJcmc,defaultProdCat}; } }