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-10-29 10:31:18 +08:00
parent 3d4f40566a
commit 5a8871f97d
4 changed files with 9 additions and 7 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/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.

13
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

@ -1,6 +1,7 @@
package com.awspaas.user.apps.bnbm.datalinkup.job;
import com.actionsoft.bpms.bo.engine.BO;
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.ProcessInstance;
import com.actionsoft.bpms.commons.database.RowMap;
import com.actionsoft.bpms.schedule.IJob;
import com.actionsoft.bpms.server.UserContext;
@ -63,7 +64,7 @@ public class NineGridCountJob implements IJob {
//取财务数据
int lastMonthValue = now.minusMonths(1).getMonthValue();
int year = now.minusMonths(1).getYear();
RowMap cwsj = DBSql.getMap("SELECT DNSJLJ FROM BO_EU_CWSJ_INTERFACE_LRZE " +
RowMap cwsj = DBSql.getMap("SELECT (DNSJLJ/10000) AS DNSJLJ FROM BO_EU_CWSJ_INTERFACE_LRZE " +
"WHERE BK = '公司整体' AND DWMC = '合并' AND YEAR = '" + year + "' AND MONTH = '" + lastMonthValue + "'");
bo.set("ZB3",cwsj==null?"":cwsj.getString("DNSJLJ"));//利润总额
//预算完成率
@ -78,8 +79,8 @@ public class NineGridCountJob implements IJob {
String lastMonth = now.minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
LOGGER.info("lastMonth:{}",lastMonth);
RowMap cl = DBSql.getMap("SELECT YEARS_MONTH," +
" MAX(CASE WHEN PRODEUCT = '石膏板' THEN YTD END) AS SGBYTD," +
" MAX(CASE WHEN PRODEUCT = '轻钢龙骨' THEN YTD END) AS QGLGYTD" +
" (MAX(CASE WHEN PRODEUCT = '石膏板' THEN YTD END)/10000) AS SGBYTD," +
" (MAX(CASE WHEN PRODEUCT = '轻钢龙骨' THEN YTD END)/10000) AS QGLGYTD" +
" FROM BO_EU_CLMXB" +
" WHERE YEARS_MONTH = '" + lastMonth + "' AND GONGCHANG IN ('小计（万㎡）','小计（吨）')" +
" AND PRODEUCT IN ('石膏板', '轻钢龙骨') GROUP BY YEARS_MONTH");
@ -89,7 +90,7 @@ public class NineGridCountJob implements IJob {
bo.set("ZB8",map.getString("steel_keel_avg_price"));// 龙骨均价
bo.set("ZB9","");//总运费
List<RowMap> maps = DBSql.getMaps("SELECT SUM(a.YSYE) AS total_YSYE, a.BKGS, b.max_rq " +
List<RowMap> maps = DBSql.getMaps("SELECT (SUM(a.YSYE)/10000) AS total_YSYE, a.BKGS, b.max_rq " +
" FROM BO_EU_BNBM_DATALINKUP_XS_YSL a" +
" INNER JOIN (" +
" SELECT BKGS, MAX(RQ) as max_rq" +
@ -106,7 +107,7 @@ public class NineGridCountJob implements IJob {
String querySql_SL ="SELECT SUM(PRICESERVICETOTALFEE) AS PRICESERVICETOTALFEE_SUM FROM BO_EU_TRAVELMODULE_XFMX WHERE TRAVELTIME>=CONCAT(YEAR (CURDATE()),'-01-01')";
double priceservicetotalfeeSum = DBSql.getDouble(querySql_SL, "PRICESERVICETOTALFEE_SUM");
bo.set("ZB11",priceservicetotalfeeSum);//商旅总额
SDK.getBOAPI().createDataBO("BO_EU_OA_NINE_GRID",bo, UserContext.fromUID("admin"));
ProcessInstance boProcessInstance = SDK.getProcessAPI().createBOProcessInstance("obj_0c5fce0d32564ef384036f50c205df77", UserContext.fromUID("admin").getUID(), nowYearMonthStr + "-数据");
SDK.getBOAPI().create("BO_EU_OA_NINE_GRID",bo,boProcessInstance, UserContext.fromUID("admin"));
}
}

3
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

@ -244,7 +244,8 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
for (int i = 0; i < timeRanges.size(); i++) {
Date[] range = timeRanges.get(i);
String startDate = simpleDateFormat2.format(range[0])+" 00:00:00";
String endDate = simpleDateFormat2.format(range[1])+" 23:59:59";
// String endDate = simpleDateFormat2.format(range[1])+" 23:59:59";
String endDate = simpleDateFormat2.format(range[1])+" 00:00:00";
LOGGER.info("正在处理第 {} 个时间区间: {} 至 {}", i + 1, startDate, endDate);
if ("ORACLE".equalsIgnoreCase(DBname)) {