#328 报表以及评标工具界面含税不含税数据错乱修改

BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/composite/PriceEvaluationTableComposite.java

@@ -360,13 +360,14 @@ public class PriceEvaluationTableComposite extends Composite implements IPriceEv
 			evaluationFactorMemo.append(evaluationFactor.getFactorName());
 			
 			StyleRange factorMemoTitleStyleRange = null;
+			StyleRange factorMemoTitleStyleRange1 = null;
 			StyleRange styleFactorMemoRange = null;
 			if(null != evaluationFactor.getMemo() && evaluationFactor.getMemo().length() > 0){
 				evaluationFactorMemo.append("\r\n");
 				startIndex = evaluationFactorMemo.length();
-				factorMemoTitleStyleRange = getTitleStyleRange(startIndex, Messages.EvalExplain.length() + 1);
 				if(parserStructProject()) {
-					evaluationFactorMemo.append(Messages.EvalExplainPrice).append("：").append(evalStructMessage).append("\r\n");
+					evaluationFactorMemo.append(Messages.EvalExplainPrice).append("：").append(evalStructMessage).append(evalStructMessage.contains("\n") ? "" : "\n");
+					factorMemoTitleStyleRange = getTitleStyleRange(startIndex, Messages.EvalExplainPrice.length() + 1);
 					styleFactorMemoRange = new StyleRange(); 
 					styleFactorMemoRange.start = startIndex + Messages.EvalExplainPrice.length() + 1; 
 					styleFactorMemoRange.length = evalStructMessage.length(); 
@@ -374,12 +375,15 @@ public class PriceEvaluationTableComposite extends Composite implements IPriceEv
 					styleFactorMemoRange.fontStyle = SWT.NORMAL;
 					startIndex = evaluationFactorMemo.length();
 					evaluationFactorMemo.append(Messages.BidExplainPrice).append("：").append(evaluationFactor.getMemo());
+					factorMemoTitleStyleRange1 = getTitleStyleRange(startIndex, Messages.BidExplainPrice.length() + 1);
 					StyleRange styleFactorMemoRange1 = new StyleRange(); 
 					styleFactorMemoRange1.start = startIndex + Messages.BidExplainPrice.length() + 1; 
 					styleFactorMemoRange1.length = evaluationFactor.getMemo().length(); 
 					styleFactorMemoRange1.foreground = SWTResourceManager.getColor(100, 100, 100); 
 					styleFactorMemoRange1.fontStyle = SWT.NORMAL;
+					
 				}else {
+					factorMemoTitleStyleRange = getTitleStyleRange(startIndex, Messages.EvalExplain.length() + 1);
 					evaluationFactorMemo.append(Messages.EvalExplain + "：").append(evaluationFactor.getMemo());
 					styleFactorMemoRange = new StyleRange(); 
 					styleFactorMemoRange.start = startIndex + Messages.EvalExplain.length() + 1; 
@@ -397,11 +401,14 @@ public class PriceEvaluationTableComposite extends Composite implements IPriceEv
 			evaluation_factor_memo.setStyleRange(styleFactorNameRange);
 			GridData gridData = (GridData)evaluation_factor_memo.getLayoutData();
 			if(evaluation_factor_memo.computeSize(SWT.DEFAULT, SWT.DEFAULT).y > 58){
-				gridData.heightHint = 105;
+				gridData.heightHint = evaluation_factor_memo.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
 			}
 
 			if(null != factorMemoTitleStyleRange){
 				evaluation_factor_memo.setStyleRange(factorMemoTitleStyleRange);
+				if(factorMemoTitleStyleRange1 != null) {
+					evaluation_factor_memo.setStyleRange(factorMemoTitleStyleRange1);
+				}
 				evaluation_factor_memo.setStyleRange(styleFactorMemoRange);
 			}
 		}

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

@@ -795,9 +795,9 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 			if (!StringUtils.isEmpty(evalStructMessage) && isStruct) {
 				formula = Messages.EvalExplainPrice + "：" + evalStructMessage + "\n\n" + Messages.BidExplainPrice + "："+  evaluationFactor.getMemo();
 			}
-			if(!StringUtils.isEmpty(evaluationFactor.getMemo()) && !isStruct) {
-				formula = formula + "\n\n" + Messages.EvalExplain + "：" + evaluationFactor.getMemo();
-			}
+//			if(!StringUtils.isEmpty(evaluationFactor.getMemo()) && !isStruct) {
+//				formula = formula + "\n\n" + Messages.EvalExplain + "：" + evaluationFactor.getMemo();
+//			}
 			reportDataSet.putParam("formula", formula);
 		} 
 		//获取商务技术打分权重