修改报表
This commit is contained in:
		
							parent
							
								
									3470c2bc86
								
							
						
					
					
						commit
						9393dc4e3e
					
				@ -368,7 +368,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                #region 1
 | 
					                #region 1
 | 
				
			||||||
                PerformanceModel CHARTFXDJ1 = new PerformanceModel();
 | 
					                PerformanceModel CHARTFXDJ1 = new PerformanceModel();
 | 
				
			||||||
                CHARTFXDJ1.NAME = new List<string> { "一级", "二级", "三级", "四级" };
 | 
					                CHARTFXDJ1.NAME = new List<string> { "重大风险", "较大风险", "一般风险", "低风险" };
 | 
				
			||||||
                var type1 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.一级);
 | 
					                var type1 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.一级);
 | 
				
			||||||
                var type2 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.二级);
 | 
					                var type2 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.二级);
 | 
				
			||||||
                var type3 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.三级);
 | 
					                var type3 = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.三级);
 | 
				
			||||||
@ -383,16 +383,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                PerformanceModel1 model3 = new PerformanceModel1();
 | 
					                PerformanceModel1 model3 = new PerformanceModel1();
 | 
				
			||||||
                PerformanceModel1 model4 = new PerformanceModel1();
 | 
					                PerformanceModel1 model4 = new PerformanceModel1();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                model1.name = "一级";
 | 
					                model1.name = "重大风险";
 | 
				
			||||||
                model1.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.一级);
 | 
					                model1.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.一级);
 | 
				
			||||||
                model2s.Add(model1);
 | 
					                model2s.Add(model1);
 | 
				
			||||||
                model2.name = "二级";
 | 
					                model2.name = "较大风险";
 | 
				
			||||||
                model2.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.二级);
 | 
					                model2.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.二级);
 | 
				
			||||||
                model2s.Add(model2);
 | 
					                model2s.Add(model2);
 | 
				
			||||||
                model3.name = "三级";
 | 
					                model3.name = "一般风险";
 | 
				
			||||||
                model3.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.三级);
 | 
					                model3.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.三级);
 | 
				
			||||||
                model2s.Add(model3);
 | 
					                model2s.Add(model3);
 | 
				
			||||||
                model4.name = "四级";
 | 
					                model4.name = "低风险";
 | 
				
			||||||
                model4.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.四级);
 | 
					                model4.value = allrisk.Count(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.四级);
 | 
				
			||||||
                model2s.Add(model4);
 | 
					                model2s.Add(model4);
 | 
				
			||||||
                riskPerformanceData.CHARTFXDJ2 = model2s;
 | 
					                riskPerformanceData.CHARTFXDJ2 = model2s;
 | 
				
			||||||
@ -464,6 +464,10 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                foreach (FMDepartmentType level in Enum.GetValues(typeof(FMDepartmentType)))
 | 
					                foreach (FMDepartmentType level in Enum.GetValues(typeof(FMDepartmentType)))
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    var levelName = level.GetDescription();
 | 
					                    var levelName = level.GetDescription();
 | 
				
			||||||
 | 
					                    if(levelName == "车间")
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        continue ;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                    modelDepartmentType.NAME.Add(levelName);
 | 
					                    modelDepartmentType.NAME.Add(levelName);
 | 
				
			||||||
                    modelDepartmentType.LEVEL1.Add(allrisk.Count(t => t.LEVEL == level && t.EVALUATE_LEVEL == EvaluateLevelEnum.一级));
 | 
					                    modelDepartmentType.LEVEL1.Add(allrisk.Count(t => t.LEVEL == level && t.EVALUATE_LEVEL == EvaluateLevelEnum.一级));
 | 
				
			||||||
                    modelDepartmentType.LEVEL2.Add(allrisk.Count(t => t.LEVEL == level && t.EVALUATE_LEVEL == EvaluateLevelEnum.二级));
 | 
					                    modelDepartmentType.LEVEL2.Add(allrisk.Count(t => t.LEVEL == level && t.EVALUATE_LEVEL == EvaluateLevelEnum.二级));
 | 
				
			||||||
@ -508,7 +512,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                    var templevel4 = allrisk.Where(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.四级);
 | 
					                    var templevel4 = allrisk.Where(t => t.EVALUATE_LEVEL == EvaluateLevelEnum.四级);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    PerformanceModel modelSCDY = new PerformanceModel();
 | 
					                    PerformanceModel modelSCDY = new PerformanceModel();
 | 
				
			||||||
                    modelSCDY.NAME = new List<string> { "公司", "部门", "车间", "班组" };
 | 
					                    modelSCDY.NAME = new List<string> { "公司", "部门", "班组" };
 | 
				
			||||||
                    modelSCDY.LEVEL1 = new List<int> { templevel1.Count(t => (int)t.LEVEL == levelArr[0]), templevel1.Count(t => (int)t.LEVEL == levelArr[1]), templevel1.Count(t => (int)t.LEVEL == levelArr[2]), templevel1.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
					                    modelSCDY.LEVEL1 = new List<int> { templevel1.Count(t => (int)t.LEVEL == levelArr[0]), templevel1.Count(t => (int)t.LEVEL == levelArr[1]), templevel1.Count(t => (int)t.LEVEL == levelArr[2]), templevel1.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
				
			||||||
                    modelSCDY.LEVEL2 = new List<int> { templevel2.Count(t => (int)t.LEVEL == levelArr[0]), templevel2.Count(t => (int)t.LEVEL == levelArr[1]), templevel2.Count(t => (int)t.LEVEL == levelArr[2]), templevel2.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
					                    modelSCDY.LEVEL2 = new List<int> { templevel2.Count(t => (int)t.LEVEL == levelArr[0]), templevel2.Count(t => (int)t.LEVEL == levelArr[1]), templevel2.Count(t => (int)t.LEVEL == levelArr[2]), templevel2.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
				
			||||||
                    modelSCDY.LEVEL3 = new List<int> { templevel3.Count(t => (int)t.LEVEL == levelArr[0]), templevel3.Count(t => (int)t.LEVEL == levelArr[1]), templevel3.Count(t => (int)t.LEVEL == levelArr[2]), templevel3.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
					                    modelSCDY.LEVEL3 = new List<int> { templevel3.Count(t => (int)t.LEVEL == levelArr[0]), templevel3.Count(t => (int)t.LEVEL == levelArr[1]), templevel3.Count(t => (int)t.LEVEL == levelArr[2]), templevel3.Count(t => (int)t.LEVEL == levelArr[3]) };
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user