#20240823 报表生成增加健壮性

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

@@ -80,6 +80,7 @@ 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());
@@ -94,7 +95,8 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 								if(null == opinion) {
 									opinion = expertEvaluationResult.getSupplierOpinion();
 								}else {
-								opinion = opinion.concat("；").concat(expertEvaluationResult.getSupplierOpinion());
+									String supplierOpinion = expertEvaluationResult.getSupplierOpinion();
+								    opinion = opinion.concat("；").concat(supplierOpinion != null ? supplierOpinion : "");
 								}
 							}
 						}
@@ -104,6 +106,10 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 					}
 				}
 			}
+		}catch (Exception e) {
+			e.printStackTrace();
+			System.out.println();
+		}
 		reportDataSet.putParam("associationOpinionList", supplierAssMapList);
 		
 		// 获得打分评标步骤集合