#20240731 #629 修改评标及评标报表内的价格评审数据显示有问题

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

@@ -80,20 +80,22 @@ public class PriceScoreDateSet extends BaseDateSet{
 		if(evalFactorList.size() > 0){
 			EvaluationStep priceEvalNode = priceEvalutionNodeList.get(0); 
 			supplierList = getEvaluationStepSupplierList(priceEvalNode, true);
-			boolean hasBidPriceTotal = evaluationFactorService.hasTotalBidPriceFactor(tenderProjectEntity.getId(), null);
-			List<BidPrice> bidPriceList = null;
-			if(!hasBidPriceTotal){
-				bidPriceList = bidPriceService.getTenderBidPriceList(tenderProjectEntity.getId());
-			}
+//			boolean hasBidPriceTotal = evaluationFactorService.hasTotalBidPriceFactor(tenderProjectEntity.getId(), null);
+//			List<BidPrice> bidPriceList = null;
+//			if(!hasBidPriceTotal){
+//				bidPriceList = bidPriceService.getTenderBidPriceList(tenderProjectEntity.getId());
+//			}
+			List<BidPrice> bidPriceList = bidPriceService.getTenderBidPriceList(tenderProjectEntity.getId());
 			int reportCount = 0;
 			for(EvaluationFactor priceEvalFactor : evalFactorList){
 				if(null == priceEvalFactor.getBidPriceCode() || priceEvalFactor.getBidPriceCode().length() == 0){
-					if(evalFactorList.size() == 1 && !hasBidPriceTotal) {
-						priceEvalFactor.setBidPriceCode(BidPrice.BID_PRICE_TOTAL_CODE);
-					}else {
+//					if(evalFactorList.size() == 1 && !hasBidPriceTotal) {
+//						priceEvalFactor.setBidPriceCode(BidPrice.BID_PRICE_TOTAL_CODE);
+//					}else {
+//						continue;
+//					}
 					continue;
 				}
-				}
 				BigDecimal basePriceFloat = null;
 				PriceParam priceParam = PriceParam.deserializePriceParam(priceEvalFactor.getComputerParams());;
 				if(null != priceParam){
@@ -111,11 +113,11 @@ public class PriceScoreDateSet extends BaseDateSet{
 //				BidPrice bidPrice = null;
 //				List<BidPriceResult> bidPriceResultList = null;
 				List<BidPriceResult> bidStructPriceResultList = null;
-				if(hasBidPriceTotal){
-					if(!priceEvalFactor.getBidPriceCode().equals(BidPrice.BID_PRICE_TOTAL_CODE)){
-						continue;
-					}
-				}
+//				if(hasBidPriceTotal){
+//					if(!priceEvalFactor.getBidPriceCode().equals(BidPrice.BID_PRICE_TOTAL_CODE)){
+//						continue;
+//					}
+//				}
 //				else {
 //					if(null != bidPriceList){
 //						for(BidPrice _bidPrice : bidPriceList){
@@ -169,15 +171,15 @@ public class PriceScoreDateSet extends BaseDateSet{
 						// 投标总报价
 						supplierMap.put("sortNo", "");
 						// 投标总报价
-						if(hasBidPriceTotal || ((null == bidPriceList || bidPriceList.size() == 1) && (null == bidStructPriceResultList || bidStructPriceResultList.size() == 0))){
-						
-							// 投标人开标结果
-							SupplierOpeningResult supplierOpeningResult = supplier.getSupplierOpeningResult();
-							initOpenBidPriceResultDataSet(supplierMap, supplier.getSupplierOpeningResult());
-							if(null != supplierOpeningResult){
-							}
-							
-						}else {
+//						if(hasBidPriceTotal || ((null == bidPriceList || bidPriceList.size() == 1) && (null == bidStructPriceResultList || bidStructPriceResultList.size() == 0))){
+//						
+//							// 投标人开标结果
+//							SupplierOpeningResult supplierOpeningResult = supplier.getSupplierOpeningResult();
+//							initOpenBidPriceResultDataSet(supplierMap, supplier.getSupplierOpeningResult());
+//							if(null != supplierOpeningResult){
+//							}
+//							
+//						}else {
 //							BidPriceResult bidPriceResult = CollectionUtils.get(bidPriceResultList, t -> {
 //								return null != t.getSupplierId() && supplier.getId().equals(t.getSupplierId());
 //							});
@@ -185,11 +187,11 @@ public class PriceScoreDateSet extends BaseDateSet{
 //							if (null != bidPriceResult) {
 //								
 //							}
-							if(!isStruct) {
-								bidStructPriceResultList = bidStructPriceResultList.stream().filter(t -> priceEvalFactor.getBidPriceCode().equals(t.getBidPriceCode())).collect(Collectors.toList());
-							}
+//							if(!isStruct) {
+//								bidStructPriceResultList = bidStructPriceResultList.stream().filter(t -> priceEvalFactor.getBidPriceCode().equals(t.getBidPriceCode())).collect(Collectors.toList());
+//							}
 							initBidPriceResultDataSet(supplierMap, bidStructPriceResultList);
-						}
+//						}
 						supplierMap.put("basePriceFloat", basePriceFloat);
 						for(EvaluationFactorResult evaluationFactorResult : expertEvaluateFactorResultList){
 							if(evaluationFactorResult.getFactorId().equals(priceEvalFactor.getId()) && evaluationFactorResult.getSupplierId().equals(supplier.getId())){

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

@@ -746,7 +746,12 @@ public class EditSubBidPriceItemDialog extends EDialog {
 			public void threadRun() {
 				BidPriceService bidPriceService = new BidPriceService();
 				List<BidPriceResult> bidStructPriceResultList = null;
+				List<BidPrice> bidPriceListAll = bidPriceService.getTenderBidPriceList(projectRule.getTenderId());
 				List<BidPrice> bidPriceList = bidPriceService.getBidPriceFactorList(projectRule.getTenderId());
+				if(bidPriceListAll.size() == bidPriceList.size() && bidPriceList.size() == 1) {
+					success = bidPriceResultService.updateBidPriceResultOrSum(curBidPriceResult);
+					return;
+				}
 				//如果当前bidPrice是结构化的必然剩下一个含税或者不含税的，如果是非结构化的当前bidPrice为空，执行原有逻辑
 				if(bidPriceList != null && bidPriceList.size() > 0) {
 					bidStructPriceResultList = bidPriceResultService.getBidPriceResultTableList(projectRule.getTenderId(), supplier.getId());