lichunyang/beixin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

龙牌非龙牌，泰山非泰山代码提交

Browse Source
This commit is contained in:
yujh_java 2025-09-09 15:39:20 +08:00
parent 44b096afd4
commit a432f19ca0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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
View File

@ -414,9 +414,10 @@ public class SaleCountDimensionImpl implements DataSummaryService {
Double xe = map.getDouble("XE"); Double xe = map.getDouble("XE");
bo.set("XE", ssjermb!=null?ssjermb:xe!=null?(xe*0.13):0.00); 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("JZ_GZ", gzjzStrings[0]);
bo.set("MC_JC", gzjzStrings[1]); bo.set("MC_JC", gzjzStrings[1]);
bo.set("PROD_CAT", gzjzStrings[2]);
bos.add(bo); bos.add(bo);
} }

8
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java
View File

@ -15,18 +15,18 @@ public class SaleUtil {
* @return 匹配结果数组 [JZGZ, JCMC] * @return 匹配结果数组 [JZGZ, JCMC]
*/ */
public static String[] matchSingleField(String bbgsSource, String cpmcSource,String cppb_l2Source, public static String[] matchSingleField(String bbgsSource, String cpmcSource,String cppb_l2Source,
List<BO> boList, String defaultJzgz, String defaultJcmc) { List<BO> boList, String defaultJzgz, String defaultJcmc,String defaultProdCat) {
if (boList == null || boList.isEmpty()) { if (boList == null || boList.isEmpty()) {
return new String[]{defaultJzgz, defaultJcmc}; return new String[]{defaultJzgz, defaultJcmc,defaultProdCat};
} }
for (BO bo : boList) { for (BO bo : boList) {
String bbgs = bo.getString("BBGS"); String bbgs = bo.getString("BBGS");
String cpmc = bo.getString("CPMC"); String cpmc = bo.getString("CPMC");
String cppb_l2 = bo.getString("CPLB_L2"); String cppb_l2 = bo.getString("CPLB_L2");
if(bbgs.equals(bbgsSource) && cpmcSource.contains(cpmc) && cppb_l2Source.contains(cppb_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};
} }
} }