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

1、拉取时间范围修改

Browse Source 
2、9宫格修改
This commit is contained in:
llllon 2025-10-29 12:27:29 +08:00
parent 56ed9d679a
commit d298fbbdf5
7 changed files with 12 additions and 11 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/service/impl/PurchaseDataSyncServiceImpl.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/SaleDataSyncServiceImpl.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.

9
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/NineGridCountJob.java
View File

@ -64,11 +64,12 @@ public class NineGridCountJob implements IJob {
//取财务数据 //取财务数据
int lastMonthValue = now.minusMonths(1).getMonthValue(); int lastMonthValue = now.minusMonths(1).getMonthValue();
int year = now.minusMonths(1).getYear(); int year = now.minusMonths(1).getYear();
RowMap cwsj = DBSql.getMap("SELECT (DNSJLJ/10000) AS DNSJLJ FROM BO_EU_CWSJ_INTERFACE_LRZE " + String lastMonthValueStr = lastMonthValue<10?"0"+lastMonthValue:lastMonthValue+"";
"WHERE BK = '公司整体' AND DWMC = '合并' AND YEAR = '" + year + "' AND MONTH = '" + lastMonthValue + "'"); RowMap cwsj = DBSql.getMap("SELECT (DNSJLJ) AS DNSJLJ FROM BO_EU_CWSJ_INTERFACE_LRZE " +
"WHERE BK = '公司整体' AND DWMC = '合并' AND YEAR = '" + year + "' AND MONTH = '" + lastMonthValueStr + "'");
bo.set("ZB3",cwsj==null?"":cwsj.getString("DNSJLJ"));//利润总额 bo.set("ZB3",cwsj==null?"":cwsj.getString("DNSJLJ"));//利润总额
//预算完成率 //预算完成率
RowMap yswcl = DBSql.getMap("select hz.ysze AS ysze,BUDGETTARGET,(hz.ysze / mb.BUDGETTARGET)*100 AS yewcl " + RowMap yswcl = DBSql.getMap("select hz.ysze AS ysze,BUDGETTARGET,(hz.ysze / mb.BUDGETTARGET) AS yewcl " +
" from " + " from " +
" (select sum( `BHSYYSR`) / 10000 ysze " + " (select sum( `BHSYYSR`) / 10000 ysze " +
" from BO_EU_XS_YESR " + " from BO_EU_XS_YESR " +
@ -79,7 +80,7 @@ public class NineGridCountJob implements IJob {
String lastMonth = now.minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM")); String lastMonth = now.minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
LOGGER.info("lastMonth:{}",lastMonth); LOGGER.info("lastMonth:{}",lastMonth);
RowMap cl = DBSql.getMap("SELECT YEARS_MONTH," + RowMap cl = DBSql.getMap("SELECT YEARS_MONTH," +
" (MAX(CASE WHEN PRODEUCT = '石膏板' THEN YTD END)/10000) AS SGBYTD," + " (MAX(CASE WHEN PRODEUCT = '石膏板' THEN YTD END)) AS SGBYTD," +
" (MAX(CASE WHEN PRODEUCT = '轻钢龙骨' THEN YTD END)/10000) AS QGLGYTD" + " (MAX(CASE WHEN PRODEUCT = '轻钢龙骨' THEN YTD END)/10000) AS QGLGYTD" +
" FROM BO_EU_CLMXB" + " FROM BO_EU_CLMXB" +
" WHERE YEARS_MONTH = '" + lastMonth + "' AND GONGCHANG IN ('小计（万㎡）','小计（吨）')" + " WHERE YEARS_MONTH = '" + lastMonth + "' AND GONGCHANG IN ('小计（万㎡）','小计（吨）')" +

6
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java
View File

@ -119,7 +119,7 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
} else { } else {
// 计算时间范围（当前日期-30天 ~ 昨天） // 计算时间范围（当前日期-30天 ~ 昨天）
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.add(Calendar.DATE, -1); // 昨天 // cal.add(Calendar.DATE, -1); // 昨天
endDate = cal.getTime(); endDate = cal.getTime();
cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含） cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含）
startDate = cal.getTime(); startDate = cal.getTime();
@ -277,8 +277,8 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
for (int i = 0; i < timeRanges.size(); i++) { for (int i = 0; i < timeRanges.size(); i++) {
Date[] range = timeRanges.get(i); Date[] range = timeRanges.get(i);
String startDate = simpleDateFormat2.format(range[0])+""; String startDate = simpleDateFormat2.format(range[0])+" 00:00:00";
String endDate = simpleDateFormat2.format(range[1])+""; String endDate = simpleDateFormat2.format(range[1])+" 00:00:00";
LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate); LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate);
if ("ORACLE".equalsIgnoreCase(DBname)) { if ("ORACLE".equalsIgnoreCase(DBname)) {

6
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
View File

@ -145,7 +145,7 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
} else { } else {
// 计算时间范围（当前日期-30天 ~ 昨天） // 计算时间范围（当前日期-30天 ~ 昨天）
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.add(Calendar.DATE, -1); // 昨天 // cal.add(Calendar.DATE, -1); // 昨天
endDate = cal.getTime(); endDate = cal.getTime();
cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含） cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含）
startDate = cal.getTime(); startDate = cal.getTime();
@ -302,8 +302,8 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
for (int i = 0; i < timeRanges.size(); i++) { for (int i = 0; i < timeRanges.size(); i++) {
Date[] range = timeRanges.get(i); Date[] range = timeRanges.get(i);
String startDate = simpleDateFormat2.format(range[0]); String startDate = simpleDateFormat2.format(range[0])+" 00:00:00";
String endDate = simpleDateFormat2.format(range[1]); String endDate = simpleDateFormat2.format(range[1])+" 00:00:00";
LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate); LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate);
if ("ORACLE".equalsIgnoreCase(DBname)) { if ("ORACLE".equalsIgnoreCase(DBname)) {

2
com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java
View File

@ -129,7 +129,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
} else { } else {
// 计算时间范围（当前日期-30天 ~ 昨天） // 计算时间范围（当前日期-30天 ~ 昨天）
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.add(Calendar.DATE, -1); // 昨天 // cal.add(Calendar.DATE, -1); // 昨天
endDate = cal.getTime(); endDate = cal.getTime();
cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含） cal.add(Calendar.DATE, -DAYS_BACK + 1); // 30天前（含）
startDate = cal.getTime(); startDate = cal.getTime();