提交代码

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

@@ -259,7 +259,7 @@ public class FactorEvaluationComposite extends EvaluationView {
 		//渲染图形化界面
 		render();
 		//渲染左侧AI界面，如果不需要直接注释该方法
-		renderAi();
+//		renderAi();
 		init();
 	}
 	

BID-EVALUATION/src/com/gx/obe/evaluation/composite/MyEvaluationStepComposite.java

@@ -121,6 +121,7 @@ import com.gx.obe.web.service.expert.ExpertService;
 import com.gx.security.CertValidator;
 import com.gx.security.CertificateException;
 import com.gx.security.SecurityRuntimeException;
+import com.gx.tools.ole.signature.BacthSignatureDialog;
 import com.gx.tools.ole.signature.CircleSignatureDialog;
 import com.gx.tools.utils.SignaturePdfUtils;
 import com.gx.utils.NowTimeUtils;
@@ -171,6 +172,7 @@ public class MyEvaluationStepComposite extends Composite implements ActionListen
 	private EvaluationStepService evaluationStepService;
 	private Menu menu;
 	private Menu resultMenu;
+//	private ELink batchSignature_btn;
 	// private StepButton curStep;
 	{
 		LogUtils.logClass(MyEvaluationStepComposite.class);
@@ -323,13 +325,25 @@ public class MyEvaluationStepComposite extends Composite implements ActionListen
 		preEvalLink.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/signature.png"));
 		menuFunctionUtils.addFunction(preEvalLink, "EVALUATION_PREEVAL");
 		//如果需要屏蔽，直接注释掉该行
-		new AiEvalLeftButton(toolsComposite, SWT.NONE, tenderProject, "标书查重");
-		
+//		new AiEvalLeftButton(toolsComposite, SWT.NONE, tenderProject, "标书查重");
 		signature_btn = new ELink(toolsComposite, SWT.NONE);
 		signature_btn.setFont(SWTResourceManager.getFont("微软雅黑", 12, SWT.BOLD));
 		signature_btn.setForeground(SWTResourceManager.getColor(60, 138, 226));
 		menuFunctionUtils.addFunction(signature_btn, "EVALUATION_SIGNATURE");
 		
+//		batchSignature_btn = new ELink(toolsComposite, SWT.NONE);
+//		batchSignature_btn.setFont(SWTResourceManager.getFont("微软雅黑", 12, SWT.BOLD));
+//		batchSignature_btn.setForeground(SWTResourceManager.getColor(60, 138, 226));
+//		batchSignature_btn.setText("批量签名");
+//		batchSignature_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/edit.png"));
+//		batchSignature_btn.addMouseListener(new MouseAdapter() {
+//			public void mouseUp(MouseEvent e) {
+//				openBatchSignatureDialog();
+//			}
+//		});
+
+
+
 		wasteBiddding_btn = new ELink(toolsComposite, SWT.NONE);
 		wasteBiddding_btn.setFont(SWTResourceManager.getFont("微软雅黑", 12, SWT.BOLD));
 		wasteBiddding_btn.setForeground(SWTResourceManager.getColor(60, 138, 226));
@@ -478,12 +492,32 @@ public class MyEvaluationStepComposite extends Composite implements ActionListen
         signature_btn.addMouseListener(mouseAdapter);
     }
     
+	/**
+	 * 手写签名
+	 *
+	 * @param title
+	 * @param signaturePdfKey
+	 * @param signaturePdfType
+	 */
 	private void openSignatureDialog(String title, String signaturePdfKey, String signaturePdfType) {
 		CircleSignatureDialog signatureDialog = new CircleSignatureDialog(getShell(), tenderProject, Constants.USER, signaturePdfKey, signaturePdfType);
 		signatureDialog.setTitle(title);
     	signatureDialog.open();
 	}
 
+	/**
+	 * 批量签名
+	 *
+	 * @param title
+	 * @param signaturePdfKey
+	 * @param signaturePdfType
+	 */
+	private void openBatchSignatureDialog() {
+		BacthSignatureDialog signatureDialog = new BacthSignatureDialog(getShell(), tenderProject, Constants.USER, expert);
+		signatureDialog.setTitle("批量签名");
+		signatureDialog.open();
+	}
+
 	
 	
 	/**

BID-PRICE-TABLE/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

OBE-ACTION/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

OBE-COMMON-ICONS/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

OBE-COMMON-TOOLS/src/com/gx/tools/ole/signature/BacthSignatureDialog.java

+package com.gx.tools.ole.signature;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.core.widgets.EDialog;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import com.gx.obe.components.core.enumeration.CommonEnum;
+import com.gx.obe.config.ConfigConstants;
+import com.gx.obe.config.utils.PropertiesUtils;
+import com.gx.obe.message.Messages;
+import com.gx.obe.util.utils.LogUtils;
+import com.gx.obe.util.utils.ScreenUtils;
+import com.gx.obe.web.entity.auth.AuthUser;
+import com.gx.obe.web.entity.expert.Expert;
+import com.gx.obe.web.entity.tender.TenderProjectEntity;
+
+/** 
+ * @Description: 流转签章
+ * @author guoyr 
+ */
+public class BacthSignatureDialog extends EDialog {
+
+	private TenderProjectEntity tenderProject;
+	private AuthUser curUser;
+	private Composite container;
+	private Expert expert;
+
+	{
+		LogUtils.logClass(BacthSignatureDialog.class);
+	}
+	
+	/** 
+	 * @author guoyr
+	 * @param parentShell
+	 * @param tenderProjectEntity
+	 * @param templateType 
+	 */
+	public BacthSignatureDialog(Shell parentShell, TenderProjectEntity tenderProjectEntity, AuthUser curUser, Expert expert) {
+		super(parentShell);
+		setTitle(Messages.Button_scanSignatrue);
+		this.tenderProject = tenderProjectEntity;
+		this.curUser = curUser;
+		this.expert = expert;
+	}
+
+	/**
+	 * @Description: 
+	 * @author guoyr
+	 * @param parent
+	 * @return 
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		container = (Composite) super.createDialogArea(parent);
+		container.setLayout(new FillLayout(SWT.HORIZONTAL));
+		init();
+		return container;
+	}
+	
+	private void init(){
+		container.setData("dialog", "true");
+//		if (SignaturePdfUtils.CA.equals(signatureType)) {
+//			setTitle(Messages.Button_caSignature);
+//			CACircleSignatureComposite signatureComposite= new CACircleSignatureComposite(container, SWT.NONE);
+//			signatureComposite.refreshSignatureFiles(tenderProject, curUser);
+//        } else if (SignaturePdfUtils.HAND.equals(signatureType)) {
+//        	setTitle(Messages.Button_handSignature);
+//        	// 这里根据手写板类型调用不同的签章界面
+////        	String handType = PropertiesUtils.getProperty(ConfigConstants.HAND_SIGNATURE_PDF, "");
+//        	BJCAHandCircleSignatureComposite signatureComposite= new BJCAHandCircleSignatureComposite(container, SWT.NONE);
+//        	signatureComposite.refreshSignatureFiles(tenderProject, curUser);
+//        } else if (SignaturePdfUtils.SAOMA.equals(signatureType)) {
+//        	setTitle(Messages.Button_scanSignatrue);
+//        	// CFCA 中招扫码app
+//        	if(CFCASaoMaLoaderImpl.PDF_TYPE.equals(signaturePdfvalue)) {
+//        		CFCASaomaCircleSignatureComposite signatureComposite= new CFCASaomaCircleSignatureComposite(container, SWT.NONE);
+//        		signatureComposite.refreshSignatureFiles(tenderProject, curUser);
+//        	}else {
+//        		// 北京CA扫码签章
+//        		BJCASaomaCircleSignatureComposite signatureComposite= new BJCASaomaCircleSignatureComposite(container, SWT.NONE);
+//        		signatureComposite.refreshSignatureFiles(tenderProject, curUser);
+//        	}
+//        }
+		ExpertBatchSignatureComposite expertBatchSignatureComposite = new ExpertBatchSignatureComposite(container, SWT.NONE);
+		expertBatchSignatureComposite.refreshSignatureFiles(tenderProject, curUser, expert);
+	}
+	
+	/**
+	 * Return the initial size of the dialog.
+	 */
+	@Override
+	protected Point getInitialSize() {
+		ScreenUtils  util = new ScreenUtils();
+		int screenHight = util.getScreenHight() - util.getTaskBarHight();
+		if(PropertiesUtils.getProperty(ConfigConstants.EVAL_FULL_SCREEN, "00").equals(CommonEnum.YES)) {
+			screenHight = util.getScreenHight();
+		}
+		return new Point(util.getScreenWight(),screenHight);
+//		return new Point(840, 616);
+	}
+}

