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-15 11:23:19 +08:00
parent 9ad0d4e039
commit d3621356fa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

@ -471,7 +471,7 @@ public class SaleCountDimensionImpl implements DataSummaryService {
Double xe = map.getDouble("BHSXE");
bo.set("XE", xe);
// 匹配公装家装类别，如果未匹配到，则默认未其他
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"),map.getString("LB_3"), gzjzList, "其他", "其他","其他");
bo.set("JZ_GZ", gzjzStrings[0]);
bo.set("MC_JC", gzjzStrings[1]);
bo.set("PROD_CAT", gzjzStrings[2]);

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

@ -8,18 +8,20 @@ import java.util.List;
public class SaleUtil {
/**
* 单字段匹配：根据源字段（如 BKGS）匹配 BO 中的目标字段（如 BBGS）
* @param sourceValue 源字段值（如 BKGS、LB_1、LB_2）
* @param targetKey BO 中的目标字段 key（如 "BBGS"、"CPMC"、"CPLB_L2"）
* @param boList 待匹配的 BO 列表
* @param defaultJzgz 匹配失败时默认的 JZGZ 值
* @param defaultJcmc 匹配失败时默认的 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,String cppb_l3Source,
List<BO> boList, String defaultJzgz, String defaultJcmc,String defaultProdCat) {
if (boList == null || boList.isEmpty()) {
return new String[]{defaultJzgz, defaultJcmc,defaultProdCat};
}
//有个泰山特殊的，涉及到L3直接返回
if(bbgsSource.equals("泰山石膏") && cpmcSource.equals("石膏板") && cppb_l2Source.equals("泰山") && cppb_l3Source.equals("饰面板") ) {
return new String[]{"家装","面材","泰山"};
}
for (BO bo : boList) {
String bbgs = bo.getString("BBGS");
String cpmc = bo.getString("CPMC");