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

1、修改应收账款

Browse Source
This commit is contained in:
llllon 2025-09-09 15:33:18 +08:00
parent 028bd539b2
commit 44b096afd4
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class
View File

Binary file not shown.

BIN
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin
View File

Binary file not shown.

4
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java
View File

@ -291,9 +291,9 @@ public class DataLinkUpController {
// } // }
// }); // });
SaleCountDimensionImpl finalSaleCountDimension = saleCountDimension; saleCountDimension = new SaleCountDimensionImpl();
LOGGER.info("开始执行销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS")); LOGGER.info("开始执行销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS"));
finalSaleCountDimension.calculateSummary(dateRange, bo); saleCountDimension.calculateSummary(dateRange, bo);
LOGGER.info("完成销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS")); LOGGER.info("完成销售数据多维度汇总计算，BKGS: {}", bo.get("BKGS"));
// Future<?> countFuture = executorService.submit(() -> { // Future<?> countFuture = executorService.submit(() -> {

5
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

@ -145,7 +145,7 @@ public class SaleCountDimensionImpl implements DataSummaryService {
" WHERE t.BKGS = ?" + " WHERE t.BKGS = ?" +
" ORDER BY t.QYGS, t.SHIQU, t.RQ"; " ORDER BY t.QYGS, t.SHIQU, t.RQ";
List<RowMap> maps = DBSql.getMaps(sql, DATE_FORMAT.format(dateRange.getStartDate()), bkgs); List<RowMap> maps = DBSql.getMaps(sql, DATE_FORMAT.format(dateRange.getStartDate()), bkgs, bkgs);
// 获取公司位置信息 // 获取公司位置信息
List<RowMap> companyList = DBSql.getMaps("SELECT GSMC,JD,WD FROM BO_EU_BNBM_DATALINKUP_GSJWD"); List<RowMap> companyList = DBSql.getMaps("SELECT GSMC,JD,WD FROM BO_EU_BNBM_DATALINKUP_GSJWD");
Map<String, Location> resultMap = companyList.stream() Map<String, Location> resultMap = companyList.stream()
@ -466,7 +466,7 @@ public class SaleCountDimensionImpl implements DataSummaryService {
(existing, replacement) -> existing (existing, replacement) -> existing
)); ));
String querySql = "SELECT QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(NMNY) as YYSR, YEARMONTH" + String querySql = "SELECT QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(NMNY) as BHSYYSR, SUM(SSJERMB) AS YYSR, YEARMONTH" +
" FROM " + SALES_DETAIL_TABLE + " FROM " + SALES_DETAIL_TABLE +
" WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" +
" GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH"; " GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH";
@ -499,6 +499,7 @@ public class SaleCountDimensionImpl implements DataSummaryService {
bo.set("WD", location.getLatitude()); bo.set("WD", location.getLatitude());
} }
bo.set("YYSR", map.getDouble("YYSR")); bo.set("YYSR", map.getDouble("YYSR"));
bo.set("BHSYYSR", map.getDouble("BHSYYSR"));
bos.add(bo); bos.add(bo);
} }