指标分年度和季度分类

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -446,7 +446,11 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		List<Map> indicatorMap = new ArrayList<>();
 		if("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "GLSX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())){
 
-			List<Indicator> indicatorList = indicatorService.listAll("","","",binSection,binStage,"","");
+			OrganizationEvaluation organizationEvaluation = organizationEvaluationService.getById(organizationEvaluationId);
+			if(null == organizationEvaluation){
+				return null;
+			}
+			List<Indicator> indicatorList = indicatorService.listAll("","","",binSection,binStage,"","",organizationEvaluation.getCheckCycle());
 			if(null != indicatorList && indicatorList.size()>0){
 				for (Indicator i : indicatorList){
 					Map map = new HashMap();

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ResponsibilityIndicatorInfoServiceImpl.java

@@ -218,8 +218,11 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 		//判断是否是（重点专项和管理事项）
 		List<Map> indicatorMap = new ArrayList<>();
 		if ("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "GLSX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())) {
-
-			List<Indicator> indicatorList = indicatorService.listAll("", "", "", binSection, binStage, "", "");
+			DeptResponsibility dby = deptResponsibilityService.getById(responsibilityId);
+			if(null == dby){
+				return null;
+			}
+			List<Indicator> indicatorList = indicatorService.listAll("", "", "", binSection, binStage, "", "",dby.getCheckCycle());
 			if (null != indicatorList && indicatorList.size() > 0) {
 				for (Indicator i : indicatorList) {
 					Map map = new HashMap();