#328 1. 上传到平台的数据只有含税和修正后的报价

     2. 修正报价 保存原因

OBE-MANAGEMENT/src/com/gx/obe/management/webservice/UploadEvaluationResultAndFile.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -36,6 +37,7 @@ import com.gx.obe.common.file.download.DownloadFileUtill;
 import com.gx.obe.common.file.download.infer.DownloadFileListener;
 import com.gx.obe.common.file.enumeration.FileConstants;
 import com.gx.obe.common.file.service.SignatureFileService;
+import com.gx.obe.common.file.utils.ParsingXmlUtils;
 import com.gx.obe.common.file.utils.ZipUtils;
 import com.gx.obe.components.core.enumeration.BidPriceEnum;
 import com.gx.obe.components.core.enumeration.CommonEnum;
@@ -71,9 +73,11 @@ import com.gx.obe.web.entity.expert.Expert;
 import com.gx.obe.web.entity.expert.ExpertEvaluationResult;
 import com.gx.obe.web.entity.price.BidPrice;
 import com.gx.obe.web.entity.price.BidPriceHisResult;
+import com.gx.obe.web.entity.price.BidPriceResult;
 import com.gx.obe.web.entity.tender.TenderProjectEntity;
 import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
 import com.gx.obe.web.service.BidPriceHisResultService;
+import com.gx.obe.web.service.BidPriceResultService;
 import com.gx.obe.web.service.BidPriceService;
 import com.gx.obe.web.service.ProjectRuleService;
 import com.gx.obe.web.service.ReBidPriceRoundService;
@@ -488,6 +492,14 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 					biddingRequest  = supplierEvaluationResult.getBiddingRequest();
 					vetoType = supplierEvaluationResult.getVetoType();
 				}
+				if(parserStructProject()) {
+					BidPriceResultService bidPriceResultService = new BidPriceResultService();
+					List<BidPriceResult> bidPriceResultList = bidPriceResultService.getBidPriceResultTableList(supplier.getTenderId(),supplier.getId());
+					BidPriceResult bidPriceResult = CollectionUtils.get(bidPriceResultList, t -> {
+						return "总报价（含税）".equals(t.getBidPriceName());
+					});
+					evaluationPrice = bidPriceResult.getEvaluationPrice().toString();
+				}
 				supplierElement.addElement("evaluationPrice").setText(evaluationPrice);
 				supplierElement.addElement("evaluationScore").setText(evaluationScore);
 				supplierElement.addElement("evaluationFinalScore").setText(evaluationFinalScore);
@@ -514,6 +526,29 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 		}
 	}
 	
+	public boolean parserStructProject() {
+		// 获得招标文件的指标Document
+		Document factorDoc = XmlUtils.getXmlDocument(FileConstants.getBiddingFilePath(tenderProjectEntity.getId()) + FileConstants.PST_XML);
+		// 未找到招标文件的指标，则获得投标文件的指标。
+		if(null == factorDoc){
+			// 获得投标人集合
+			List<Supplier> supplierList = supplierService.getSupplierOpenBidList(tenderProjectEntity.getId());
+			if(null != supplierList && supplierList.size() > 0){
+				// 遍历投标人信息
+				for(Supplier supplier : supplierList){
+					if(null != factorDoc){
+						break;
+					}
+					// 获得投标人投标文件下的指标路径
+					String supplierFactorXmlPath = FileConstants.getBidFilePath(tenderProjectEntity.getId(), supplier.getId()) + FileConstants.PST_XML;
+					// 获得投标文件的指标Document
+					factorDoc = XmlUtils.getXmlDocument(supplierFactorXmlPath);
+				}
+			}
+		}
+		 return factorDoc == null ? false:ParsingXmlUtils.parsingDocStructXML(factorDoc);	 
+	}
+
 	/**
 	 * 组装供应商评审步骤结果
 	 * @param supplierElement

com.gx.obe.common.widget/src/com/gx/obe/common/widget/dialog/EditSubBidPriceItemDialog.java

@@ -757,7 +757,8 @@ public class EditSubBidPriceItemDialog extends EDialog {
 					if(bidPriceResult.getBidPriceCode().equals(curBidPriceResult.getBidPriceCode())) {
 						bidPriceResult.setFinalBidPrice(curBidPriceResult.getFinalBidPrice());
 						bidPriceResult.setEvaluationPrice(curBidPriceResult.getEvaluationPrice());
-						success = bidPriceResultService.updateAssignProperty(bidPriceResult, new String[] {"bidPrice", "evaluationPrice", "finalBidPrice"});
+						bidPriceResult.setModifyReason(curBidPriceResult.getModifyReason());
+						success = bidPriceResultService.updateAssignProperty(bidPriceResult, new String[] {"bidPrice", "evaluationPrice", "finalBidPrice", "modifyReason"});
 					}else {
 						success = bidPriceResultService.updateBidPriceResultOrSum(curBidPriceResult);
 					}