#328-1 1. 结构化非结构化根据招标工具渲染含税不含税 与 投标报价

       2. 结构化调整后，非结构化数据修改后未能再页面上正确展示

OBE-MANAGEMENT/src/com/gx/obe/management/composite/PriceFactorsManagerComposite.java

@@ -124,6 +124,7 @@ public class PriceFactorsManagerComposite extends Composite {
 	private Text bid_price_text;
 	private ELink config_bid_price;
 	private Map<String, String> bidPriceMap;
+	private Map<String, String> bidPriceIdMap;
 	private Composite composite_7;
 	private ELink del_formula;
 	private ELink applyToOtherPackBtn;
@@ -138,6 +139,7 @@ public class PriceFactorsManagerComposite extends Composite {
 	private EvaluationFactorService evaluationFactorService;
 	private ProjectRuleService projectRuleService;
 	private ELink applyToOtherFactorBtn;
+	private BidPriceResultService bidPriceResultService = new BidPriceResultService();
 	{
 		LogUtils.logClass(PriceFactorsManagerComposite.class);
 	}
@@ -638,13 +640,12 @@ public class PriceFactorsManagerComposite extends Composite {
 		
 		menuFunctionUtils.initFunctionAuthority(menu);
 		bidPriceMap = new HashMap<String, String>();
+		bidPriceIdMap = new HashMap<String, String>();
 		List<BidPrice> bidPriceList = bidPriceService.getTenderBidPriceList(tenderProject.getId());
 		if(null != bidPriceList){
 			for(BidPrice bidPrice : bidPriceList){
 				bidPriceMap.put(bidPrice.getBidPriceCode(), bidPrice.getBidPriceName());
-			}
-			if(bidPriceList.size() > 1){
-				bidPriceMap.put(BidPrice.BID_PRICE_TOTAL_CODE, Messages.BidPriceTotal);
+				bidPriceIdMap.put(bidPrice.getBidPriceCode(), bidPrice.getId());
 			}
 		}
 		
@@ -731,7 +732,6 @@ public class PriceFactorsManagerComposite extends Composite {
 							bid_price_text.getParent().layout();
 							if(null != curFactor.getId()){
 								evaluationFactorService.updateAssignProperty(curFactor, new String[]{"id","bidPriceCode"});
-								BidPriceResultService bidPriceResultService = new BidPriceResultService();
 								List<BidPriceResult> bidPriceResultList = bidPriceResultService.getBidPriceResultList(tenderProject.getId(), id);
 								Map<String, Object> supplierMap = new HashMap<>();
 								if(bidPriceResultList.size() > 0) {
@@ -1051,9 +1051,15 @@ public class PriceFactorsManagerComposite extends Composite {
 		if(null != curFactor.getBidPriceCode()){
 			if(null != bidPriceMap.get(curFactor.getBidPriceCode())){
 				bid_price_text.setText(bidPriceMap.get(curFactor.getBidPriceCode()));
-				del_bid_price.setVisible(true);
-			}else if(curFactor.getBidPriceCode().equals(BidPrice.BID_PRICE_TOTAL_CODE)){
-				bid_price_text.setText(Messages.BidPriceTotal);
+				//选中后自动触发
+				List<BidPriceResult> bidPriceResultList = bidPriceResultService.getBidPriceResultList(tenderProject.getId(), bidPriceIdMap.get(curFactor.getBidPriceCode()));
+				Map<String, Object> supplierMap = new HashMap<>();
+				if(bidPriceResultList.size() > 0) {
+					for(BidPriceResult bidPriceResult : bidPriceResultList) {
+						supplierMap.put(bidPriceResult.getSupplierId(), bidPriceResult);
+					}
+					bidPriceResultService.updateBidPriceAndFinalPrice(supplierMap);
+				}
 				del_bid_price.setVisible(true);
 			}else {
 				curFactor.setBidPriceCode(null);

OBE-MANAGEMENT/src/com/gx/obe/management/thread/EvaluationFactorXmlResolverThread.java

 package com.gx.obe.management.thread;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -11,11 +12,14 @@ import com.gx.obe.action.bean.Action;
 import com.gx.obe.common.file.enumeration.FileConstants;
 import com.gx.obe.common.file.utils.ParsingXmlUtils;
 import com.gx.obe.thread.CreateEvaluationStepThread;
+import com.gx.obe.util.utils.CollectionUtils;
 import com.gx.obe.util.utils.LogUtils;
 import com.gx.obe.util.utils.XmlUtils;
 import com.gx.obe.web.entity.Supplier;
 import com.gx.obe.web.entity.evaluation.EvaluationFactor;
+import com.gx.obe.web.entity.price.BidPrice;
 import com.gx.obe.web.entity.tender.TenderProjectEntity;
+import com.gx.obe.web.service.BidPriceService;
 import com.gx.obe.web.service.SupplierService;
 import com.gx.obe.web.service.evaluation.EvaluationFactorService;
 
@@ -33,7 +37,8 @@ public class EvaluationFactorXmlResolverThread implements Runnable {
 	private Action projectAction;
 	private Logger LOG = Logger.getLogger(EvaluationFactorXmlResolverThread.class);
 	private int sorNo = 1;
-	
+	private static String TAX = "bidPrice";
+	private static String NO_TAX = "noTaxBidPrice";
 	{
 		LogUtils.logClass(EvaluationFactorXmlResolverThread.class);
 	}
@@ -111,6 +116,26 @@ public class EvaluationFactorXmlResolverThread implements Runnable {
 		}
 		if (null != factorList) {
 			if(factorList.size() > 0){
+				//.equals(BidPrice.BID_PRICE_TOTAL_CODE)
+				BidPriceService bidPriceService = new BidPriceService();
+				List<BidPrice> bidPriceList = bidPriceService.getBidPriceFactorList(tenderProjectEntity.getId());
+				factorList = factorList.stream().map(t -> {
+					if(BidPrice.BID_PRICE_TOTAL_CODE.equals(t.getBidPriceCode()) && bidPriceList.size() == 1) {
+						t.setBidPriceCode(bidPriceList.get(0).getBidPriceCode());
+					}else if(TAX.equals(t.getBidPriceCode()) || NO_TAX.equals(t.getBidPriceCode())){
+						String tax;
+						if(TAX.equals(t.getBidPriceCode())) {
+							tax = "TAX_TOTAL_PRICE";
+						}else {
+							tax = "NO_TAX_TOTAL_PRICE";
+						}
+						BidPrice bidPriceResult = CollectionUtils.get(bidPriceList, s -> {
+							return tax.equals(s.getBidPriceCode());
+						});
+						t.setBidPriceCode(bidPriceResult.getBidPriceCode());
+					}
+					return t;
+				}).collect(Collectors.toList());
 				// 批量保存
 				if(evaluationFactorService.saveDownloadEvaluationFactor(tenderProjectEntity.getId(), factorList) > 0){
 					isImport = true;