diff --git a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/AbstractBusinessProcessor.java b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/AbstractBusinessProcessor.java index 3a101ba..c44acd0 100644 --- a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/AbstractBusinessProcessor.java +++ b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/AbstractBusinessProcessor.java @@ -31,7 +31,7 @@ public abstract class AbstractBusinessProcessor { // 允许的表名白名单 private static final Set ALLOWED_TABLES = new HashSet<>(Arrays.asList( "marketing_performance_h", - "marketing_performance_m_d", + "marketing_performance_md", "marketing_performance_m", "marketing_performance_q", "marketing_performance_y", diff --git a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/init/InitInsertProcessor.java b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/init/InitInsertProcessor.java index 4bc477f..d0a4946 100644 --- a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/init/InitInsertProcessor.java +++ b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/init/InitInsertProcessor.java @@ -46,7 +46,7 @@ public class InitInsertProcessor extends AbstractBusinessProcessor { deleteSql="DELETE FROM marketing_performance_h WHERE record_date = ?"; deletedCount = executeParameterizedSql(connection, deleteSql, batchMonth); }else{ - deleteSql="DELETE FROM marketing_performance_m_d WHERE record_date = ?"; + deleteSql="DELETE FROM marketing_performance_md WHERE record_date = ?"; deletedCount = executeParameterizedSql(connection, deleteSql, batchMonth); deleteSql="DELETE FROM marketing_performance_m WHERE record_date = ?"; diff --git a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketerMonthTotalProcessor.java b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketerMonthTotalProcessor.java index f349d01..d47ea52 100644 --- a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketerMonthTotalProcessor.java +++ b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/processor/total/MarketerMonthTotalProcessor.java @@ -240,7 +240,7 @@ public class MarketerMonthTotalProcessor extends AbstractBusinessProcessor { " ,? AS create_time " + " ,null AS update_by " + " ,null AS update_time " + - "from marketing_performance_m_d d " + + "from marketing_performance_md d " + "left join sys_user b on b.mkt_no=d.marketer_code " + "LEFT JOIN sys_dept e ON b.dept_id = e.dept_id " + "where " + diff --git a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/service/BatchStatusService.java b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/service/BatchStatusService.java index 81fe5a2..3b0f3d1 100644 --- a/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/service/BatchStatusService.java +++ b/MpsFormalBatch/src/main/java/com/gtsoft/mps/batch/service/BatchStatusService.java @@ -36,7 +36,7 @@ public class BatchStatusService { // 正式批量第一次预处理明细结果表 public static final String MARKETING_PERFORMANCE_H = "marketing_performance_h"; // 正式批量第一次正式处理明细结果表 - public static final String MARKETING_PERFORMANCE_M_D = "marketing_performance_m_d"; + public static final String MARKETING_PERFORMANCE_MD = "marketing_performance_md"; // 正式批量第二次正式处理汇总结果表 public static final String MARKETING_PERFORMANCE_M = "marketing_performance_m"; private static final Logger logger = LoggerFactory.getLogger(BatchStatusService.class); @@ -329,7 +329,7 @@ public class BatchStatusService { if (batchType.equals(BATCH_TYPE_PRE)) { tableName = MARKETING_PERFORMANCE_H; } else if (batchType.equals(BATCH_TYPE_AFTER)) { - tableName = MARKETING_PERFORMANCE_M_D; + tableName = MARKETING_PERFORMANCE_MD; } else { logger.error("未知的批量模式: {}", batchType); }