开标校验招标人代表功能+报表数据bug修复+隐藏ai分析

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

@@ -240,8 +240,10 @@ public class FactorEvaluationComposite extends EvaluationView {
 	private Map<String,String> supplierNameMap = new HashMap<String,String>();
 	private Composite buttonComposite;
 	private TemplateTableListComposite templateTableListComposite;
-	private AiEvalLeftButton viewAI_btn;
+//	private AiEvalLeftButton viewAI_btn;
 	private ShowAiProcessShell showAiProcessShell;
+//	private ELink viewRiskSupplier_link;
+	private ViewRiskComposite viewRiskComposite;
 	
 	{
 		LogUtils.logClass(FactorEvaluationComposite.class);
@@ -388,40 +390,40 @@ public class FactorEvaluationComposite extends EvaluationView {
 		menuFunctionUtils.addFunction(moreTools, "EVALUATION_VIEW_MORE");
 		
 		
-		viewAI_btn = new AiEvalLeftButton(left_tool_composite, SWT.NONE,curTender);
-//		viewAI_btn.addFocusListener(new FocusAdapter() {
-//			@Override
-//			public void focusLost(FocusEvent e) {
-////				TODO
-//				if(null != showAiProcessShell && !showAiProcessShell.isDisposed()) {
-//					showAiProcessShell.close();
-//				}
-//				
-//			}
-//		});
-//		viewAI_btn.addMouseTrackListener(new MouseTrackAdapter() {
-//			@Override
-//			public void mouseEnter(MouseEvent e) {
-//				viewAiAction();
-//			}
-////
+//		viewAI_btn = new AiEvalLeftButton(left_tool_composite, SWT.NONE,curTender);
+////		viewAI_btn.addFocusListener(new FocusAdapter() {
 ////			@Override
-////			public void mouseExit(MouseEvent e) {
+////			public void focusLost(FocusEvent e) {
+//////				TODO
 ////				if(null != showAiProcessShell && !showAiProcessShell.isDisposed()) {
 ////					showAiProcessShell.close();
-//////					showAiProcessShell.dispose();
 ////				}
+////				
+////			}
+////		});
+////		viewAI_btn.addMouseTrackListener(new MouseTrackAdapter() {
+////			@Override
+////			public void mouseEnter(MouseEvent e) {
+////				viewAiAction();
 ////			}
-//			
+//////
+//////			@Override
+//////			public void mouseExit(MouseEvent e) {
+//////				if(null != showAiProcessShell && !showAiProcessShell.isDisposed()) {
+//////					showAiProcessShell.close();
+////////					showAiProcessShell.dispose();
+//////				}
+//////			}
+////			
+////		});
+//		viewAI_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/view.png"));
+//		viewAI_btn.setText("");
+//		viewAI_btn.setToolTipText("标书查重");
+//		viewAI_btn.addMouseListener(new MouseAdapter() {
+//			public void mouseUp(MouseEvent e) {
+//				viewAiAction();
+//			}
 //		});
-		viewAI_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/view.png"));
-		viewAI_btn.setText("");
-		viewAI_btn.setToolTipText("标书查重");
-		viewAI_btn.addMouseListener(new MouseAdapter() {
-			public void mouseUp(MouseEvent e) {
-				viewAiAction();
-			}
-		});
 //		viewAI_btn.setVisible(false);
 //		menuFunctionUtils.addFunction(viewAI_btn, "EVALUATION_VIEW_AI");
 		
@@ -469,6 +471,15 @@ public class FactorEvaluationComposite extends EvaluationView {
 		verFront.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true, 1, 1));
 		
 		
+//		viewRiskSupplier_link = new ELink(supplier_composite, SWT.NONE);
+//		viewRiskSupplier_link.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/view.png"));
+//		viewRiskSupplier_link.setText("查看供应商风险");
+//		viewRiskSupplier_link.addMouseListener(new MouseAdapter() {
+//			public void mouseUp(MouseEvent e) {
+//				viewRiskSupplierAction();
+//			}
+//		});
+//		menuFunctionUtils.addFunction(viewRiskSupplier_link, "VIEW_RISK");
 		viewCredit_link = new ELink(supplier_composite, SWT.NONE);
 		viewCredit_link.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/view.png"));
 		viewCredit_link.setText("查看征信");
@@ -477,7 +488,6 @@ public class FactorEvaluationComposite extends EvaluationView {
 				viewCreditAction();
 			}
 		});
-		
 //		ELink link = new ELink(supplier_composite, SWT.NONE);
 //		link.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/view.png"));
 //		link.setText("查看关联关系");
