diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/stgoodTop10Plugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/stgoodTop10Plugin.java index f1d4f1f..8805fe8 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/stgoodTop10Plugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/stgoodTop10Plugin.java @@ -9,6 +9,7 @@ import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceRe import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAroundAdvicePlugin; import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService; +import com.lideeyunji.tool.framework.exception.lideeYunJiException; import com.lideeyunji.tool.framework.yunji.model.ResultDataModel; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -46,6 +47,9 @@ public class stgoodTop10Plugin implements ReportAroundAdvicePlugin { params.put("useYearEnd", lastYear); params.put("useMonthEnd", lastMonth); } + if(!params.get("useYearStart").toString().equals(params.get("useYearEnd").toString())){ + throw new lideeYunJiException("不能跨年查询!"); + } Page page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); if (params.containsKey("column")) { String orderBy = params.get("column") + " " + params.get("order"); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zdCustomerPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zdCustomerPlugin.java index d1ccb4f..9f97658 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zdCustomerPlugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zdCustomerPlugin.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext; import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAroundAdvicePlugin; import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService; +import com.lideeyunji.tool.framework.exception.lideeYunJiException; import com.lideeyunji.tool.framework.yunji.model.ResultDataModel; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -43,6 +44,9 @@ public class zdCustomerPlugin implements ReportAroundAdvicePlugin { params.put("useYearEnd", lastYear); params.put("useMonthEnd", lastMonth); } + if(!params.get("useYearStart").toString().equals(params.get("useYearEnd").toString())){ + throw new lideeYunJiException("不能跨年查询!"); + } Page page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); // if (params.containsKey("column")) { // String orderBy = params.get("column") + " " + params.get("order");