OBE-COMMON-TOOLS/src/com/gx/tools/ole/signature/ImageCheckBox.java

+package com.gx.tools.ole.signature;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.core.widgets.ImageButton;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+
+import com.swtdesigner.ResourceManager;
+import com.swtdesigner.SWTResourceManager;
+
+
+public class ImageCheckBox extends ImageButton{
+
+	private SelectionAdapter selectionAdapter;
+	private int imageSize = 16;
+	public static Color BG = SWTResourceManager.getColor(60, 138, 226);
+	public static final String checkBoxGroup = "checkBoxGroup";
+	public ImageCheckBox(Composite parent, int style) {
+		super(parent, style | SWT.CENTER);
+		this.setData(checkBoxGroup, checkBoxGroup);
+		this.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.NORMAL));
+		this.setSelectionForeground(getForeground());
+//		this.setSelectionForeground(SWTResourceManager.getColor(77, 163, 19));
+//		this.setForeground(Constants.FONT_BLACK_COLOR);
+		init();
+	}
+	
+	private void init(){
+		this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons","icons/unchecked.png"), imageSize,imageSize);
+		this.addMouseListener(new MouseAdapter() {
+			public void mouseUp(MouseEvent e) {
+				if(!getEnabled()){
+					return;
+				}
+				setSelection(!getSelection());
+				if(null != selectionAdapter){
+//					Event event = new Event();
+//					event.button = e.button;
+//					event.data = e.data;
+//					event.x = e.x;
+//					event.y = e.y;
+//					selectionAdapter.widgetSelected(new SelectionEvent(event));
+					// 加上事件无法调用
+					selectionAdapter.widgetSelected(null);
+				}
+				super.mouseUp(e);
+			}
+		});
+	}
+	
+
+	public void addSelectionListener(SelectionAdapter selectionAdapter){
+		this.selectionAdapter = selectionAdapter;
+	}
+	
+	
+	
+	public int getImageSize() {
+		return imageSize;
+	}
+
+	public void setImageSize(int imageSize) {
+		if(this.imageSize != imageSize){
+			this.imageSize = imageSize;
+			if(this.getSelection()){
+				this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons","icons/checked.png"), imageSize,imageSize);
+			}else {
+				this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons","icons/unchecked.png"), imageSize,imageSize);
+			}
+		}
+	}
+
+	@Override
+	public void setSelection(boolean selection) {
+		if(this.getSelection() != selection){
+			if(selection){
+				this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons", "icons/checked.png"), imageSize,imageSize);
+			}else {
+				this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons", "icons/unchecked.png"), imageSize,imageSize);
+			}
+			super.setSelection(selection);
+		}
+	}
+}

OBE-COMMON-TOOLS/src/com/gx/tools/ole/signature/ManagerBacthSignatureDialog.java

+package com.gx.tools.ole.signature;
+
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.core.widgets.EDialog;
+import org.eclipse.swt.core.widgets.ESepator;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+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.Shell;
+
+import com.gx.obe.business.enumeration.UserEnum;
+import com.gx.obe.components.core.enumeration.CommonEnum;
+import com.gx.obe.config.ConfigConstants;
+import com.gx.obe.config.utils.PropertiesUtils;
+import com.gx.obe.message.Messages;
+import com.gx.obe.util.utils.LogUtils;
+import com.gx.obe.util.utils.ScreenUtils;
+import com.gx.obe.web.entity.expert.Expert;
+import com.gx.obe.web.entity.tender.TenderProjectEntity;
+import com.gx.obe.web.service.expert.ExpertService;
+import com.swtdesigner.ResourceManager;
+
+/** 
+ * @Description: 流转签章
+ * @author guoyr 
+ */
+public class ManagerBacthSignatureDialog extends EDialog {
+
+	private TenderProjectEntity tenderProject;
+	private Composite container;
+	private ExpertService expertService = new ExpertService();
+	private Composite composite;
+	private ExpertBatchSignatureComposite expertBatchSignatureComposite;
+//	private UserInfoButton userInfoButton;
+	{
+		LogUtils.logClass(ManagerBacthSignatureDialog.class);
+	}
+	
+	/** 
+	 * @author guoyr
+	 * @param parentShell
+	 * @param tenderProjectEntity
+	 * @param templateType 
+	 */
+	public ManagerBacthSignatureDialog(Shell parentShell, TenderProjectEntity tenderProjectEntity) {
+		super(parentShell);
+		setTitle(Messages.Button_scanSignatrue);
+		this.tenderProject = tenderProjectEntity;
+	}
+
+	/**
+	 * @Description: 
+	 * @author guoyr
+	 * @param parent
+	 * @return 
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		container = (Composite) super.createDialogArea(parent);
+		GridLayout gl_container = new GridLayout(1, false);
+		container.setLayout(gl_container);
+		
+		composite = new Composite(container, SWT.NONE);
+		GridLayout gl_composite = new GridLayout(10, false);
+		gl_composite.horizontalSpacing = 20;
+		gl_composite.verticalSpacing = 10;
+		gl_composite.marginRight = 50;
+		gl_composite.marginLeft = 50;
+		composite.setLayout(gl_composite);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+		ESepator sep = new ESepator(container, SWT.NONE);
+		sep.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+		
+		Composite composite_1 = new Composite(container, SWT.NONE);
+		composite_1.setLayout(new FillLayout(SWT.HORIZONTAL));
+		composite_1.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		
+		expertBatchSignatureComposite = new ExpertBatchSignatureComposite(composite_1, SWT.NONE);
+		init();
+		return container;
+	}
+	
+	/**
+	 * 初始化数据
+	 */
+	private void init(){
+		container.setData("dialog", "true");
+		List<Expert> expertList = expertService.getExpertListByTenderId(tenderProject.getId());
+		int index = 0;
+		if(null != expertList && expertList.size() > 0) {
+			for(final Expert expert : expertList) {
+				SignInfoButton imageButton = new SignInfoButton(composite, SWT.NONE);
+				imageButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+				boolean managerIsFemale = null != expert.getUser() && UserEnum.FEMALE.equals(expert.getUser().getGender());
+				if(managerIsFemale) {
+					imageButton.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons", "icons/female_48.png"));
+				}else {
+					imageButton.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons", "icons/male_48.png"));
+				}
+//				if(managerIsFemale) {
+				imageButton.setText(expert.getUser().getUserName());
+				imageButton.addMouseListener(new MouseAdapter() {
+					public void mouseUp(MouseEvent e) {
+						expertBatchSignatureComposite.refreshSignatureFiles(tenderProject, expert.getUser(), expert);
+						System.out.println("专家点击进入" + expert.getUser().getUserName());
+					}
+				});
+//				默认选中第一个
+				if(index == 0) {
+					expertBatchSignatureComposite.refreshSignatureFiles(tenderProject, expert.getUser(), expert);
+				}
+				index ++;
+			}
+			
+		}
+	}
+	
+	/**
+	 * Return the initial size of the dialog.
+	 */
+	@Override
+	protected Point getInitialSize() {
+		ScreenUtils  util = new ScreenUtils();
+		int screenHight = util.getScreenHight() - util.getTaskBarHight();
+		if(PropertiesUtils.getProperty(ConfigConstants.EVAL_FULL_SCREEN, "00").equals(CommonEnum.YES)) {
+			screenHight = util.getScreenHight();
+		}
+		return new Point(util.getScreenWight(),screenHight);
+//		return new Point(840, 616);
+	}
+}