@@ -759,6 +769,8 @@ public class FactorEvaluationComposite extends EvaluationView {
 		
 		 templateTableListComposite = new TemplateTableListComposite(opinionComposite, SWT.NONE);
 		 
+		 viewRiskComposite = new ViewRiskComposite(opinionComposite, SWT.NONE);
+		
 		evaluation_talbe_composite = new Composite(evaluation_panel_composite, SWT.NONE);
 		evaluation_talbe_composite.setLayout(new FillLayout(SWT.HORIZONTAL));
 		evaluation_talbe_composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
@@ -864,6 +876,7 @@ public class FactorEvaluationComposite extends EvaluationView {
 		ImageButton fileButton = createShowButton(ShowType.FILE);
 //		ImageButton opinionButton = createShowButton(ShowType.OPINION);
 		ImageButton comparisonTableButton = createShowButton(ShowType.COMPARISON_TABLE);
+		ImageButton viewSupplierRiskBtn = createShowButton(ShowType.VIEW_SUPPLIER_RISK);
 //		ImageButton structButton = createShowButton(ShowType.STRUCT);
 
 		switch (showType) {
@@ -876,9 +889,9 @@ public class FactorEvaluationComposite extends EvaluationView {
 		case COMPARISON_TABLE:
 			curShowButton = comparisonTableButton;
 			break;
-//		case STRUCT:
-//			curShowButton = structButton;
-//			break;
+		case VIEW_SUPPLIER_RISK:
+			curShowButton = viewSupplierRiskBtn;
+			break;
 		}
 		curShowButton.setSelection(true);
 	}
@@ -1529,10 +1542,13 @@ public class FactorEvaluationComposite extends EvaluationView {
 				opinionStackLayout.topControl = templateTableListComposite;
 				templateTableListComposite.refresh(curTender.getId(), curEvaluationFactor.getFactorCode(), supplierList);
 				break;
-//			case STRUCT:
+			case VIEW_SUPPLIER_RISK:
+				
+				opinionStackLayout.topControl = viewRiskComposite;
+				viewRiskComposite.refresh(curTender);
 //				showStackLayout.topControl = structComposite;
 //				showStructTableAction();
-//				break;
+				break;
 		}
 		opinionComposite.layout();
 	}
@@ -2711,10 +2727,10 @@ public class FactorEvaluationComposite extends EvaluationView {
 		}else {
 			
 			
-			String progress = httpResponse.getDataParam("progress");
-			String waitTime = httpResponse.getDataParam("waitTime");
-			showAiProcessShell = new ShowAiProcessShell(getShell(), viewAI_btn,  ObjectUtils.getIntValue(progress, 0), waitTime);
-			showAiProcessShell.open();
+//			String progress = httpResponse.getDataParam("progress");
+//			String waitTime = httpResponse.getDataParam("waitTime");
+//			showAiProcessShell = new ShowAiProcessShell(getShell(), viewAI_btn,  ObjectUtils.getIntValue(progress, 0), waitTime);
+//			showAiProcessShell.open();
 //			ShowViewAiProcessDialog showViewAiProcessDialog = new ShowViewAiProcessDialog(getShell(), ObjectUtils.getIntValue(progress, 0), waitTime);
 //			showViewAiProcessDialog.open();
 //			callBackMsg(false, "获取下载地址失败！");
@@ -2733,8 +2749,8 @@ public class FactorEvaluationComposite extends EvaluationView {
 //				unZipFile(savePath, FileConstants.getBiddingFilePath(curTender.getId()));
 				Display.getDefault().syncExec(new Runnable() {
 					public void run() {
-						viewAI_btn.setVisible(true);
-						viewAI_btn.getParent().layout();
+//						viewAI_btn.setVisible(true);
+//						viewAI_btn.getParent().layout();
 //						viewAI_btn.setEnabled(true);
 					}
 				});
@@ -2747,6 +2763,13 @@ public class FactorEvaluationComposite extends EvaluationView {
 			
 		}
 	}
+	
+	/**
+	 * 查看风险供应商
+	 */
+	private void viewRiskSupplierAction() {
+//		TODO 
+	}
 	/**
 	 * 标书查重功能
 	 */

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

+package com.gx.obe.evaluation.step.composite;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+import com.gx.obe.components.core.Constants;
+import com.gx.obe.web.entity.tender.TenderProjectEntity;
+
+public class ViewRiskComposite extends Composite {
+
+	private Browser browser;
+
+	/**
+	 * Create the composite.
+	 * @param parent
+	 * @param style
+	 */
+	public ViewRiskComposite(Composite parent, int style) {
+		super(parent, style);
+		setLayout(new GridLayout(1, false));
+		
+		browser = new Browser(this, SWT.NONE);
+		browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Disable the check that prevents subclassing of SWT components
+	}
+	public void refresh(TenderProjectEntity tenderProject) {
+//		https://test.powerbeijing-ec.com/jndzzb/tBSupplierRatingLevelController.do?getSupplierRatingLevelByStageId&stageId=2c9080228fc20b3b018fc298d5a300ad
+		String url = Constants.getPlatformUrl("tBSupplierRatingLevelController.do?getSupplierRatingLevelByStageId&stageId=" + tenderProject.getStageId());
+		browser.setUrl(url);
+	}
+}

BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/ViewRiskSupplierDialog.java

+package com.gx.obe.evaluation.step.dialog;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.nebula.widgets.grid.Grid;
+import org.eclipse.nebula.widgets.grid.GridColumn;
+import org.eclipse.nebula.widgets.grid.GridItem;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.core.CallBack;
+import org.eclipse.swt.core.ImageResolver;
+import org.eclipse.swt.core.MessageDialog;
+import org.eclipse.swt.core.calendar.CalendarUtil;
+import org.eclipse.swt.core.listener.LoadingAdatper;
+import org.eclipse.swt.core.listener.PaintImageListener;
+import org.eclipse.swt.core.utils.GridUtils;
+import org.eclipse.swt.core.utils.WidgetUtils;
+import org.eclipse.swt.core.widgets.EButton;
+import org.eclipse.swt.core.widgets.EDialog;
+import org.eclipse.swt.core.widgets.ELink;
+import org.eclipse.swt.core.widgets.ESepator;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+import com.gx.obe.ColorConstants;
+import com.gx.obe.business.entity.BidPriceRound;
+import com.gx.obe.business.entity.MenuFunction;
+import com.gx.obe.common.icons.IconsActivator;
+import com.gx.obe.common.widget.dialog.BidPriceItemDialog;
+import com.gx.obe.common.widget.shell.ProgressMessageDialog;
+import com.gx.obe.common.widget.thread.SyncThread;
+import com.gx.obe.common.widget.utils.MenuFunctionUtils;
+import com.gx.obe.components.core.Constants;
+import com.gx.obe.components.core.enumeration.BidPriceEnum;
+import com.gx.obe.config.ConfigConstants;
+import com.gx.obe.config.utils.PropertiesUtils;
+import com.gx.obe.evaluation.step.thread.ApplyReBidPriceThread;
+import com.gx.obe.message.Messages;
+import com.gx.obe.util.utils.DateUtils;
+import com.gx.obe.util.utils.LogUtils;
+import com.gx.obe.util.utils.NumericChineseUtils;
+import com.gx.obe.util.utils.ObjectUtils;
+import com.gx.obe.web.entity.Supplier;
+import com.gx.obe.web.entity.evaluation.EvaluationStep;
+import com.gx.obe.web.entity.price.BidPrice;
+import com.gx.obe.web.entity.tender.TenderProjectEntity;
+import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
+import com.gx.obe.web.service.BidPriceService;
+import com.gx.obe.web.service.SupplierService;
+import com.gx.utils.NowTimeUtils;
+import com.report.util.FreemarkerUtil;
+import com.swtdesigner.ResourceManager;
+import com.swtdesigner.SWTResourceManager;
+
+/**
+ * @Description: 启动新一轮报价
+ * @author wangxiang
+ */
+public class ViewRiskSupplierDialog extends EDialog {
+	private EButton save_btn;
+	private ImageResolver imageResolver = new ImageResolver();
+	private SupplierService supplierService = new SupplierService();
+	private BidPriceService bidPriceService ;
+	private TenderProjectEntity tenderProjectEntity;
+	private Text stepMemoText;
+	private Composite composite;
+	private CLabel roundLabel;
+	private Text timeText;
+	private CallBack addCallBack;
+	private Text roundName;
+	private TenderProjectRuleEntity tenderProjectRuleEntity;
+	private ELink addBidPriceItemBtn;
+	private ELink delBidPriceItemBtn;
+	private int newRound;
+	private Grid itemListGrid;
+	private List<BidPrice> bidPriceList;
+	private int selectionIndex = 0;
+	private BidPrice curBidPrice;
+	private int intervalsTime;
+	private MenuFunctionUtils menuFunctionUtils;
+	private Grid supplierGrid;
+	private List<Supplier> supplierList;
+	private EvaluationStep evaluationStep;
+	{
+		LogUtils.logClass(ViewRiskSupplierDialog.class);
+	}
+
+	/**
+	 * Create the dialog.
+	 * @param parentShell
+	 */
+	public ViewRiskSupplierDialog(Shell parentShell, TenderProjectEntity tenderProjectEntity,TenderProjectRuleEntity tenderProjectRuleEntity, int newRound, MenuFunctionUtils menuFunctionUtils,EvaluationStep evaluationStep, CallBack callBack) {
+		super(parentShell);
+		setTitle("查看供应商风险信息");
+		this.tenderProjectEntity = tenderProjectEntity;
+		this.tenderProjectRuleEntity = tenderProjectRuleEntity;
+		this.menuFunctionUtils = menuFunctionUtils;
+		this.newRound = newRound;
+		this.addCallBack = callBack;
+		this.evaluationStep = evaluationStep;
+	}
+
+	/**
+	 * Create contents of the dialog.
+	 * @param parent
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite topContainer = (Composite) super.createDialogArea(parent);
+		topContainer.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				imageResolver.disposite();
+			}
+		});
+		
+		return topContainer;
+	}
+
+	/**
+	 * @Description: 初始化
+	 * @author guoyr
+	 */
+	private void init(){
+		
+	}
+	
+	private void refreshSupplierList() {
+ 		
+	
+	}
+	
+	
+	
+	/**
+	 * @Description: 取消
+	 * @author guoyr
+	 */
+	private void cancelAction(){
+		this.getShell().close();
+	}
+
+	public CallBack getCallBack() {
+		return addCallBack;
+	}
+
+	public void setCallBack(CallBack callBack) {
+		this.addCallBack = callBack;
+	}
+
+	/**
+	 * Return the initial size of the dialog.
+	 */
+	@Override
+	protected Point getInitialSize() {
+		return new Point(650, 400);
+	}
+}

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

@@ -1770,7 +1770,7 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 					evalFactorResult = supplierEvaluationFactorResultMap.get(supplier.getId()).get(evaluationFactor.getId());
 				}
 				
-				if(null != colContent && StringUtils.isNotEmpty(colContent.get(col).toString())) {
+				if(null != colContent  && null != colContent.get(col) && StringUtils.isNotEmpty(colContent.get(col).toString())) {
 					evaluationButton.setEnabled(!EVAL_ACCESSMENT_YES.equals(colContent.get(col).toString()));
 					//重绘控件，控件刷新具有滞后性
 					evaluationButton.redraw();

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

@@ -787,7 +787,7 @@ public class ExpertSignEvaluationComposite extends Composite {
 				httpUrl.setAttribute("stageType", "");
 				httpUrl.setAttribute("stageId", tenderProject.getStageId());
 				httpUrl.setAttribute("tenderNoNumber", tenderProject.getTenderNumber());
-				httpUrl.setAttribute("dateTime", NowTimeUtils.getDateTime());
+//				httpUrl.setAttribute("dateTime", NowTimeUtils.getDateTime());
 				httpUrl.setAttribute("jianduren", jiandurenBuffer.toString());
 				httpUrl.setAttribute("zhaobrdb", biddingBuffer.toString());
 				

BID-EVALUATION/src/com/gx/obe/evaluation/MainDialog.java

@@ -150,7 +150,7 @@ public class MainDialog implements ActionListener{
 				shellResizedAction();
 			}
 		});
-		shell.setText(Messages.Terminal_evaluation);
+		shell.setText(Messages.COMPANY_NAME + "-" +Messages.Terminal_evaluation);
 		shell.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/evaluation-ico.png"));
 //		shell.setBackgroundImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID,"icons/login/bg.jpg"));
 		top_composite = new Composite(shell, SWT.NONE);
@@ -169,8 +169,9 @@ public class MainDialog implements ActionListener{
 		product_title.setLayoutData(gd_product_title);
 		product_title.setFont(SWTResourceManager.getFont("微软雅黑", 13, SWT.BOLD));
 		product_title.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
-		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/logo.png"));
-		product_title.setText(Messages.Terminal_evaluation);
+//		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/logo.png"));
+		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/45.png"));
+		product_title.setText(Messages.COMPANY_NAME + "-" +Messages.Terminal_evaluation);
 		
 		menu_composite = new Composite(top_composite, SWT.NONE);
 		menu_composite.setLayout(new RowLayout(SWT.HORIZONTAL));

BID-OPENING/src/com/gx/obe/opening/MainDialog.java

@@ -112,7 +112,7 @@ public class MainDialog implements ActionListener{
 				shellResizedAction();
 			}
 		});
-		shell.setText(Messages.Terminal_bidopening);
+		shell.setText(Messages.COMPANY_NAME + "-" + Messages.Terminal_bidopening);
 		shell.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/opening-ico.png"));
 //		shell.setBackgroundImage(ResourceManager.getPluginImage(SWTCoreActivator.PLUGIN_ID,"icons/login/bg.jpg"));
 		top_composite = new Composite(shell, SWT.NONE);
@@ -128,9 +128,9 @@ public class MainDialog implements ActionListener{
 		product_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
 		product_title.setFont(SWTResourceManager.getFont("微软雅黑", 13, SWT.BOLD));
 		product_title.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
-		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/logo.png"));
-		product_title.setText(Messages.Terminal_bidopening);
-		
+//		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/logo.png"));
+		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/45.png"));
+		product_title.setText(	Messages.COMPANY_NAME + "-" + Messages.Terminal_bidopening);
 		menu_composite = new Composite(top_composite, SWT.NONE);
 		RowLayout rl_menu_composite = new RowLayout(SWT.HORIZONTAL);
 		rl_menu_composite.fill = true;

BID-OPENING/src/com/gx/obe/opening/composite/BidOpeningRemoteComposite.java

@@ -103,6 +103,7 @@ import com.gx.obe.util.utils.StringUtils;
 import com.gx.obe.web.entity.Page;
 import com.gx.obe.web.entity.Supplier;
 import com.gx.obe.web.entity.SupplierOpeningResult;
+import com.gx.obe.web.entity.expert.Expert;
 import com.gx.obe.web.entity.tender.TenderProjectEntity;
 import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
 import com.gx.obe.web.service.ProjectRuleService;
@@ -110,6 +111,7 @@ import com.gx.obe.web.service.SupplierService;
 import com.gx.obe.web.service.TenderProjectService;
 import com.gx.obe.web.service.WorkerService;
 import com.gx.obe.web.service.evaluation.EvaluationStepService;
+import com.gx.obe.web.service.expert.ExpertService;
 import com.gx.obe.web.vo.TenderPackOpeningInfo;
 import com.gx.security.NowTimeUtils;
 import com.gx.utils.ActionLogUtils;
@@ -197,6 +199,7 @@ public class BidOpeningRemoteComposite extends OpeningTimeComposite implements S
 	private RoomOperatorButton startMeetingBtn;
 	private String publicType = "01";// 公开类型：默认或01为公开，02：不公开
 	private WorkerService workerService = new WorkerService();
+	private ExpertService expertService = new ExpertService();
 	/**
 	 * Create the composite.
 	 * @param parent
@@ -1765,7 +1768,20 @@ public class BidOpeningRemoteComposite extends OpeningTimeComposite implements S
 		}
 		List<Worker> workerList = workerService.getWorkerList(false,curTenderPack.getId(), ExpertEnum.MONITOR);
 		if(null == workerList || workerList.size() < 1) {
-			MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表及监督人！");//(getShell(), message.toString());
+			MessageDialog.openError(getShell(), "请先在评标管理中设置监督人！");//(getShell(), message.toString());
+			return false;
+		}
+		List<Expert> expertList= expertService.getExpertListByTenderId(curTenderPack.getId());
+		if(null != expertList && expertList.size() > 0) {
+			for(Expert expert : expertList) {
+				if(ExpertEnum.BIDDING.equals(expert.getExpertType())) {
+					break;
+				}
+				MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
+				return false;
+			}
+		}else {
+			MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
 			return false;
 		}
 //		if(!CommonEnum.YES.equals(curTenderPack.getLatestBidinfo())){//强制在解密时同步

BID-OPENING/src/com/gx/obe/opening/dialog/BatchRemoteBidOpeningDialog.java

@@ -44,9 +44,11 @@ import com.gx.obe.components.core.enumeration.CommonEnum;
 import com.gx.obe.components.core.enumeration.TenderProjectEnum;
 import com.gx.obe.config.utils.PropertiesUtils;
 import com.gx.obe.message.Messages;
+import com.gx.obe.web.entity.expert.Expert;
 import com.gx.obe.web.entity.tender.TenderProjectEntity;
 import com.gx.obe.web.service.TenderProjectService;
 import com.gx.obe.web.service.WorkerService;
+import com.gx.obe.web.service.expert.ExpertService;
 import com.gx.obe.web.vo.TenderPackOpeningInfo;
 import com.swtdesigner.ResourceManager;
 import com.swtdesigner.SWTResourceManager;
@@ -79,6 +81,7 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
 	private ELink selectionAllEffectiveBtn;
 	private boolean anonymousAllInfo = false;
 	private WorkerService workerService = new WorkerService();
+	private ExpertService expertService = new ExpertService();
 
 	/**
 	 * Create the dialog.
@@ -602,10 +605,26 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
 			for(TenderProjectEntity tenderProject: tenderPackList ) {
 				List<Worker> workerList = workerService.getWorkerList(false,tenderProject.getId(), ExpertEnum.MONITOR);
 				if(null == workerList || workerList.size() < 1) {
-					MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表及监督人！");//(getShell(), message.toString());
+					MessageDialog.openError(getShell(), "请先在评标管理中设置监督人！");//(getShell(), message.toString());
 					tenderPackList.clear();
 					return;
 				}
+				
+				List<Expert> expertList= expertService.getExpertListByTenderId(tenderProject.getId());
+				if(null != expertList && expertList.size() > 0) {
+					for(Expert expert : expertList) {
+						if(ExpertEnum.BIDDING.equals(expert.getExpertType())) {
+							break;
+						}
+						MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
+						tenderPackList.clear();
+						return ;
+					}
+				}else {
+					MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
+					tenderPackList.clear();
+					return ;
+				}
 			}
 			if(isFocus){
 				StringBuilder msg = new StringBuilder();

OBE-BUSINESS/src/com/gx/obe/WebserviceConstants.java

@@ -446,6 +446,10 @@ public class WebserviceConstants {
 		 * 二次校验
 		 */
 		public static final String TWO_VIRIF = "userHS.do?checkEncryptionInfo";
+		/**
+		 * 查看供应商风险等级
+		 */
+		public static final String GET_RISK_SUPPLIER_LIST_METHOD = "getRiskSupplierList.method";
 		
 
 }

OBE-COMPONENTS-CORE/src/com/gx/obe/components/core/enumeration/ShowType.java

@@ -10,7 +10,8 @@ public enum ShowType {
 	
 	OPINION("opinion", "查看评议意见"),
 	
-	COMPARISON_TABLE("comparisonTable", "查看对比表");
+	COMPARISON_TABLE("comparisonTable", "查看对比表"),
+	VIEW_SUPPLIER_RISK("viewSupplierRisk", "查看供应商风险");
 	
 //	STRUCT("struct", "查看结构化数据");
 	

OBE-COMPONENTS-MESSAGES/bin/com/gx/obe/message/messages.properties

 #Eclipse modern messages class
-#Tue Apr 16 13:51:53 CST 2024
+#Thu Jun 27 13:12:08 CST 2024
 About=\u5173\u4E8E
 AboutAttachment=\u76F8\u5173\u9644\u4EF6
 AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
@@ -55,6 +55,7 @@ BidBond=\u6295\u6807\u4FDD\u8BC1\u91D1
 BidDocument=\u6807\u4E66
 BidEvaluation=\u8BC4\u6807
 BidEvaluationResult=\u8BC4\u6807\u7ED3\u679C
+BidExplainPrice=\u6295\u6807\u62A5\u4EF7\u8BA1\u7B97\u65B9\u6CD5
 BidFile=\u6295\u6807\u6587\u4EF6
 BidFileComments=\u6E05\u6807\u610F\u89C1
 BidFileSelfComment=\u81EA\u8BC4\u610F\u89C1
@@ -597,10 +598,9 @@ EvalEndTime=\u8BC4\u6807\u7ED3\u675F\u65F6\u95F4
 EvalExpert=\u8BC4\u6807\u4E13\u5BB6
 EvalExplain=\u8BC4\u5BA1\u8BF4\u660E
 EvalExplainPrice=\u8BC4\u6807\u57FA\u51C6\u4EF7\u8BA1\u7B97\u65B9\u6CD5
-BidExplainPrice=\u6295\u6807\u62A5\u4EF7\u8BA1\u7B97\u65B9\u6CD5
 EvalFactor=\u8BC4\u5BA1\u6307\u6807
 EvalGroup=\u8BC4\u5BA1\u5355\u5143
-EvalManage=\u8BC4\u6807\u7BA1\u7406
+EvalManage=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3-\u8BC4\u6807\u7BA1\u7406
 EvalMember=\u8BC4\u6807\u5C0F\u7EC4
 EvalMethod=\u8BC4\u6807\u529E\u6CD5
 EvalOptions=\u8BC4\u5BA1\u9009\u9879
@@ -821,6 +821,7 @@ Machine=\u673A\u4F4D
 MachineIp=\u673A\u4F4DIP
 MachineMark=\u673A\u4F4D\u6807\u8BC6\u7801
 MachineName=\u673A\u4F4D\u540D\u79F0
+MainDialog_btnNewButton_text=New Button
 MainDialog_myProject=\u6211\u7684\u9879\u76EE 
 MainDialog_policyLaw=\u6CD5\u5F8B\u6CD5\u89C4 
 Male=\u7537
@@ -1846,3 +1847,4 @@ Yes=\u662F
 You=\u60A8
 ZipCode=\u90AE\u653F\u7F16\u7801
 ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
+COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3

OBE-COMPONENTS-MESSAGES/bin/com/gx/obe/message/messages_zh_CN.properties

@@ -1909,3 +1909,4 @@ ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
 LoginDialog_label_1_text=\u4F9B\u5E94\u5546\u540D\u79F0
 LoginDialog_label_30_text=\u5F53\u524D\u6307\u6807\u672A\u7ED1\u5B9A\u8BC4\u5BA1\u70B9
 LoginDialog_label_27_text=\u5408\u540C\u4EF7\u683C(\u4E07\u5143)
+COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3

OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/Messages.java

@@ -1933,6 +1933,8 @@ public class Messages extends NLS {
 	public static String FileDownloadShell2_label_15_text;
 	public static String ShowViewAiProcessDialog_lblNewLabel_text;
 	public static String ShowAiProcessShell_lblNewLabel_4_text;
+	public static String MainDialog_btnNewButton_text;
+	public static String COMPANY_NAME;
 	
 	
 	static {

OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/messages.properties

 #Eclipse modern messages class
-#Tue Apr 16 13:51:53 CST 2024
+#Thu Jun 27 13:12:08 CST 2024
 About=\u5173\u4E8E
 AboutAttachment=\u76F8\u5173\u9644\u4EF6
 AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
@@ -55,6 +55,7 @@ BidBond=\u6295\u6807\u4FDD\u8BC1\u91D1
 BidDocument=\u6807\u4E66
 BidEvaluation=\u8BC4\u6807
 BidEvaluationResult=\u8BC4\u6807\u7ED3\u679C
+BidExplainPrice=\u6295\u6807\u62A5\u4EF7\u8BA1\u7B97\u65B9\u6CD5
 BidFile=\u6295\u6807\u6587\u4EF6
 BidFileComments=\u6E05\u6807\u610F\u89C1
 BidFileSelfComment=\u81EA\u8BC4\u610F\u89C1
@@ -597,10 +598,9 @@ EvalEndTime=\u8BC4\u6807\u7ED3\u675F\u65F6\u95F4
 EvalExpert=\u8BC4\u6807\u4E13\u5BB6
 EvalExplain=\u8BC4\u5BA1\u8BF4\u660E
 EvalExplainPrice=\u8BC4\u6807\u57FA\u51C6\u4EF7\u8BA1\u7B97\u65B9\u6CD5
-BidExplainPrice=\u6295\u6807\u62A5\u4EF7\u8BA1\u7B97\u65B9\u6CD5
 EvalFactor=\u8BC4\u5BA1\u6307\u6807
 EvalGroup=\u8BC4\u5BA1\u5355\u5143
-EvalManage=\u8BC4\u6807\u7BA1\u7406
+EvalManage=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3-\u8BC4\u6807\u7BA1\u7406
 EvalMember=\u8BC4\u6807\u5C0F\u7EC4
 EvalMethod=\u8BC4\u6807\u529E\u6CD5
 EvalOptions=\u8BC4\u5BA1\u9009\u9879
@@ -821,6 +821,7 @@ Machine=\u673A\u4F4D
 MachineIp=\u673A\u4F4DIP
 MachineMark=\u673A\u4F4D\u6807\u8BC6\u7801
 MachineName=\u673A\u4F4D\u540D\u79F0
+MainDialog_btnNewButton_text=New Button
 MainDialog_myProject=\u6211\u7684\u9879\u76EE 
 MainDialog_policyLaw=\u6CD5\u5F8B\u6CD5\u89C4 
 Male=\u7537
@@ -1846,3 +1847,4 @@ Yes=\u662F
 You=\u60A8
 ZipCode=\u90AE\u653F\u7F16\u7801
 ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
+COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3

OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/messages_zh_CN.properties

@@ -1909,3 +1909,4 @@ ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
 LoginDialog_label_1_text=\u4F9B\u5E94\u5546\u540D\u79F0
 LoginDialog_label_30_text=\u5F53\u524D\u6307\u6807\u672A\u7ED1\u5B9A\u8BC4\u5BA1\u70B9
 LoginDialog_label_27_text=\u5408\u540C\u4EF7\u683C(\u4E07\u5143)
+COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3

OBE-CONFIG/config.properties

-#\u7cfb\u7edf\u7248\u672c
-version=OBEV7.7.9.20240507
-copyright=\u5317\u4eac\u56fd\u4fe1\u521b\u65b0\u79d1\u6280\u80a1\u4efd\u6709\u9650\u516c\u53f8
-#\u6280\u672f\u652f\u6301\:\u5317\u4eac\u56fd\u4fe1\u521b\u65b0\u79d1\u6280\u80a1\u4efd\u6709\u9650\u516c\u53f8
-technicalSupport=gx
-keyCharacter=
-#\u5e73\u53f0\u540d\u79f0
-serverName=\u7269\u4e1a\u884c\u4e1a\u7535\u5b50\u62db\u6807\u91c7\u8d2d\u5e73\u53f0
-#\u670d\u52a1\u5668\u7f16\u7801(\u521b\u65b0GXTService;\u5185\u8499InnerMongoliaService;\u5927\u5510DaTangService)
-netService=QYWYService
-serverUrl=http://cpt.24home.net/wyzbdzzb/
-#\u89e3\u5bc6\u65b9\u5f0f00:\u672c\u5730\u89e3\u5bc6;01:\u81ea\u52a9\u89e3\u5bc6;11:\u8fdc\u7a0b\u89e3\u5bc6;21:\u96c6\u4e2d\u89e3\u5bc6
-decryptType=11
-#\u4e0b\u8f7d\u9879\u76ee\u65f6\u662f\u663e\u793a\u9009\u62e9\u7528\u6237\u89d2\u8272
-showOperatorRoleType=00
-#\u9879\u76ee\u7ecf\u7406\u7aef\u9a8c\u8bc1\u8bc4\u6807\u673a\u4f4d
-verifyEvalMachineManager=00
-#\u4e13\u5bb6\u7aef\u9a8c\u8bc1\u8bc4\u6807\u673a\u4f4d
-verifyEvalMachineExpert=00
-#\u4f7f\u7528\u516c\u5171\u6570\u636e\u5e93
-usePublicDb=01
-#\u8bc4\u6807\u7ba1\u7406\u7aef\u4e0b\u8f7d\u9879\u76ee\u7684\u622a\u6b62\u65f6\u95f4
-evaluationDownEndDays=30
-#\u5f00\u6807\u7ba1\u7406\u7aef\u4e0b\u8f7d\u9879\u76ee\u7684\u622a\u6b62\u65f6\u95f4
-openingDownEndDays=30
-#\u7cfb\u7edf\u5f53\u524d\u4f7f\u7528\u7684ca:BJCA;TianWeiCA;TianWeiCA_1.0
-caEngine=TianWeiCA_1.0
-#pdf\u63a7\u4ef6\u7c7b\u578b
-pdfActiveType=JinGe
-#\u7b7e\u7ae0\u5de5\u5177
-signaturePdf=JinGe
-#BJCAPDF:\u5317\u4eacCA\u624b\u5199\u677f;BJCASaoma:\u5317\u4eacCA\u626b\u7801\u7b7e\u5b57
-handSignaturePdf=
-#\u4e0d\u8db3\u4e09\u5bb6\u4e0d\u5141\u8bb8\u5f00\u6807
-lessThanThreeFilter=
-#\u5141\u8bb8\u5bfc\u5165\u6807\u4e66
-allowImportBidFile=
-#\u8bc4\u6807\u4e13\u5bb6\u4eba\u6570\u9650\u5236
-expertLimit=
-#\u662f\u5426\u667a\u80fd\u8bc4\u5ba1\uff08\u76ee\u524d\u53ea\u6709\u5185\u8499\u9700\u8981\u8be5\u529f\u80fd\uff09
-isAIEvaluation=00
-#\u9ed8\u8ba4\u63a8\u8350\u5bb6\u6570\uff0c\u9ed8\u8ba43\u5bb6\uff08\u4e2d\u7535\u5efa\u662f2\u5bb6\uff09
-defaultRecommonedCount=
-#\u5b8c\u6210\u5f00\u6807\u65f6\uff0c\u662f\u5426\u9700\u8981\u5148\u505c\u6b62\uff08\u76ee\u524d\u53ea\u6709\u5185\u8499\u5e73\u53f0\u652f\u6301\u8be5\u529f\u80fd\uff09
-needStopBidopeningFirst=00
-#\u8bc4\u6807\u7ed3\u679c\u4e2d\u663e\u793a\u4e0a\u62a5\u6750\u6599\uff08\u5927\u5510\uff09
-showUploadMaterial=00
-#\u8bc4\u6807\u754c\u9762\u9ed8\u8ba4\u52a0\u8f7d\u610f\u89c1\uff08\u53ea\u6709\u4e2d\u7535\u5efa\u4f7f\u7528\uff09
-isShowFactorOpinion=00
-#\u4e13\u5bb6\u7ec4\u957f\u5728\u8bc4\u6807\u8fc7\u7a0b\u4e2d\u53ef\u4ee5\u67e5\u770b\u8bc4\u6807\u7ed3\u679c
-viewStepSummaryResult=00
-#\u5f53\u524d\u8bc4\u6807\u6b65\u9aa4\u8bc4\u5ba1\u5b8c\u662f\u5426\u53ef\u4ee5\u67e5\u770b\u6c47\u603b\u7ed3\u679c
-viewEvaluationResult=01
-#\u662f\u5426\u53ef\u4ee5\u67e5\u770b\u6211\u7684\u6c47\u603b\u7ed3\u679c
-viewMySummaryResult=01
-#\u6587\u4ef6\u63a5\u6536\u5730\u5740
-bidFilePath=c:\\bidFile
-#\u6a21\u677f\u5b58\u653e\u7684\u8def\u5f84
-template=c:\\template
-#\u6309\u8bc4\u6807\u5ba4\u5206\u9879\u76ee
+#update
+#Mon Jul 15 16:12:06 CST 2024
 groupByEvalBidRoom=00
-#\u5f53\u524d\u8bc4\u6807\u5ba4id
-evalBidRoomId=aadd606ff7c1445184b9ad780c5feb60
-#\u662f\u5426\u4f7f\u7528\u673a\u4f4d
-useMachineLock=01
-#CA\u767b\u5f55
-caLogin=00
-#\u4f7f\u7528\u81ea\u5b9a\u4e49CA\u767b\u5f55\u7a97\u53e3
-useVerifyUkeyPin=00
-#\u4e13\u5bb6\u7b7e\u7ae0
-expertSign=01
-#\u7f13\u5b585\u5bb6\u4f9b\u5e94\u5546\u7684\u6807\u4e66\u6587\u4ef6
-bidFileCacheCount=5
-#\u4e13\u5bb6\u9ed8\u8ba4\u5bc6\u7801
-defaultPassword=1
-#\u8f85\u52a9\u5f00\u6807\u5de5\u5177
-assistBidopening=00
-#\u5f53\u524d\u65f6\u95f4\u6765\u6e90(00:\u6570\u636e\u5e93\u670d\u52a1\u5668\u65f6\u95f401:\u65f6\u95f4\u6233\u670d\u52a1\u5668\u65f6\u95f4)
-nowTypeType=01
-#\u5927\u5199\u91d1\u989d\u524d\u9762\u7684\u524d\u7f00
-moneyCnPrefix=\u4eba\u6c11\u5e01
-#\u8bc4\u5ba1\u754c\u9762\u7684\u6307\u6807\u662f\u5426\u6a2a\u8f74
-factorIsHorizontal=01
-#\u672a\u5230\u5f00\u6807\u65f6\u95f4\u533f\u540d\u663e\u793a\u4f9b\u5e94\u5546\u4fe1\u606f
-anonymous=00
-#\u91d1\u989d\u5355\u4f4d[00\uff1a\u5143\uff1b01\uff1a\u4e07\u5143]
-priceUint=01
-#\u5728\u5f00\u6807\u754c\u9762\u662f\u5426\u9690\u85cf\u5df2\u5e9f\u6807\u4f9b\u5e94\u5546
-hideRevokeSupplier=00
-#\u8bbe\u7f6e\u8bc4\u5ba1\u4e13\u5bb6\u5728\u8bc4\u6807\u7ed3\u675f\u524d\uff0c\u662f\u5426\u5141\u8bb8\u67e5\u770b\u4f9b\u5e94\u5546\u7684\u6295\u6807\u62a5\u4ef7
-viewTenderPrice=01
-#\u8bbe\u7f6e\u8bc4\u5ba1\u4e13\u5bb6\u5728\u8bc4\u6807\u7ed3\u675f\u524d\uff0c\u662f\u5426\u5141\u8bb8\u67e5\u770b\u4f9b\u5e94\u5546\u7684\u4ef7\u683c\u5f97\u5206
-viewPriceScore=01
-#\u5531\u6807\u8bed\u97f3(TTS)\u63a5\u53e3
-tts=MicrosoftTTS
-#\u5531\u6807\u8bed\u901f
-speed=0
-#\u5531\u6807\u97f3\u91cf
-volume=100
-#\u5531\u6807\u65f6\u8fc7\u6ee4\u7684\u5b57\u7b26
-filterChar=(\: ,)\: ,\uff08\: ,\uff09\: ,/\:\u659c\u6760,\\\:\u659c\u6760,-\:\u6760,*\:\u6210,&\:\u4e0e
-#\u5531\u6807\u65f6\u8fc7\u6ee4\u62ec\u53f7\u5185\u5bb9
-filterBracketContent=01
-#\u5531\u6807\u65f6\u5531\u9879\u76ee\u6216\u5206\u5305\u7684\u6216\u79f0
-singTenderName=00
-#\u62a5\u8868\u662f\u5426pdf
 pdfReport=00
-rebackEvaluation=01
-controlBidOpening=01
-#\u4f7f\u7528\u6444\u50cf\u5934(01\uff1a\u542f\u7528\uff1b02\uff1a\u7981\u7528)
-useCamera=01
-#\u89c6\u9891\u76d1\u63a7\u63a5\u53e3
-video=JmfVideo
-#\u89c6\u9891IP\u5730\u5740
+newCharsetName=ISO-8859-1
+anonymous=00
+livingType=00
+expertLimit=
+handSignaturePdf=BJCAHANDPDF
+videoLiveUrl=
+templateUpdateTime=2024-07-15 16\:11\:50
+defaultPassword=1
 videoIp=192.168.3.40
-#\u89c6\u9891\u7aef\u53e3
-videoPort=8000
-#\u5531\u6807\u65f6\u662f\u5426\u663e\u793a\u6807\u4e66\u5bc6\u5c01\u60c5\u51b5
-sealSituation=01
-#\u6697\u6807\u7f16\u7801\u7684\u957f\u5ea6
-darkCodeLenth=20
-#ftpIP
-ftpIp=
-ftpPort=21
 ftpUsername=anonymous
-ftpPassword=
-#\u9879\u76ee\u5217\u8868\u5206\u9875\u6570
-projectPageSize=5
-#\u538b\u7f29\u548c\u89e3\u5bc6\u7f16\u7801
-zipEncoding=GBK
-ftpBuffersize=1024
-preEvalResourceId=ef5a43a3cba4432fb18c205e0c4b792c
-evalManagerResourceId=31f99c485c334eb380f48d061201da2c
-companyLink=
-companyWbLink=
-excelRowStart=2
-excelColumnStart=0
-#\u89c6\u9891\u76f4\u64ad\u8def\u5f84(\u5916\u7f51:219.239.33.91\u5185\u7f51:172.16.7.36;\u4e91\u670d\u52a1:rtmp://60.205.181.176/trans/)
+speed=0
+caLogin=00
+billType=bill_yt
+tenderPackRowNum=8
+handSignType=0
+oldCharsetName=UTF-8
+rebackEvaluation=01
+evaluationDownEndDays=30
+factorIsHorizontal=01
+verifyEvalMachineManager=00
 livingAddress=
-#\u5f00\u6807\u754c\u9762\u4f9b\u5e94\u5546\u6837\u5f0f00:\u5355\u884c\u663e\u793a;01:\u591a\u884c\u663e\u793a
-bidOpeningSupplierSytle=01
-#\u76f4\u64ad\u5730\u5740
-videoLiveUrl=
-#\u76f4\u64ad\u684c\u9762\u5730\u5740
 videoDeskLiveUrl=
-#00:\u56fd\u4fe1\u76f4\u64ad\u63a7\u4ef6\uff0c01:\u98de\u5229\u4fe1\u76f4\u64ad\u63a7\u4ef6
-livingType=00
-#\u662f\u5426\u4f7f\u7528\u81ea\u52a8\u5bfc\u5165\u5de5\u7a0b\u91cf\u6e05\u5355\u300200\uff1a\u4e0d\u4f7f\u7528\uff0c01\uff1a\u4f7f\u7528
+decryptType=11
+isShowFactorOpinion=00
+filterChar=(\: ,)\: ,\uFF08\: ,\uFF09\: ,/\:\u659C\u6760,\\\:\u659C\u6760,-\:\u6760,*\:\u6210,&\:\u4E0E
+zipEncoding=GBK
+isAIEvaluation=00
 isUseAutomaticAnalysisBillOfQuantities=00
-#\u4fe1\u624b\u4e66\u7b7e\u540d\u670d\u52a1\u7c7b\u578b\uff0c0:\u4fe1\u624b\u4e66\u670d\u52a1\u5668; 1\u4e91\u7b7e\u540d
-handSignType=0
-#\u7b7e\u5b57\u5bbd\u5ea6
-signWidth=80
-#\u7b7e\u5b57\u9ad8\u5ea6
-signHeight=35
-#\u6309\u9879\u76ee\u5f00\u6807\u754c\u9762\u4e2d\u663e\u793a\u5305\u4ef6\u7684\u884c\u6570
-tenderPackRowNum=8
-#\u5f00\u6807\u754c\u9762\u4e2d\u662f\u5426\u663e\u793a\u786e\u8ba4\u72b6\u6001
+version=OBEV7.7.9.20240715
 showConfirmStatus=00
-#\u5f00\u6807\u754c\u9762\u5168\u5c4f\u663e\u793a
-bidOpeningFullscreen=00
-#\u8bc4\u6807\u662f\u4f7f\u7528\u4e13\u7528pdf\u63a7\u4ef6
+ftpPort=21
+serverName=\u5317\u4EAC\u4EAC\u80FD\u7535\u5B50\u62DB\u6807\u5E73\u53F0
+singTenderName=00
 useSpecialPdf=01
-#\u6307\u7eb9\u548c\u624b\u5199\u56fe\u5408\u5e76\u7c7b\u578b \u8fd9\u91cc\u8bbe\u59070\u8868\u793a\u6ca1\u6709\u6307\u7eb9   1\uff0c2\uff0c3\uff0c4\uff0c5\u5206\u522b\u8868\u793a\u6307\u7eb9\u5728\u624b\u5199\u7684\u4e0a\u3001\u4e0b\u3001\u5de6\u3001\u53f3\u3001\u4e2d\uff0c\u4e2d\u8868\u793a\u91cd\u53e0, \u9ed8\u8ba4\u4e3a5
+netService=JNJTService
+useCamera=01
+serverUrl=https\://www.powerbeijing-ec.com/jndzzb/
+companyWbLink=
+controlBidOpening=01
+GuoXinPDFReaderLicense=MjAyMSwxMiwyMiwyOTk5LDMsMg\=\=
+video=JmfVideo
+lessThanThreeFilter=
+sealSituation=01
+technicalSupport=gx
+template=c\:\\template
+bidFileCacheCount=5
+needStopBidopeningFirst=00
+volume=100
+hideRevokeSupplier=00
+useVerifyUkeyPin=00
+projectPageSize=5
+expertSign=01
+saomaSignaturePdf=
 mergetype=5
-#\u8bbe\u7f6e\u624b\u5199\u677f\u624b\u5199\u900f\u660e\u5ea6
+evalBidRoomId=aadd606ff7c1445184b9ad780c5feb60
+companyLink=
+updateTime=2021-12-22 09\:53\:10
+signWidth=80
+viewTenderPrice=01
+assistBidopening=00
+keyCharacter=
+bidFilePath=c\:\\bidFile
+versionUpdateType=OBE_FinalService
+productType=final
+showNowTime=01
+openingDownEndDays=30
+filterBracketContent=01
+platformCode=M1100000015
+managerSignature=01
+bidOpeningSupplierSytle=01
+moneyCnPrefix=\u4EBA\u6C11\u5E01
+urlEncoder=01
+nowTypeType=01
+allowImportBidFile=
 alpha=0.85
-#\u6307\u7eb9\u56fe\u4e8c\u503c\u5316\u9608\u503c
+defaultRecommonedCount=
+copyright=\u5317\u4EAC\u56FD\u4FE1\u521B\u65B0\u79D1\u6280\u80A1\u4EFD\u6709\u9650\u516C\u53F8
+signaturePdf=JinGe
+evalManagerResourceId=31f99c485c334eb380f48d061201da2c
+signHeight=35
+ENVIRONMENT=01
+lastDownloadProjectTime=1721031126729
+pdfActiveType=GuoXin
+verifyEvalMachineExpert=00
+properties_path=/E\:/gitWorkSpace/client_V7.0/jingneng/OBE-CONFIG/config.properties
+darkCodeLenth=20
+priceUint=01
+usePublicDb=01
 threshold=255
-#\u65e7\u5b57\u7b26\u96c6\u540d\u79f0
-oldCharsetName=UTF-8
-#\u65b0\u5b57\u7b26\u96c6\u540d\u79f0
-newCharsetName=ISO-8859-1
-#\u5f00\u6807\u5927\u5385\u662f\u5426\u663e\u793a\u5f53\u524d\u65f6\u95f4
-showNowTime=01
-#BT\u670d\u52a1\u5668
-torrentServer=
+qrCodeServcerAddress=http\://sign.e-bidding.org\:8086/gxapp/scanning/
+videoPort=8000
+showUploadMaterial=00
+excelRowStart=2
+evalFullScreen=01
+ftpIp=
+showOperatorRoleType=00
+viewEvaluationResult=01
+viewMySummaryResult=01
+useMachineLock=01
+ftpBuffersize=1024
+bidOpeningFullscreen=00
 torrentPort=6969
-#\u63a5\u53e3\u4e2d\u9879\u76ee\u7f16\u53f7\u6216\u8d26\u53f7\u4fe1\u606f\u8fdb\u884curlEncoder\u8f6c\u7801
-urlEncoder=01
-#\u5de5\u7a0b\u91cf\u6e05\u5355\u7c7b\u578b
-billType=bill_yt
-#\u591a\u8f6e\u62a5\u4ef7\u7c7b\u578b
 multiRoundPriceType=00
+viewStepSummaryResult=00
+tts=MicrosoftTTS
+preEvalResourceId=ef5a43a3cba4432fb18c205e0c4b792c
+caEngine=TianWeiCA_1.0
+excelColumnStart=0
+viewPriceScore=01
+obeWebServerUrl=http\://39.97.159.121\:9863/
+ftpPassword=
+torrentServer=

OBE-CONFIG/config_final.properties

 #\u7cfb\u7edf\u7248\u672c
-version=OBEV7.7.9.20240705
+version=OBEV7.7.9.20240715
 keyCharacter=
 #\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801
 versionUpdateType=OBE_FinalService

OBE-CONFIG/config_test.properties

 #\u7cfb\u7edf\u7248\u672c
-version=OBEV7.7.9.20240705
+version=OBEV7.7.9.202407015
 keyCharacter=g
 versionUpdateType=OBE_Service
 #\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1

OBE-CONFIG/webservice.properties

 #servlet/AxisServlet
-#http://124.42.69.85:8035/epp/servlet/AxisServlet\u67e5\u770b\u63a5\u53e3
+#http://124.42.69.85:8035/epp/servlet/AxisServlet\u67E5\u770B\u63A5\u53E3
 
-#\u8c03\u7528webservice\u7684\u7528\u6237\u540d
+#\u8C03\u7528webservice\u7684\u7528\u6237\u540D
 webserviceUserName=gpcsoft
 
-#\u8c03\u7528webservice\u7684\u5bc6\u7801
+#\u8C03\u7528webservice\u7684\u5BC6\u7801
 webservicePassword=111111
 
-#\u63a5\u53e3\u670d\u52a1\u5668\u5730\u5740
+#\u63A5\u53E3\u670D\u52A1\u5668\u5730\u5740
 #http://192.168.8.62:8035/epp/
 #http://192.168.8.62:8999/
 #http://192.168.8.62:8035/egp
 #http://192.168.8.62:8199/ahbz/
 #http://58.211.53.29:9011/
 
-#\u767b\u5f55
+#\u767B\u5F55
 serverUserLogin.method=userHS.do?login
 
 
-#\u540c\u6b65\u9879\u76ee\u7684\u63a5\u53e3\u5730\u5740
+#\u540C\u6B65\u9879\u76EE\u7684\u63A5\u53E3\u5730\u5740
 downProject.url=/services/es/evaluatesys/projectSoapService
 
-#\u83b7\u5f97\u8981\u540c\u6b65\u9879\u76ee\u7684\u6e05\u5355\u5217\u8868
+#\u83B7\u5F97\u8981\u540C\u6B65\u9879\u76EE\u7684\u6E05\u5355\u5217\u8868
 getProjectListForSimpleInfo.method=getProjectInfoByPackCode
 
-#\u83b7\u5f97\u9879\u76ee\u7684\u8be6\u7ec6\u4fe1\u606f
+#\u83B7\u5F97\u9879\u76EE\u7684\u8BE6\u7EC6\u4FE1\u606F
 getPprojectDetail.method=getProjectInfoByCode
 
-#\u8981\u540c\u6b65\u7684\u9879\u76ee\u7c7b\u578bZFCG:01:\u653f\u5e9c\u91c7\u8d2d,TDJY:02:\u571f\u5730\u4ea4\u6613,CQJY:03:\u4ea7\u6743\u4ea4\u6613,JZGC:04:\u5efa\u7b51\u5de5\u7a0b,BX:05:\u6bd4\u9009
+#\u8981\u540C\u6B65\u7684\u9879\u76EE\u7C7B\u578BZFCG:01:\u653F\u5E9C\u91C7\u8D2D,TDJY:02:\u571F\u5730\u4EA4\u6613,CQJY:03:\u4EA7\u6743\u4EA4\u6613,JZGC:04:\u5EFA\u7B51\u5DE5\u7A0B,BX:05:\u6BD4\u9009
 tenderType=01
 
-#\u540c\u6b65\u6307\u6807\u7684\u63a5\u53e3\u5730\u5740
+#\u540C\u6B65\u6307\u6807\u7684\u63A5\u53E3\u5730\u5740
 factorInfo.url=/services/es/ueSystem/factorSoapService
 
-#\u540c\u6b65\u6307\u6807\u7684\u63a5\u53e3\u540d\u79f0
+#\u540C\u6B65\u6307\u6807\u7684\u63A5\u53E3\u540D\u79F0
 factorInfo.method=getCongruousFactorList
 
-#\u4e0a\u4f20\u5f00\u6807\u7ed3\u679c\u7684\u63a5\u53e3\u5730\u5740\u7b2c\u4e8c\u5957\uff08\u65b0\uff09
+#\u4E0A\u4F20\u5F00\u6807\u7ED3\u679C\u7684\u63A5\u53E3\u5730\u5740\u7B2C\u4E8C\u5957\uFF08\u65B0\uFF09
 uploadOpenBidResultSecond.url=/services/openBidSoapService
-#\u4e0a\u4f20\u5f00\u6807\u7ed3\u679c\u7684\u63a5\u53e3\u540d\u79f0
+#\u4E0A\u4F20\u5F00\u6807\u7ED3\u679C\u7684\u63A5\u53E3\u540D\u79F0
 uploadOpenBidResult.method=uploadOpenBid
 
-#\u7533\u8bf7\u4e0a\u4f20\u8bc4\u5ba1\u7ed3\u679c
+#\u7533\u8BF7\u4E0A\u4F20\u8BC4\u5BA1\u7ED3\u679C
 applySubmitEvalResult.url=/services/es/evaluatesys/uploadEvalBidRecordService 
 applySubmitEvalResult.method=bidEvaluationHS.do?uploadEvaluationResultApply
 #applySubmitEvalResult.method=/bidOpenEvaluation/committee/uploadEvaluationResultApply
-#\u786e\u8ba4\u4e0a\u4f20\u8bc4\u5ba1\u7ed3\u679c
+#\u786E\u8BA4\u4E0A\u4F20\u8BC4\u5BA1\u7ED3\u679C
 confirmEvalResult.url=/services/es/evaluatesys/uploadEvalBidRecordService 
 confirmEvalResult.method=confirmEvalResult
-#\u4e13\u5bb6\u5e93\u67e5\u770b\u63a5\u53e3/services/TakerExpert?wsdl\u800c\u4e14\u8981\u914d\u7f6e\u547d\u540d\u7a7a\u95f4
-#\u4e13\u5bb6\u5e93\u8d26\u53f7
+#\u4E13\u5BB6\u5E93\u67E5\u770B\u63A5\u53E3/services/TakerExpert?wsdl\u800C\u4E14\u8981\u914D\u7F6E\u547D\u540D\u7A7A\u95F4
+#\u4E13\u5BB6\u5E93\u8D26\u53F7
 expertLlibraryUserName=EPP08-USER
-#\u4e13\u5bb6\u5e93\u5bc6\u7801
+#\u4E13\u5BB6\u5E93\u5BC6\u7801
 expertLlibraryPassword=EPP08-PASSWORD
 #expertLlibrary\u5730\u5740
 expertLlibraryAddress=http://192.168.8.62:8135
-#\u540c\u6b65\u4e13\u5bb6\u7684\u63a5\u53e3\u5730\u5740/services/es/workMemberSoapService
+#\u540C\u6B65\u4E13\u5BB6\u7684\u63A5\u53E3\u5730\u5740/services/es/workMemberSoapService
 expertInfo.url=/services/TakerExpert
-#\u540c\u6b65\u4e13\u5bb6\u7684\u63a5\u53e3\u540d\u79f0downWorkgMember:getJoinJudgeExpertList:getJoinExpertList
+#\u540C\u6B65\u4E13\u5BB6\u7684\u63A5\u53E3\u540D\u79F0downWorkgMember:getJoinJudgeExpertList:getJoinExpertList
 expertInfo.method=getJoinExpertList
-#\u65f6\u95f4\u670d\u52a1\u5668\u63a5\u53e3\u5730\u5740\u6d4b\u8bd5CommonHttpService.do?method=getTime
+#\u65F6\u95F4\u670D\u52A1\u5668\u63A5\u53E3\u5730\u5740\u6D4B\u8BD5CommonHttpService.do?method=getTime
 nowTime.url=/services/epp/evaluatesys/timeSoapService/
-#\u65f6\u95f4\u670d\u52a1\u5668\u63a5\u53e3\u540d\u79f0
+#\u65F6\u95F4\u670D\u52A1\u5668\u63A5\u53E3\u540D\u79F0
 nowTime.method=baseHS.do?getTime
 getBidInfo=getBidInfo
 
@@ -105,7 +105,7 @@ applyReBidPrice = secondBidPriceHS.do?applySecondBidPrice
 getReBidPrice = secondBidPriceHS.do?getLastSecondBidPriceList
 
 
-#------------------------\u6700\u65b0\u4fee\u6539\u5b9a\u4e49\u7684\u63a5\u53e3------------------------------------
+#------------------------\u6700\u65B0\u4FEE\u6539\u5B9A\u4E49\u7684\u63A5\u53E3------------------------------------
 downloadProjectList.url=/services/es/evaluatesys/projectSoapService
 downloadProjectInfo.url=/services/es/evaluatesys/projectSoapService
 downloadProjectInfot.method=getProjectInfoByCode
@@ -123,13 +123,13 @@ getProjectDecryptAndConfirmStates.method=bidOpeningHS.do?getProjectDecryptAndCon
 generalFileHSmethod = generalFileHS.do?changeTimeOrDelClarificationFile
 applyTenderTurn = tenderProjectInfoHS.do?applyTenderTurn
 getApplyTenderTurnInfo = tenderProjectInfoHS.do?getApplyTenderTurnInfo
-#\u9080\u8bf7\u4f9b\u5e94\u5546\u8fdb\u884c\u89c6\u9891\u63a5\u53e3
+#\u9080\u8BF7\u4F9B\u5E94\u5546\u8FDB\u884C\u89C6\u9891\u63A5\u53E3
 invitationSupplierMeeting=invitationHS.do?invitationSupplierMeeting
 pushDateToVedioPlatForm=bidEvaluationHS.do?pushDateToVedioPlatform
 
-#\u767b\u9646
+#\u767B\u9646
 #serverUserLogin.method=/userLogin/user/login
-#\u5f00\u6807\u63a5\u53e3
+#\u5F00\u6807\u63A5\u53E3
 #applyUploadOpenBidResult.method = /bidOpenEvaluation/openingresult/uploadBidOpeningResultApply
 #getOpenBidResult.method = /bidOpenEvaluation/openingresult/getOpenBidResult 
 #getProjectOpenBidResult.method = /bidOpenEvaluation/openingresult/getProjectOpenBidResult  
@@ -141,7 +141,7 @@ pushDateToVedioPlatForm=bidEvaluationHS.do?pushDateToVedioPlatform
 
 
 
-#\u8bc4\u6807\u63a5\u53e3
+#\u8BC4\u6807\u63A5\u53E3
 #getWinningBiddingSupplierList.method=/bidOpenEvaluation/committee/getWinningBiddingSupplierList
 #uploadConfirmWinningBidder.method=/bidOpenEvaluation/committee/uploadConfirmWinningBidder
 #getProjectBidEvaluationStep.method=/bidOpenEvaluation/committee/getProjectBidEvaluationStep
@@ -197,7 +197,7 @@ pushDateToVedioPlatForm=bidEvaluationHS.do?pushDateToVedioPlatform
 
 
 
-#------------------------\u673a\u6784\u8d44\u8d28\u4fe1\u606f\u63a5\u53e3------------------------------------
+#------------------------\u673A\u6784\u8D44\u8D28\u4FE1\u606F\u63A5\u53E3------------------------------------
 getOrgBaseInfo.method=httpSupplierInfoHS.do?getOrgBaseInfo
 getFinancialStatusInfo.method=httpSupplierInfoHS.do?getFinancialStatusInfo
 getPatentInfo.method=httpSupplierInfoHS.do?getPatentInfo
@@ -213,14 +213,16 @@ getTypeTestByMainInfo.method=httpSupplierInfoHS.do?getTypeTestByMainInfo
 getTypeTestByOtherInfo.method=httpSupplierInfoHS.do?getTypeTestByOtherInfo
 getTestSiteInfo.method=httpSupplierInfoHS.do?getTestSiteInfo
 getProductionEnvironmentInfo.method=httpSupplierInfoHS.do?getProductionEnvironmentInfo
-#\u7248\u672c\u4fe1\u606f
+#\u7248\u672C\u4FE1\u606F
 #versionUpdateAddress=http://www.e-bidding.org/dzzb/baseHS.do?getToolUpdateVersionInfo
 #versionUpdateAddress=http://172.16.7.39:8088/baseHS.do?getToolUpdateVersionInfo
 versionUpdateAddress=http://service.e-bidding.org/yyzxpt/toolVersionUpdateController.do?getToolUpdateVersionInfo
-#\u4e0a\u4f20\u7ec8\u7aef\u4fe1\u606f
+#\u4E0A\u4F20\u7EC8\u7AEF\u4FE1\u606F
 uploadTerminalAddress=http://service.e-bidding.org/yyzxpt/baseHS.do?uploadTerminalInfo
 blockChainUrl=http://123.56.235.135:80/InvokeContract/info
 getQRCodeIsScaned.method=getQRCodeIsScaned
 getQRCodeLoginInfo.method=getQRCodeLoginInfo
 getSealImageListInfo.method=getSealImageListInfo
+#\u67E5\u770B\u4F9B\u5E94\u5546\u98CE\u9669\u7B49\u7EA7
+getRiskSupplierList.method=bidOpeningHS.do?getSupplierRatingLevelByStageId
 

OBE-MANAGEMENT/src/com/gx/obe/management/LoginDialog.java

@@ -561,7 +561,7 @@ public class LoginDialog {
 	private void init(){
 		userService = new UserService();
 		userLoginRecordService = new UserLoginRecordService();
-		product_info.setText(Messages.Terminal_management + " "+PropertiesUtils.getProperty(ConfigConstants.VERSION,"V4.0"));
+		product_info.setText(Messages.EvalManage + " "+PropertiesUtils.getProperty(ConfigConstants.VERSION,"V4.0"));
 		String productTitle = PropertiesUtils.getProperty(ConfigConstants.MANAGEMENT_TITLE,"");
 		if(null != productTitle && productTitle.length() > 0) {
 			product_info.setText(productTitle);

OBE-MANAGEMENT/src/com/gx/obe/management/MainDialog.java

@@ -133,7 +133,7 @@ public class MainDialog implements ActionListener{
 		screenHight = util.getScreenHight() -util.getTaskBarHight();
 		shell.setSize(util.getScreenWight(), screenHight);
 		shell.setLocation(0, 0);
-		shell.setText(Messages.Terminal_management);
+		shell.setText(Messages.COMPANY_NAME + "-" +Messages.Terminal_management);
 		shell.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/evaluation-ico.png"));
 		GridLayout gl_shell = new GridLayout(1, false);
 		gl_shell.horizontalSpacing = 0;
@@ -163,8 +163,8 @@ public class MainDialog implements ActionListener{
 		product_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
 		product_title.setFont(SWTResourceManager.getFont("微软雅黑", 13, SWT.BOLD));
 		product_title.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
-		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/logo.png"));
-		product_title.setText(Messages.Terminal_management);
+		product_title.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/45.png"));
+		product_title.setText(Messages.COMPANY_NAME + "-" + Messages.Terminal_management);
 		
 		menu_composite = new Composite(top_composite, SWT.NONE);
 		RowLayout rl_menu_composite = new RowLayout(SWT.HORIZONTAL);

OBE-REPORT/src/com/gx/obe/report/dataset/excel/TechnicalComparisonDateSet.java

@@ -46,7 +46,7 @@ public class TechnicalComparisonDateSet extends BaseDateSet{
 				templateFileName = templateFileName.substring(0, templateFileName.lastIndexOf("."));
 			}
 			System.out.println();
-			List<Supplier> supplierList = supplierService.getAllSupplierList(tenderProjectEntity.getId());//(detailEvalNode, true);
+			List<Supplier> supplierList = supplierService.getOpenBidSuccessSupplier(tenderProjectEntity.getId());//(detailEvalNode, true);
 			for(EvaluationContent evaluationContent : evaluationContentList){
 				List<EvaluationFactor> factorList = new ArrayList<EvaluationFactor>();
 				if(evaluationContent.getDataCategory().equals("TT") && (evaluationContent.getRelChapterType().contains("TechnicalParameter"))) {

com.gx.obe.struct/.settings/org.eclipse.core.resources.prefs

 eclipse.preferences.version=1
+encoding//src/com/gx/obe/struct/composite/TemplateTableComparisonComposite.java=UTF-8
 encoding/<project>=UTF-8