diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java index 230d1aa..404a811 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.IGrBiFsBusinessRealService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ public class GenerateBusinessRealJob implements JobHandler { private IGrBiFsBusinessRealService grBiFsBusinessRealService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成经营指标完成情况 ************"); grBiFsBusinessRealService.generateBusinessReal(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomJob.java index 18dcf8d..f63dd8b 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateCustomJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubCustomService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateCustomJob implements JobHandler { private IGrBiPubCustomService grBiPubCustomService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成客户对象 ************"); grBiPubCustomService.generateCustom(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateDosageJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateDosageJob.java index 409273a..161d6c8 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateDosageJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateDosageJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubDosageService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateDosageJob implements JobHandler { private IGrBiPubDosageService grBiPubDosageService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成剂型对象 ************"); grBiPubDosageService.generateDosage(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateGoodsJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateGoodsJob.java index 7851255..bb86d11 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateGoodsJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateGoodsJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubGoodsService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateGoodsJob implements JobHandler { private IGrBiPubGoodsService grBiPubGoodsService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成货品对象 ************"); grBiPubGoodsService.generateGoods(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateProvinceJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateProvinceJob.java index d9d3858..0c1d730 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateProvinceJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateProvinceJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubProvinceService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateProvinceJob implements JobHandler { private IGrBiPubProvinceService grBiPubProvinceService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成行政区域对象 ************"); grBiPubProvinceService.generateProvince(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalerJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalerJob.java index 35a8cbc..3ff1c68 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalerJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalerJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubSalerService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateSalerJob implements JobHandler { private IGrBiPubSalerService grBiPubSalerService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成业务员对象 ************"); grBiPubSalerService.generateSaler(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalesReportJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalesReportJob.java index 5dc11a0..9774d04 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalesReportJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalesReportJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.INewGrBiSaAggService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -25,6 +26,9 @@ public class GenerateSalesReportJob implements JobHandler { @Resource private INewGrBiSaAggService newGrBiSaAggService; + + @Override + @TenantIgnore public String execute(String param) { log.info("*********** 开始生成销售报表 ************"); newGrBiSaAggService.generateSalesReportJob(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSaletypeJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSaletypeJob.java index a2a8f2c..f7343a0 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSaletypeJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSaletypeJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubSaletypeService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateSaletypeJob implements JobHandler { private IGrBiPubSaletypeService grBiPubSaletypeService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成销售类型对象 ************"); grBiPubSaletypeService.generateSaletype(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalezoneJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalezoneJob.java index 8521961..2cb3964 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalezoneJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateSalezoneJob.java @@ -4,6 +4,7 @@ import com.lideeyunji.core.framework.service.IGrBiPubSalezoneService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class GenerateSalezoneJob implements JobHandler { private IGrBiPubSalezoneService grBiPubSalezoneService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成业务区域对象 ************"); grBiPubSalezoneService.generateSalezone(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java index 148f837..71afebd 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.IGrBiStLotService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ public class GenerateStLotJob implements JobHandler { private IGrBiStLotService grBiFsStLotService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成物料产品库存统计表 ************"); grBiFsStLotService.generateStLot(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java index 7590326..6c209e6 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.IGrBiStProductAvlService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ public class GenerateStProductAvlJob implements JobHandler { private IGrBiStProductAvlService grBiFsStProductAvlService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成产品可销库存对象 ************"); grBiFsStProductAvlService.generateStProductAvl(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java index e4f9174..36ce098 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ public class GenerateStProductJob implements JobHandler { private IGrBiStProductService grBiFsStProductService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成库存产品占比表对象 ************"); grBiFsStProductService.generateStProduct(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStStatsJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStStatsJob.java index 1edc843..a1bc883 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStStatsJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStStatsJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.service.IGrBiStStatsService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ public class GenerateStStatsJob implements JobHandler { private IGrBiStStatsService iGrBiStStatsService; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("*********** 开始生成库存全品种统计表 ************"); iGrBiStStatsService.generateStStats(lideeYunJiBaseConstant.DS_ERP_BI_DATA); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureJob.java index d06c589..e11d593 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.mapper.OracleProcedureMapper; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -24,6 +25,7 @@ public class OracleProcedureJob implements JobHandler { private OracleProcedureMapper oracleProcedureMapper; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("========== 开始执行 Oracle 存储过程定时任务，参数：{} ==========", param); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateCoreJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateCoreJob.java index 35948ae..b4ce9e3 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateCoreJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateCoreJob.java @@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.config.job; import com.lideeyunji.core.framework.mapper.OracleProcedureMapper; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ public class OracleProcedureUpdateCoreJob implements JobHandler { private OracleProcedureMapper oracleProcedureMapper; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("========== 开始执行 Oracle 存储过程定时任务 ，用于更新核心、高频的数据，参数：{} ==========", param); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateErpDataJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateErpDataJob.java index 28ef454..6de1c4f 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateErpDataJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/OracleProcedureUpdateErpDataJob.java @@ -5,6 +5,7 @@ import com.lideeyunji.core.framework.mapper.GrBiSaSetdtlMapper; import com.lideeyunji.core.framework.mapper.OracleProcedureMapper; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; +import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,6 +28,7 @@ public class OracleProcedureUpdateErpDataJob implements JobHandler { private GrBiSaSetdtlMapper grBiSaSetdtlMapper; @Override + @TenantIgnore public String execute(String param) throws Exception { log.info("========== 开始执行 Oracle 存储过程定时任务 ，ERP中间库，参数：{} ==========", param); diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml index 7b16161..528c692 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml @@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" saler.SALERID AS saler_id, saler.SALERNAME AS saler_name, sum(SAQTY) AS this_month_sa_qty, - round(sum(SAMONEY), 2) AS this_month_sa_money, --除税销售额 + round(sum(SAMONEY), 2) AS this_month_sa_money, -- 除税销售额 round(sum(COST), 2) AS this_month_cost, round(sum(PROFIT), 2) AS this_month_profit -- sum(SAQTY) as 本月销量,