OBE-COMMON-TOOLS/src/com/gx/tools/ole/signature/SignInfoButton.java

+package com.gx.tools.ole.signature;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.core.widgets.ImageButton;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.RowData;
+import org.eclipse.swt.widgets.Composite;
+
+import com.gx.obe.components.core.Constants;
+import com.swtdesigner.ResourceManager;
+import com.swtdesigner.SWTResourceManager;
+
+
+public class SignInfoButton extends ImageButton{
+
+	public static Color BG = SWTResourceManager.getColor(60, 138, 226);
+	public static Color NO_START_COLOR = SWTResourceManager.getColor(153, 153, 153);// 灰色
+	public static Color COMPLATE_COLOR = SWTResourceManager.getColor(77, 163, 19);// 绿色
+	public static Color IN_PROGRESS_COLOR = SWTResourceManager.getColor(60, 138, 226);// 蓝色
+//	public static Color RE_AUTHORIZATION_COLOR = SWTResourceManager.getColor(230, 137, 30);// 橙色
+	public static Color RE_AUTHORIZATION_COLOR = SWTResourceManager.getColor(255, 153, 0);// 橙色
+	public SignInfoButton(Composite parent, int style) {
+		super(parent, style| SWT.CENTER | SWT.BOTTOM | SWT.WRAP);
+		this.setTopMargin(2);
+		this.setBottomMargin(2);
+		this.setLeftMargin(5);
+		this.setRightMargin(5);
+		this.setImage(ResourceManager.getPluginImage("com.gx.obe.common.icons", "icons/pdf_signature.png"));
+		this.setForeground(SWTResourceManager.getColor(80, 80, 80));
+		this.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.NORMAL));
+//		this.setSurroundMargin(5);
+//		this.setSurroundColor(SWTResourceManager.getColor(77, 163, 19));// 绿色
+//		this.setSurroundColor(SWTResourceManager.getColor(60, 138, 226));// 蓝色
+		
+		this.setActiveBorderColor(SWTResourceManager.getColor(255, 153, 0));
+//		this.setActiveBackgroundColor(SWTResourceManager.getColor(40, 250, 255));
+//		this.setActiveForeground(SWTResourceManager.getColor(255, 153, 0));
+//		this.setActiveSurroundColor(SWTResourceManager.getColor(60, 138, 226));
+//		this.setActiveSurroundColor(SWTResourceManager.getColor(255, 153, 0));// 橙色
+//		this.setBorderWidth(3);
+//		this.setActiveSurroundMargin(6);
+		this.setSelectionBorderColor(SWTResourceManager.getColor(60, 138, 226));
+		this.setSelectionForeground(SWTResourceManager.getColor(60, 138, 226));
+//		this.setSelectionSurroundColor(SWTResourceManager.getColor(77, 163, 19));// 绿色
+		this.setSubImageRightMargin(10);
+		this.setSubImageTopMargin(5);
+//		this.setSubImage(ResourceManager.getPluginImage(CommonActivator.PLUGIN_ID, "icons/signature_complate.png"));
+		this.setGAP(0);
+		this.setArcWidth(6);
+//		this.setDisenableColor(SWTResourceManager.getColor(77, 163, 19));
+//		this.setAlpha(100);
+//		this.setFillSurround(false);
+//		setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+//		this.setEnabled(false);
+	}
+
+}

OBE-COMPONENTS-CORE/YX05QL1Z.cer

+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGNlcnQ+PGNlcnRJZD4zPC9jZXJ0SWQ+PHByb2R1Y3Q+T0JFPC9wcm9kdWN0PjxtYWM+QzEtRjYtRkYtOTMtMDgtQUI8L21hYz48bW90aGVyQm9hcmRTTj5DMUY2RkY5MzA4QUI8L21vdGhlckJvYXJkU04+PGNlcnRUeXBlPlRyaWFsPC9jZXJ0VHlwZT48bmFtZT4zMDAwNSAyMzM3NiAyNDMyMCAzNTc4MCAyNjYzMTwvbmFtZT48YXV0aG9yPjU1IDQ2IDQ4IDEyMjg5IDU2IDQ2IDQ4IDMyNDU2IDM2NTIzIDI1NDgwIDI2NDM1PC9hdXRob3I+PHZlcnNpb24+VjcuMDwvdmVyc2lvbj48bnVtQ29waWVzPjE8L251bUNvcGllcz48ZXhwaXJlc0RhdGU+MjEyMy0wNy0xMSAwOToyMzowMzwvZXhwaXJlc0RhdGU+PGV4cGlyZXNUaW1lcz4wPC9leHBpcmVzVGltZXM+PGNyZWF0aW9uRGF0ZT4yMDIzLTA3LTExIDA5OjIzOjA2PC9jcmVhdGlvbkRhdGU+PHNpZ25hdHVyZT4zMDJjMDIxNDQ0NWE5YWU0YjQ2NTgzMTg0MjNjMTcwZDU3MTg1Yjk1YTU1OGYyMzMwMjE0NjRmZTUwZWRkMTUwNWFjYjNlYzRmNWQ0NGI5ZTc2OWVlMWY4MjcxNjwvc2lnbmF0dXJlPjxpc3N1ZXI+MjEyNzEgMjAxNDAgMjIyNjkgMjA0NDkgMjEwMTkgMjYwMzIgMzExODUgMjUyMTYgMzI5MjkgMjAyMjEgMjYzNzcgMzg0ODAgMjA4NDQgMjE0OTY8L2lzc3Vlcj48L2NlcnQ+
\ No newline at end of file

OBE-COMPONENTS-CORE/src/com/gx/obe/business/entity/SignatureUser.java

