#20240823 报表生成增加健壮性

OBE-REPORT/src/com/gx/obe/report/dataset/word/JingNengEvaluationReportDataSet.java

@@ -80,35 +80,30 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		
 		List<Map<String,String>> supplierAssMapList = new  ArrayList<Map<String,String>>();
 		List<EvaluationStep> associationStepList = evaluationStepService.getEvaluationStepListByType(tenderProject.getId(), EvaluationStepEnum.ASSOCIATION_QUERY);
-		try {
-			if(null != associationStepList && associationStepList.size() > 0){
-				EvaluationStep step = associationStepList.get(0);
-				List<SupplierEvaluationStep> resultList = supplierEvaluationStepService.getSupplierEvaluationStepByTenderIdAndStepId(tenderProject.getId(), step.getId());
-				if(null != resultList && resultList.size() > 0) {
-					for(SupplierEvaluationStep result : resultList) {
-						Map<String,String> supplierMap = new HashMap<String,String>();
-						supplierMap.put("supplierName", supplierNameMap.get(result.getSupplierId()));
-						List<ExpertEvaluationResult> supplierResultList = expertEvaluationResultService.getSupplierStepAllExpertEvaluationResultList(tenderProject.getId(), step.getId(),result.getSupplierId());
-						String opinion = null;
-						if(null != supplierResultList && supplierResultList.size() > 0) {
-							for(ExpertEvaluationResult expertEvaluationResult : supplierResultList) {
-								if(null == opinion) {
-									opinion = expertEvaluationResult.getSupplierOpinion();
-								}else {
-									String supplierOpinion = expertEvaluationResult.getSupplierOpinion();
-								    opinion = opinion.concat("；").concat(supplierOpinion != null ? supplierOpinion : "");
-								}
+		if(null != associationStepList && associationStepList.size() > 0){
+			EvaluationStep step = associationStepList.get(0);
+			List<SupplierEvaluationStep> resultList = supplierEvaluationStepService.getSupplierEvaluationStepByTenderIdAndStepId(tenderProject.getId(), step.getId());
+			if(null != resultList && resultList.size() > 0) {
+				for(SupplierEvaluationStep result : resultList) {
+					Map<String,String> supplierMap = new HashMap<String,String>();
+					supplierMap.put("supplierName", supplierNameMap.get(result.getSupplierId()));
+					List<ExpertEvaluationResult> supplierResultList = expertEvaluationResultService.getSupplierStepAllExpertEvaluationResultList(tenderProject.getId(), step.getId(),result.getSupplierId());
+					String opinion = null;
+					if(null != supplierResultList && supplierResultList.size() > 0) {
+						for(ExpertEvaluationResult expertEvaluationResult : supplierResultList) {
+							if(null == opinion) {
+								opinion = expertEvaluationResult.getSupplierOpinion();
+							}else {
+								String supplierOpinion = expertEvaluationResult.getSupplierOpinion();
+							    opinion = opinion.concat("；").concat(supplierOpinion != null ? supplierOpinion : "");
 							}
 						}
-						supplierMap.put("opinion", opinion);
-						supplierMap.put("result", result.getAccessment().equals(com.gx.obe.components.core.enumeration.EvaluationStepEnum.QUALIFIED) ? "符合":"不符合");
-						supplierAssMapList.add(supplierMap);
 					}
+					supplierMap.put("opinion", opinion);
+					supplierMap.put("result", result.getAccessment().equals(com.gx.obe.components.core.enumeration.EvaluationStepEnum.QUALIFIED) ? "符合":"不符合");
+					supplierAssMapList.add(supplierMap);
 				}
 			}
-		}catch (Exception e) {
-			e.printStackTrace();
-			System.out.println();
 		}
 		reportDataSet.putParam("associationOpinionList", supplierAssMapList);