@@ -27,6 +27,16 @@ public class SignatureUser {
 	
 	private SignatureFile signatureFile;
     
+	private String message;
+	
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
 	public String getId() {
 		return id;
 	}

OBE-COMPONENTS-CORE/src/com/gx/obe/web/entity/Result/Header.java

+package com.gx.obe.web.entity.Result;
+
+/**
+ * @Title: Controller
+ * @Description: 头文件
+ * @author zouk
+ * @date 2016-05-11 10:34:19
+ * @version V1.0
+ *
+ */
+public class Header {
+	
+	// 状态码，0代表成功，其它取值含义另行说明
+	private String returnCode;
+	
+	// 状态结果说明
+	private String msg;
+
+	private String ret;
+	public Header() {
+	}
+
+	public Header(String returnCode) {
+		this.returnCode = returnCode;
+	}
+
+	public Header(String returnCode, String msg) {
+		this.returnCode = returnCode;
+		this.msg = msg;
+	}
+
+	public String getReturnCode() {
+		return returnCode;
+	}
+
+	public void setReturnCode(String returnCode) {
+		this.returnCode = returnCode;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public String getRet() {
+		return ret;
+	}
+
+	public void setRet(String ret) {
+		this.ret = ret;
+	}
+
+}

OBE-COMPONENTS-CORE/src/com/gx/obe/web/entity/Result/ResultEntity.java

@@ -29,6 +29,7 @@ import java.io.Serializable;
 	private int code = SUCCESS;
 
 	private T data;
+	private Header header = new Header();
 
 	public ResultEntity() {
 		super();
@@ -93,4 +94,15 @@ import java.io.Serializable;
 		resultEntity.setMsg(msg);
 		return resultEntity;
 	}
+
+
+	public Header getHeader() {
+		return header;
+	}
+
+
+	public void setHeader(Header header) {
+		this.header = header;
+	}
+	
 }

OBE-CONFIG/config.properties

 #update
-#Mon Jul 15 16:12:06 CST 2024
+#Thu Oct 17 14:08:59 CST 2024
 groupByEvalBidRoom=00
 pdfReport=00
 newCharsetName=ISO-8859-1
@@ -8,7 +8,7 @@ livingType=00
 expertLimit=
 handSignaturePdf=BJCAHANDPDF
 videoLiveUrl=
-templateUpdateTime=2024-07-15 16\:11\:50
+templateUpdateTime=2024-10-17 14\:07\:30
 defaultPassword=1
 videoIp=192.168.3.40
 ftpUsername=anonymous
@@ -30,15 +30,15 @@ filterChar=(\: ,)\: ,\uFF08\: ,\uFF09\: ,/\:\u659C\u6760,\\\:\u659C\u6760,-\:\u6
 zipEncoding=GBK
 isAIEvaluation=00
 isUseAutomaticAnalysisBillOfQuantities=00
-version=OBEV7.7.9.20240715
+version=OBEV7.7.9.20241017
 showConfirmStatus=00
 ftpPort=21
-serverName=\u5317\u4EAC\u4EAC\u80FD\u7535\u5B50\u62DB\u6807\u5E73\u53F0
+serverName=\u4EAC\u80FD\u96C6\u56E2\u7535\u5B50\u5546\u52A1\u5E73\u53F0(\u6D4B\u8BD5)
 singTenderName=00
 useSpecialPdf=01
 netService=JNJTService
 useCamera=01
-serverUrl=https\://www.powerbeijing-ec.com/jndzzb/
+serverUrl=https\://test.powerbeijing-ec.com/jndzzb/
 companyWbLink=
 controlBidOpening=01
 GuoXinPDFReaderLicense=MjAyMSwxMiwyMiwyOTk5LDMsMg\=\=
@@ -58,59 +58,60 @@ saomaSignaturePdf=
 mergetype=5
 evalBidRoomId=aadd606ff7c1445184b9ad780c5feb60
 companyLink=
-updateTime=2021-12-22 09\:53\:10
+updateTime=2024-04-15 11\:23\:19
 signWidth=80
 viewTenderPrice=01
 assistBidopening=00
-keyCharacter=
+keyCharacter=g
 bidFilePath=c\:\\bidFile
-versionUpdateType=OBE_FinalService
-productType=final
+versionUpdateType=OBE_Service
+productType=test
 showNowTime=01
 openingDownEndDays=30
 filterBracketContent=01
 platformCode=M1100000015
-managerSignature=01
-bidOpeningSupplierSytle=01
 moneyCnPrefix=\u4EBA\u6C11\u5E01
+bidOpeningSupplierSytle=01
+managerSignature=01
 urlEncoder=01
 nowTypeType=01
-allowImportBidFile=
+creditChinaURL=https\://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids\=
 alpha=0.85
+allowImportBidFile=
 defaultRecommonedCount=
 copyright=\u5317\u4EAC\u56FD\u4FE1\u521B\u65B0\u79D1\u6280\u80A1\u4EFD\u6709\u9650\u516C\u53F8
-signaturePdf=JinGe
+signaturePdf=CFCASaoma
 evalManagerResourceId=31f99c485c334eb380f48d061201da2c
 signHeight=35
 ENVIRONMENT=01
-lastDownloadProjectTime=1721031126729
-pdfActiveType=GuoXin
+lastDownloadProjectTime=1729145339884
 verifyEvalMachineExpert=00
-properties_path=/E\:/gitWorkSpace/client_V7.0/jingneng/OBE-CONFIG/config.properties
+pdfActiveType=CFCASaoma
+properties_path=/E\:/gitWorkSpace/client_V7.0/jingnengdabao/OBE-CONFIG/config.properties
 darkCodeLenth=20
 priceUint=01
 usePublicDb=01
 threshold=255
-qrCodeServcerAddress=http\://sign.e-bidding.org\:8086/gxapp/scanning/
+qrCodeServcerAddress=http\://39.96.40.58\:8811/gxapp/scanning/
 videoPort=8000
 showUploadMaterial=00
-excelRowStart=2
 evalFullScreen=01
+excelRowStart=2
 ftpIp=
 showOperatorRoleType=00
 viewEvaluationResult=01
-viewMySummaryResult=01
 useMachineLock=01
+viewMySummaryResult=01
 ftpBuffersize=1024
-bidOpeningFullscreen=00
-torrentPort=6969
 multiRoundPriceType=00
+torrentPort=6969
+bidOpeningFullscreen=00
 viewStepSummaryResult=00
 tts=MicrosoftTTS
-preEvalResourceId=ef5a43a3cba4432fb18c205e0c4b792c
-caEngine=TianWeiCA_1.0
 excelColumnStart=0
+caEngine=TianWeiCA_1.0
+preEvalResourceId=ef5a43a3cba4432fb18c205e0c4b792c
+obeWebServerUrl=http\://47.95.161.231\:6850/
 viewPriceScore=01
-obeWebServerUrl=http\://39.97.159.121\:9863/
 ftpPassword=
 torrentServer=

OBE-CONFIG/config2.properties

 #\u7CFB\u7EDF\u7248\u672C
-version=OBEV7.7.9.20240723
+version=OBEV7.7.9.20240927
 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
@@ -26,9 +26,9 @@ 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
+pdfActiveType=CFCASaoma
 #\u7B7E\u7AE0\u5DE5\u5177
-signaturePdf=JinGe
+signaturePdf=CFCASaoma
 #BJCAPDF:\u5317\u4EACCA\u624B\u5199\u677F;BJCASaoma:\u5317\u4EACCA\u626B\u7801\u7B7E\u5B57
 handSignaturePdf=
 #\u4E0D\u8DB3\u4E09\u5BB6\u4E0D\u5141\u8BB8\u5F00\u6807

OBE-CONFIG/config_final.properties

 #\u7cfb\u7edf\u7248\u672c
-version=OBEV7.7.9.20240902
+version=OBEV7.7.9.20241017
 keyCharacter=
 #\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801
 versionUpdateType=OBE_FinalService
@@ -13,5 +13,5 @@ platformCode=M1100000015
 
 handSignaturePdf=BJCAHANDPDF
 saomaSignaturePdf=
-pdfActiveType=GuoXin
+pdfActiveType=CFCASaoma
 evalFullScreen=01

OBE-CONFIG/config_test.properties

 #\u7cfb\u7edf\u7248\u672c
-version=OBEV7.7.9.20240902
+version=OBEV7.7.9.20241017
 keyCharacter=g
 versionUpdateType=OBE_Service
 #\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1
@@ -12,5 +12,5 @@ platformCode=M1100000015
 
 handSignaturePdf=BJCAHANDPDF
 saomaSignaturePdf=
-pdfActiveType=GuoXin
+pdfActiveType=CFCASaoma
 evalFullScreen=01

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

@@ -55,6 +55,7 @@ import com.gx.obe.web.service.MenuService;
 import com.gx.obe.web.service.TenderProjectService;
 import com.gx.obe.web.service.UserService;
 import com.gx.obe.web.service.expert.ExpertService;
+import com.gx.tools.ole.signature.BacthSignatureDialog;
 import com.gx.tools.ole.signature.CircleSignatureDialog;
 import com.gx.tools.utils.SignaturePdfUtils;
 import com.swtdesigner.ResourceManager;
@@ -88,6 +89,7 @@ public class EvaluationRoomHomeComposite extends Composite implements ActionList
 	private Menu menu;
 	private MenuFunctionUtils menuFunctionUtils = new  MenuFunctionUtils();
 	private RoomOperatorButton signature_btn;
+//	private RoomOperatorButton batchSignature_btn;
 	
 	{
 		LogUtils.logClass(EvaluationRoomHomeComposite.class);
@@ -384,6 +386,16 @@ public class EvaluationRoomHomeComposite extends Composite implements ActionList
 			signature_btn.setText(Messages.Button_elecSignature);
 			menuFunctionUtils.addFunction(signature_btn, "SIGNATURE");
 			
+//			batchSignature_btn = new RoomOperatorButton(operatorComposite, SWT.NONE);
+//			batchSignature_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/signature.png"));
+//			batchSignature_btn.setText(Messages.Button_elecSignature);
+//			menuFunctionUtils.addFunction(batchSignature_btn, "SIGNATURE");
+//			
+//			batchSignature_btn.addMouseListener(new MouseAdapter() {
+//				public void mouseUp(MouseEvent e) {
+//					openBatchSignatureDialog();
+//				}
+//			});
 			{
 				final RoomOperatorButton downloadBidFileBtn = new RoomOperatorButton(operatorComposite, SWT.NONE);
 				downloadBidFileBtn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/download.png"));
@@ -592,6 +604,18 @@ public class EvaluationRoomHomeComposite extends Composite implements ActionList
 	public Composite getParentComposite() {
 		return loadComposite;
 	}
+//	/**
+//	 * 批量签名
+//	 *
+//	 * @param title
+//	 * @param signaturePdfKey
+//	 * @param signaturePdfType
+//	 */
+//	private void openBatchSignatureDialog() {
+//		BacthSignatureDialog signatureDialog = new BacthSignatureDialog(getShell(), tenderProjectEntity, Constants.USER, expert);
+//		signatureDialog.setTitle("批量签名");
+//		signatureDialog.open();
+//	}
 
 	/**
 	 * @Description: 回退评标专家的评标步骤操作

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

 package com.gx.obe.management.webservice;
-
 import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -11,7 +10,6 @@ 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;
@@ -397,6 +395,7 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 	private boolean createSupplierEvalResultXml(String path){
 		try {
 			Document document = DocumentHelper.createDocument();
+			
 			Element rootElement = document.addElement("supplierEvalResultList");
 			rootElement.addElement("evaluationMethod").setText(XmlUtils.getXmlText(tenderProjectRuleEntity.getEvalMethodType()));
 			rootElement.addElement("evaluationMethodName").setText(XmlUtils.getXmlText(tenderProjectRuleEntity.getEvalMethodName()));
@@ -407,7 +406,7 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			XmlUtils.createXmlFile(document, path, XML_ENCODING);
 			return true;
 		} catch (Exception e) {
-			LOG.error("", e);
+			LOG.error("SupplierEvalResult.xml生成报错", e);
 			return false;
 		}
 	}
@@ -423,7 +422,6 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 				exchangeRate = new ExchangeRate();
 			}
 			Map<String, BigDecimal> exchangeRateMap = exchangeRate.getExchangeRateMap();
-			
 			for(final Supplier supplier : supplierList){
 				SupplierOpeningResult openBidResult = supplier.getSupplierOpeningResult();
 				Element supplierElement = rootElement.addElement("supplier");
@@ -461,7 +459,6 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 				// 投标价币种
 				supplierElement.addElement("currencyCode").setText(XmlUtils.getXmlText(currencyCode));
 				supplierElement.addElement("rate").setText(XmlUtils.getXmlText(rate));
-				
 				String evaluationScore = "";
 				String evaluationFinalScore = "";
 				String accessment = "";
@@ -492,14 +489,17 @@ 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());
 					});
+					if(null != bidPriceResult) {
 						evaluationPrice = bidPriceResult.getEvaluationPrice().toString();
 					}
+				}
 				supplierElement.addElement("evaluationPrice").setText(evaluationPrice);
 				supplierElement.addElement("evaluationScore").setText(evaluationScore);
 				supplierElement.addElement("evaluationFinalScore").setText(evaluationFinalScore);
@@ -546,6 +546,7 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 				}
 			}
 		}
+//		LOG.error("SupplierEvalResult.xml输出节点22");
 		 return factorDoc == null ? false:ParsingXmlUtils.parsingDocStructXML(factorDoc);	 
 	}
 
@@ -688,7 +689,6 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			stepExpertListMap.put(evaluationStep.getId(), expertList);
 		}
 //		List<ExpertEvaluationResult> expertEvaluationResultList = expertEvaluationResultService.getSupplierExpertEvaluationResultList(tenderProjectEntity.getId(),  evaluationStep.getId(), supplierId);
-		
 		if(null != expertList){
 			for(final Expert expert : expertList){
 				String expertName = "";

OBE-REPORT/src/com/gx/obe/report/composite/EvaluationReportComposite.java

@@ -99,6 +99,7 @@ import com.gx.obe.web.service.TenderProjectService;
 import com.gx.pdf.utils.transfer.TransferUtils;
 import com.gx.tools.dialog.OpenDocumentDialog;
 import com.gx.tools.ole.signature.LocalSignatureDialog;
+import com.gx.tools.ole.signature.ManagerBacthSignatureDialog;
 import com.gx.tools.utils.SignaturePdfUtils;
 import com.gx.tools.widget.FileOperatorButton;
 import com.gx.tools.widget.FileOperatorButton.ClickListener;
@@ -175,6 +176,8 @@ public class EvaluationReportComposite extends Composite {
 	private Action projectAction;
 	private Menu menu;
 	private MenuFunctionUtils menuFunctionUtils = new  MenuFunctionUtils();
+
+//	private ELink batchSign_btn;
 	{
 		LogUtils.logClass(EvaluationReportComposite.class);
 	}
@@ -370,7 +373,7 @@ public class EvaluationReportComposite extends Composite {
 		
 		reportTitle_composte = new Composite(composite_4, SWT.NONE);
 		reportTitle_composte.setBackgroundMode(SWT.INHERIT_FORCE);
-		reportTitle_composte.setLayout(new GridLayout(8, false));
+		reportTitle_composte.setLayout(new GridLayout(9, false));
 		reportTitle_composte.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
 		reportTitle_composte.setBackground(ColorConstants.SKIN_BG);
 		
@@ -380,6 +383,17 @@ public class EvaluationReportComposite extends Composite {
 		label.setForeground(ColorConstants.SKIN_FOREGROUND);
 		label.setText(Messages.MyReport);
 		
+//		batchSign_btn = new ELink(reportTitle_composte, SWT.NONE);
+//		batchSign_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/report_all.png"));
+//		batchSign_btn.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
+//		batchSign_btn.addMouseListener(new MouseAdapter() {
+//			public void mouseUp(MouseEvent mouseevent) {
+////				mergerPdfAction();
+//				batchSignAction();
+//			}
+//		});
+//		batchSign_btn.setText("批量签名");
+		
 		synthesisPdf_btn = new ELink(reportTitle_composte, SWT.NONE);
 		synthesisPdf_btn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/white/expend.png"));
 		synthesisPdf_btn.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
@@ -1748,6 +1762,8 @@ public class EvaluationReportComposite extends Composite {
 						public void mouseDoubleClick(MouseEvent e) {
 							LocalSignatureDialog signatureDialog = new LocalSignatureDialog(getShell(), tenderProject, fileOperatorButton.getFile(), signatureType, signatureTypeValue,FileConstants.REPORT_FILE_FOLDER);
 							signatureDialog.open();
+//							ManagerBacthSignatureDialog dialog = new ManagerBacthSignatureDialog(getShell(), tenderProject);
+//							dialog.open();
 						}
 					});
 				}else if(signaturePdfMap.size() > 1){
@@ -1755,6 +1771,8 @@ public class EvaluationReportComposite extends Composite {
 						public void mouseDoubleClick(MouseEvent e) {
 							LocalSignatureDialog signatureDialog = new LocalSignatureDialog(getShell(), tenderProject, fileOperatorButton.getFile(), null, null,FileConstants.REPORT_FILE_FOLDER);
 							signatureDialog.open();
+//							ManagerBacthSignatureDialog dialog = new ManagerBacthSignatureDialog(getShell(), tenderProject);
+//							dialog.open();
 						}
 					});
 					for (final String signaturePdfKey : signaturePdfMap.keySet()) {
@@ -1872,7 +1890,13 @@ public class EvaluationReportComposite extends Composite {
 		});
 		dialog.open();
 	}
-	
+	/**
+	 * 
+	 */
+	private void batchSignAction(){
+		ManagerBacthSignatureDialog dialog = new ManagerBacthSignatureDialog(getShell(), tenderProject);
+		dialog.open();
+	}
 	@Override
 	protected void checkSubclass() {
 	}

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

@@ -205,7 +205,9 @@ public abstract class BaseDateSet implements IDataSet{
 			int expertIndex = 1;
 			int count = 0;
 			for(Expert expert : expertList) {
-				if(count > 0 && count % 5 == 0) {
+				if(count > 0 && count % 4 == 0) {
+					allExpert.append("\r\n");
+					allExpertNoLeader.append("\r\n");
 					allExpert.append("\r\n");
 					allExpertNoLeader.append("\r\n");
 				}
@@ -216,10 +218,10 @@ public abstract class BaseDateSet implements IDataSet{
 //					allExpert.append("#"+userName+ "#");
 				}else {
 					reportDataSet.putParam("zj" + (expertIndex++), "#"+userName+ "#");
-					allExpert.append("#"+userName+ "#");
+					allExpert.append("  #"+userName+ "#  ");
 				}
 				if(ExpertEnum.LEADER_YES.equals(expert.getIsLeader())){
-					expertLeaderSignature = "#"+userName+"#";
+					expertLeaderSignature = " #"+userName+"#  ";
 				}else {
 					if(userName.length() < 3) {
 						allExpertNoLeader.append(" #"+userName+ "# ");

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

@@ -433,7 +433,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		
 		List<Expert> expertList = getEvalExpertListByEvalNode(evaluationStepBidType);
 		// 获得投标人集合
-		List<Supplier> supplierList = supplierService.getEvaluationStepSupplierList(tenderProject.getId(), evaluationStepBidType.getEvaluationStepList().get(0));
+		List<Supplier> supplierList = getEvaluationStepSupplierList(evaluationStepBidType.getEvaluationStepList().get(0), true);
 		
 //		先组装指标专家表头
 //		Map<String, Object> factorMapList = new HashMap<>();
@@ -521,7 +521,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		}else {
 			if(null != crossMap.get(evaluationFactor.getId() + supplier.getId())) {
 				crossMapList.add(crossMap.get(evaluationFactor.getId()+ supplier.getId()));
-				System.out.println("获取指标主键id值"+evaluationFactor.getId() + supplier.getId() + ": " +crossMap.get(evaluationFactor.getId()+ supplier.getId()));
+//				System.out.println("获取指标主键id值"+evaluationFactor.getId() + supplier.getId() + ": " +crossMap.get(evaluationFactor.getId()+ supplier.getId()));
 			}
 		}
 		
@@ -563,7 +563,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 //			System.out.println("设置指标评审结果值："+ evaluationFactor.getId()+ expert.getUserId()+ "expert");
 			
 			crossMap.put(evaluationFactor.getId()+ expertID, dateMap);
-			System.out.println("设置指标评审结果值："+evaluationFactor.getId()+ expertID);
+//			System.out.println("设置指标评审结果值："+evaluationFactor.getId()+ expertID);
 //			expertEvaluationFactor.setFactorCode(factorCode);
 //			evaluationFactor.addChild(factor);
 			Map<String, Object> factor = new HashMap<String, Object>();
@@ -611,7 +611,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		if (null != stepList && stepList.size() > 0) {
 			for (EvaluationStep step : stepList) {
 				// 获得进入当前步骤的供应商
-				List<Supplier> inSupplierList = supplierService.getEvaluationStepSupplierList(tenderProject.getId(), step);
+				List<Supplier> inSupplierList = getEvaluationStepSupplierList(step, true);
 				if (null != inSupplierList && inSupplierList.size() > 0) {
 					qualifiedCount = inSupplierList.size();;
 					List<Supplier> disSupplierList = supplierService.getDisAccessmentSupplier(tenderProject.getId(), step.getId());
@@ -619,7 +619,8 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 						qualifiedCount = qualifiedCount - disSupplierList.size();
 						disQualifiedCount = disSupplierList.size();
 						for (Supplier supplier : disSupplierList) {
-							SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultService.getSupplierEvaluationResultByTenderIdAndSupplierId(tenderProject.getId(), supplier.getId());
+//							SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultService.getSupplierEvaluationResultByTenderIdAndSupplierId(tenderProject.getId(), supplier.getId());
+							SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultMap.get(supplier.getId());
 							Map<String, Object> supplierMap = Bean2MapUtils.createMap(supplier);
 							if (null != supplierEvaluationResult) {
 								supplierMap.put("newIndex", unPassComCount++ + "");
@@ -631,7 +632,8 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 					}
 					
 					for (Supplier supplier : inSupplierList) {
-						SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultService.getSupplierEvaluationResultByTenderIdAndSupplierId(tenderProject.getId(), supplier.getId());
+//						SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultService.getSupplierEvaluationResultByTenderIdAndSupplierId(tenderProject.getId(), supplier.getId());
+						SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultMap.get(supplier.getId());
 						SupplierEvaluationResult sourceSupplierEvaluationResult = null;
 						if(!StringUtils.isEmpty(tenderProject.getTenderSourceId())) {
 						sourceSupplierEvaluationResult = supplierEvaluationResultService.getSupplierEvaluationResultByTenderIdAndSupplierId(tenderProject.getTenderSourceId(), supplier.getSourceId());
@@ -668,7 +670,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		List<Map<String, Object>> bidPriceItemMapList = new ArrayList<Map<String, Object>>();
 		Map<String, Object> crossData = new HashMap<String, Object>();
 		List<Supplier> openSucessSupplierList = getOpenBidSuccessSupplierList();
-		List<SupplierOpeningResult> supplierBidPriceResultList = supplierOpeningResultService.getSupplierOpeningResultList(tenderProject.getId());
+//		List<SupplierOpeningResult> supplierBidPriceResultList = supplierOpeningResultService.getSupplierOpeningResultList(tenderProject.getId());
 		List<BidPrice> bidPriceList = bidPriceService.getTenderBidPriceTableList(tenderProject.getId());
 		if (null == bidPriceList || bidPriceList.size() < 1) {
 			return;
@@ -683,8 +685,10 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		if (null != openSucessSupplierList && openSucessSupplierList.size() > 0) {
 			int sort = 1;
 			for (Supplier supplier : openSucessSupplierList) {
-				for (SupplierOpeningResult supplierOpeningResult : supplierBidPriceResultList) {
-					if (StringUtils.equals(supplier.getId(), supplierOpeningResult.getSupplierId())) {
+				SupplierOpeningResult supplierOpeningResult =  supplierOpeningResultMap.get(supplier.getId());
+//				for (SupplierOpeningResult supplierOpeningResult : supplierBidPriceResultList) {
+//				if (StringUtils.equals(supplier.getId(), supplierOpeningResult.getSupplierId())) {
+					if (null != supplierOpeningResult) {
 						List<BidPriceResult> bidPriceItemResultList = bidPriceResultService.getSupplierBidPriceResultList(tenderProject.getId(), supplier.getId());
 						Map<String, Object> supplierMap = Bean2MapUtils.createMap(supplier);
 						supplierMap.put("sort", sort++ + "");
@@ -708,7 +712,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 							crossData.put(supplier.getId().concat(bidPriceResult.getBidPriceId()), bidPriceResult.getPriceContent());
 						}
 					}
-				}
+//				}
 			}
 		}
 		
@@ -724,10 +728,10 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 	 */
 	public List<Supplier> getOpenBidSuccessSupplierList() {
 		// 获得开标成功的投标人列表
-		List<Supplier> supplierList = supplierService.getOpenBidSuccessSupplier(tenderProject.getId());
+		List<Supplier> supplierList = openBidSuccessSupplierList;
 		// 未获得开标完成的投标人，则获得全部投标人。
 		if (null == supplierList || supplierList.size() < 1) {
-			supplierList = supplierService.getAllSupplierList(tenderProject.getId());
+			supplierList = allSupplierList;
 		}
 		return supplierList;
 	}
@@ -755,15 +759,17 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		String name=evaluationStepList.stream().filter(s -> s.getEvaluationOpinion() != null).map(EvaluationStep :: getStepName).collect(Collectors.joining("/"));
 		String opinion=evaluationStepList.stream().filter(s -> s.getEvaluationOpinion() != null).map(EvaluationStep :: getEvaluationOpinion).collect(Collectors.joining("/"));
 		//判断中标候选人顺序是否更改
-		List<SupplierEvaluationResult> supplierEvaluationResultList =supplierEvaluationResultService.getSupplierEvaluationResultListByTenderId(tenderProject.getId());
+//		List<SupplierEvaluationResult> supplierEvaluationResultList = supplierEvaluationResultService.getSupplierEvaluationResultListByTenderId(tenderProject.getId());
 		List<SupplierEvaluationResult> sourceSupplierEvaluationResultList =null;
 		if(!StringUtils.isEmpty(tenderProject.getTenderSourceId())) {
-		sourceSupplierEvaluationResultList =supplierEvaluationResultService.getSupplierEvaluationResultListByTenderId(tenderProject.getTenderSourceId());
+		sourceSupplierEvaluationResultList = supplierEvaluationResultService.getSupplierEvaluationResultListByTenderId(tenderProject.getTenderSourceId());
 		}
 		int number =0;
-		if(supplierEvaluationResultList != null && sourceSupplierEvaluationResultList !=null){
-			for(SupplierEvaluationResult supplierEvaluationResult : supplierEvaluationResultList){
-				Supplier supplier = supplierService.getById(supplierEvaluationResult.getSupplierId());
+//		if(supplierEvaluationResultList != null && sourceSupplierEvaluationResultList !=null){
+		if(supplierEvaluationResultMap != null && supplierEvaluationResultMap.size() > 0 && sourceSupplierEvaluationResultList !=null){
+			for(String key: supplierEvaluationResultMap.keySet()) {
+				SupplierEvaluationResult supplierEvaluationResult = supplierEvaluationResultMap.get(key);
+				Supplier supplier = supplierMap.get(supplierEvaluationResult.getSupplierId());
 				for(SupplierEvaluationResult sourceSupplierEvaluationResult : sourceSupplierEvaluationResultList){
 					Supplier sourceSupplier = supplierService.getById(sourceSupplierEvaluationResult.getSupplierId());
 					if(supplier.getSupplierName().equals(sourceSupplier.getSupplierName()) && supplierEvaluationResult.getSortNo() != sourceSupplierEvaluationResult.getSortNo()) {
@@ -771,6 +777,9 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 					}
 				}
 			}
+//			for(SupplierEvaluationResult supplierEvaluationResult : supplierEvaluationResultList){
+				
+//			}
 		}
 		if(number > 0) {
 			reportDataSet.putParam("ifChange", "更改为:");
@@ -838,7 +847,7 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
 		// 未找到招标文件的指标，则获得投标文件的指标。
 		if(null == factorDoc){
 			// 获得投标人集合
-			List<Supplier> supplierList = supplierService.getSupplierOpenBidList(tenderProject.getId());
+//			List<Supplier> supplierList = supplierService.getSupplierOpenBidList(tenderProject.getId());
 			if(null != supplierList && supplierList.size() > 0){
 				// 遍历投标人信息
 				for(Supplier supplier : supplierList){

OBE-SYSTEM/src/com/gx/obe/system/composite/SysetemAdminLogComposite.java

@@ -82,6 +82,7 @@ public class SysetemAdminLogComposite extends Composite {
 	private Composite formComposite;
 	private Text keySearchText;
 	private Text pageSizeText;
+	private Boolean isException;
 	{
 		LogUtils.logClass(SysetemAdminLogComposite.class);
 	}
@@ -433,7 +434,7 @@ public class SysetemAdminLogComposite extends Composite {
 		sysLogService = new com.gx.obe.web.service.log.SysLogService();
 		logGrid.setItemHeight(Constants.ROW_HIGHT);
 		logGrid.setAutoHeight(true);
-		
+		combo.select(1);
 		FloatInputListener factorPositiveMinScoreListener = new FloatInputListener();
 		factorPositiveMinScoreListener.addMinCheck(0, Messages.Tips_pleaseEnterValidRange);
 		factorPositiveMinScoreListener.addMaxCheck(200, Messages.Tips_pleaseEnterValidRange);
@@ -471,7 +472,10 @@ public class SysetemAdminLogComposite extends Composite {
 		Date startTime = (Date)startTimeText.getData("date");
 		Date endTime = (Date)endTimeText.getData("date");
 		String returnValue = returnValueText.getText();
-		Boolean isException = (Boolean)WidgetUtils.getComboSelection(combo);
+		isException = false;
+		if(null != WidgetUtils.getComboSelection(combo) &&  !"-1" .equals(WidgetUtils.getComboSelection(combo))) {
+			isException = (Boolean)WidgetUtils.getComboSelection(combo);
+		}
 		new Thread(new Runnable() {
 			public void run() {
 				Page<SysLog>  page = sysLogService.selectConditionQuery(createUser, title, params, startTime, endTime, returnValue, isException, CUR_PAGE_NO, PAGE_SIZE);

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

com.gx.obe.common.file/META-INF/MANIFEST.MF

@@ -36,4 +36,5 @@ Export-Package: com.gx.obe.common.file.adapter,
  com.gx.obe.common.file.upload,
  com.gx.obe.common.file.upload.infer,
  com.gx.obe.common.file.utils,
- com.gx.obe.common.file.widget
+ com.gx.obe.common.file.widget,
+ org.eclipse.wb.swt

com.gx.obe.common.file/src/com/gx/obe/common/file/service/ExpertSignService.java

+package com.gx.obe.common.file.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.gx.obe.business.entity.SignatureFile;
+import com.gx.obe.components.core.Constants;
+import com.gx.obe.http.json.JsonUtil;
+import com.gx.obe.web.utils.NetworkRequest;
+import com.gx.obe.web.utils.ResultStatus;
+
+public class ExpertSignService {
+	static final String URL = "fileSign";
+	/**
+	 * @Description: 获得当前项目的流转签章文件
+	 * @author mazc
+	 * @param tenderId
+	 * @return 
+	 */
+	public List<SignatureFile> expertSubmitSignApply(String idNumber, String tenderId, String fileIds, String signImage, String keyWord, String userId, String expertId){
+		String strWebServerUrl = Constants.getServiceUrl( URL + "/expertSubmitSignApply");
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("tenderId", tenderId );
+		param.put("idNumber", idNumber );
+		param.put("fileIds", fileIds );
+		param.put("signImage", signImage );
+		param.put("keyWord", keyWord);
+		param.put("expertId", expertId);
+		param.put("userId", userId);
+  		try {
+ 			String result = NetworkRequest.post(strWebServerUrl, param);
+ 			if(ResultStatus.getReultStatusIsNotEmpty(result)){
+ 				return JsonUtil.strToList(result, SignatureFile.class);	 
+ 			}
+ 			return null;
+		} catch (Exception e) {
+//			logger.error(e.getMessage(), e);
+			return null;
+		}
+	}
+}

com.gx.obe.common.file/src/com/gx/obe/common/file/service/SignatureUserService.java

@@ -180,4 +180,27 @@ public class SignatureUserService {
 			return false;
 		}
 	}
+	/**
+	 * @Description: 获得当前用户需要签章的报表
+	 * @author mazc
+	 * @param tenderId
+	 * @param userId
+	 * @return 
+	 */
+	public List<SignatureUser> getUserSignatureFileList(String tenderId){
+		String strWebServerUrl = Constants.getServiceUrl( URL + "/getUserSignatureFileByTenderIdList");
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("tenderId", tenderId );
+ 		try {
+ 			String result = NetworkRequest.get(strWebServerUrl, param);
+ 			if(ResultStatus.getReultStatusIsNotEmpty(result)){
+ 				return JsonUtil.strToList(result, SignatureUser.class);	 
+ 			}
+ 			return null;
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			return null;
+		}
+	}
+	
 }

com.gx.obe.common.file/src/com/gx/obe/common/file/service/UserSignFileService.java

+package com.gx.obe.common.file.service;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gx.obe.components.core.Constants;
+import com.gx.obe.components.core.vo.AuthUserVo;
+import com.gx.obe.http.json.JsonUtil;
+import com.gx.obe.web.entity.Result.ResultEntity;
+import com.gx.obe.web.entity.expert.Expert;
+import com.gx.obe.web.utils.NetworkRequest;
+import com.gx.obe.web.utils.ResultStatus;
+public class UserSignFileService {
+	static final String URL = "fileSign";
+	/**
+	 * @Description: 获得当前项目的流转签章文件
+	 * @author mazc
+	 * @param tenderId
+	 * @return 
+	 */
+	public  ResultEntity<Expert> expertSubmitSignApply(String TId, String idNumber, String tenderId, String fileIds, String signImage, String keyWord, String userId, String expertId){
+		String strWebServerUrl = Constants.getServiceUrl( URL + "/expertSubmitSignApply");
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("TId", TId );
+		param.put("tenderId", tenderId );
+		param.put("idNumber", idNumber );
+		param.put("fileIds", fileIds );
+		param.put("signImage", signImage );
+		param.put("keyWord", keyWord);
+		param.put("userId", userId);
+		param.put("expertId", expertId);
+  		try {
+ 			String result = NetworkRequest.post(strWebServerUrl, param);
+ 			System.out.println(result);
+ 			if(ResultStatus.getReultStatusIsNotEmpty(result)){
+				Map<String, Class> classMap = new HashMap<String, Class>();
+				classMap.put("data", Expert.class);
+				return JsonUtil.strToObject(result, ResultEntity.class, classMap);
+			}
+			return new  ResultEntity<Expert>(null,"请求失败",ResultEntity.FAIL);
+		} catch (Exception e) {
+//			logger.error(e.getMessage(), e);
+//			return null;
+		}
+  		return new ResultEntity<Expert>(null,"请求失败",ResultEntity.FAIL);
+	}
+	
+	/**
+	 * @Description: 获得当前项目的流转签章文件
+	 * @author mazc
+	 * @param tenderId
+	 * @return 
+	 */
+	public  ResultEntity<String> getExpertSignStatue(String TId, String tenderId, String userId, String expertId){
+		String strWebServerUrl = Constants.getServiceUrl( URL + "/getExpertSignStatue");
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("TId", TId );
+		param.put("tenderId", tenderId );
+		param.put("userId", userId);
+		param.put("expertId", expertId);
+  		try {
+ 			String result = NetworkRequest.post(strWebServerUrl, param);
+ 			System.out.println(result);
+ 			if(ResultStatus.getReultStatusIsNotEmpty(result)){
+				Map<String, Class> classMap = new HashMap<String, Class>();
+				classMap.put("data", Expert.class);
+				return JsonUtil.strToObject(result, ResultEntity.class, classMap);
+			}
+			return new  ResultEntity<String>(null,"请求失败",ResultEntity.FAIL);
+		} catch (Exception e) {
+//			logger.error(e.getMessage(), e);
+//			return null;
+		}
+  		return new ResultEntity<String>(null,"请求失败",ResultEntity.FAIL);
+	}
+}

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

@@ -34,6 +34,7 @@ import com.gx.obe.message.Messages;
 import com.gx.obe.util.utils.LogUtils;
 import com.swtdesigner.ResourceManager;
 import com.swtdesigner.SWTResourceManager;
+import org.eclipse.swt.widgets.Label;
 
 /**
  * @Description: 
@@ -60,7 +61,7 @@ public class MessageViewDialog extends EDialog {
 	public static final String CANCEL = "CANCEL";
 	private List<ButtonPo> buttonPoList;
 	private Map<String, EButton> operatorMap;
-	
+	private boolean showProcess = true;
 	{
 		LogUtils.logClass(MessageViewDialog.class);
 	}
@@ -72,6 +73,14 @@ public class MessageViewDialog extends EDialog {
 	public MessageViewDialog(Shell parentShell, int setMaximum) {
 		this(parentShell, setMaximum, null);
 	}
+	/**
+	 * Create the dialog.
+	 * @param parentShell
+	 */
+	public MessageViewDialog(Shell parentShell, boolean showProcess) {
+		super(parentShell);
+		this.showProcess = showProcess;
+	}
 	/**
 	 * @wbp.parser.constructor
 	 */
@@ -106,7 +115,7 @@ public class MessageViewDialog extends EDialog {
 		downloadInfoComposite.setLayout(gl_downloadInfoComposite);
 		
 		text = new Text(downloadInfoComposite, SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL);
-		text.setFont(SWTResourceManager.getFont("宋体", 10, SWT.NORMAL));
+		text.setFont(SWTResourceManager.getFont("宋体", 14, SWT.NORMAL));
 		text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
 		ESepator label = new ESepator(container, SWT.SEPARATOR | SWT.HORIZONTAL);
@@ -115,12 +124,14 @@ public class MessageViewDialog extends EDialog {
 		
 		
 		composite_3 = new Composite(container, SWT.NONE);
+//		composite_3.setBackground(org.eclipse.wb.swt.SWTResourceManager.getColor(SWT.COLOR_WHITE));
 		composite_3.setBackgroundMode(SWT.INHERIT_FORCE);
 		composite_3.setBackgroundImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/fill_bg.png"));
-		GridLayout gl_composite_3 = new GridLayout(2, false);
+		GridLayout gl_composite_3 = new GridLayout(3, false);
 		composite_3.setLayout(gl_composite_3);
-		composite_3.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		composite_3.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false, 1, 1));
 		
+		if(showProcess) {
 			if(setMaximum > 0){
 				downloadProgressBar = new ProgressBar(composite_3, SWT.SMOOTH );
 				downloadProgressBar.setMaximum(setMaximum);
@@ -128,6 +139,7 @@ public class MessageViewDialog extends EDialog {
 				downloadProgressBar = new ProgressBar(composite_3, SWT.SMOOTH | SWT.INDETERMINATE);
 			}
 			downloadProgressBar.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
+		}
 
 		init();
 		return container;
@@ -138,6 +150,7 @@ public class MessageViewDialog extends EDialog {
 	 * @author guoyr
 	 */
 	private void init(){
+		if(showProcess) {
 			downloadProgressBar.setVisible(true);	
 			progressRunnable = new Runnable() {
 				public void run() {
@@ -147,6 +160,8 @@ public class MessageViewDialog extends EDialog {
 				}
 			};
 			
+		}
+		
 		if(null != buttonPoList && buttonPoList.size() > 0){
 			((GridLayout)composite_3.getLayout()).numColumns = buttonPoList.size() + 1;
 			operatorMap = new HashMap<String, EButton>();
@@ -271,7 +286,9 @@ public class MessageViewDialog extends EDialog {
 		Display.getDefault().syncExec(new Runnable() {
 			public void run() {
 				if(null != text && !text.isDisposed()){
+					if(showProcess) {
 						downloadProgressBar.setVisible(true);
+					}
 					text.setText(message.toString());
 					text.setSelection(message.length());
 				}
@@ -295,10 +312,12 @@ public class MessageViewDialog extends EDialog {
 	
 	public void setMaximum(int setMaximum){
 		this.setMaximum = setMaximum;
+		if(showProcess) {
 			if(null != downloadProgressBar){
 				downloadProgressBar.setMaximum(setMaximum);
 			}
 		}
+	}
 	/**
 	 * @Description: 取消
 	 * @author guoyr
@@ -362,6 +381,12 @@ public class MessageViewDialog extends EDialog {
 					});
 				}
 
+				@Override
+				public void callBackClearScreen(String msg) {
+					message = new StringBuilder();
+					showMessage(msg);
+				}
+
 			};
 		}
 		return callBack;

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.eclipse.swt.core/src/org/eclipse/swt/core/CallBack.java

@@ -70,7 +70,8 @@ public abstract class CallBack implements CallBackListener {
 			return null;
 		}
 	}
-
+	public void callBackClearScreen(String msg) {
+	};
 	public void setData(String key, Object value) {
 		if (null == data) {
 			data = new HashMap<String, Object>();