监督人添加功能优化

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

@@ -199,7 +199,7 @@ public class CreditChinaDialog extends EDialog{
 		gridItem.setText(1, ObjectUtils.getObjString(supplier.getSupplierName()));
 		//gridItem.setText(1, "查看详情查看详情查看详情查看详情查看详情");
 		//gridItem.setText(2, "否");
-		gridItem.setText(2, supplierCreditMap.get(ObjectUtils.getObjString(supplier.getSupplierName())).equals("1")?"是":"否");
+		gridItem.setText(2, ObjectUtils.getObjString(supplierCreditMap.get(ObjectUtils.getObjString(supplier.getSupplierName()))).equals("1")?"是":"否");
 		gridItem.setData("supplier",supplier);
 		Button button = new Button(supplier_gird, SWT.NONE);
 		button.setBackground(SWTResourceManager.getColor(255, 255, 255));

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

@@ -165,7 +165,7 @@ public class MainDialog implements ActionListener{
 		
 		product_title = new CLabel(top_composite, SWT.NONE);
 		GridData gd_product_title = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-		gd_product_title.widthHint = 200;
+		gd_product_title.widthHint = 350;
 		product_title.setLayoutData(gd_product_title);
 		product_title.setFont(SWTResourceManager.getFont("微软雅黑", 13, SWT.BOLD));
 		product_title.setForeground(SWTResourceManager.getColor(SWT.COLOR_WHITE));

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

@@ -1773,10 +1773,16 @@ public class BidOpeningRemoteComposite extends OpeningTimeComposite implements S
 		}
 		List<Expert> expertList= expertService.getExpertListByTenderId(curTenderPack.getId());
 		if(null != expertList && expertList.size() > 0) {
+			boolean hasBiddingExpert = false;
 			for(Expert expert : expertList) {
 				if(ExpertEnum.BIDDING.equals(expert.getExpertType())) {
+					hasBiddingExpert = true;
 					break;
 				}
+				
+				
+			}
+			if(!hasBiddingExpert) {
 				MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
 				return false;
 			}

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

@@ -611,29 +611,36 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
 					return;
 				}
 				
-				List<Expert> expertList= expertService.getExpertListByTenderId(tenderProject.getId());
+
+				List<Expert> expertList = expertService.getExpertByTenderId(tenderProject.getId());
 				Expert expertCheck = CollectionUtils.get(expertList, item -> ExpertEnum.BIDDING.equals(item.getExpertType()));
 				if(expertCheck == null) {
 					MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表！");//(getShell(), message.toString());
 					tenderPackList.clear();
 					return ;
 				}
-				
+//				
 //				if(null != expertList && expertList.size() > 0) {
+//				boolean hashBiddingExpert = false;
 //					for(Expert expert : expertList) {
 //						if(ExpertEnum.BIDDING.equals(expert.getExpertType())) {
+//							hashBiddingExpert = true;
 //							break;
 //						}
 //						
+//					}
+//					if(!hashBiddingExpert) {
 //						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-MANAGEMENT/src/com/gx/obe/management/dialog/EditWorkerDialog.java

@@ -10,6 +10,7 @@ import org.eclipse.swt.core.listener.VerifyPhoneListener;
 import org.eclipse.swt.core.listener.VerifyRequiredListener;
 import org.eclipse.swt.core.utils.SwtUtils;
 import org.eclipse.swt.core.utils.ValidateUtils;
+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;
@@ -34,8 +35,8 @@ import com.gx.obe.ColorConstants;
 import com.gx.obe.business.entity.Worker;
 import com.gx.obe.business.enumeration.ExpertEnum;
 import com.gx.obe.business.enumeration.UserEnum;
-import com.gx.obe.common.icons.IconsActivator;
 import com.gx.obe.common.dialog.SelectUserCommonDialog;
+import com.gx.obe.common.icons.IconsActivator;
 import com.gx.obe.components.core.enumeration.CommonEnum;
 import com.gx.obe.message.Messages;
 import com.gx.obe.util.utils.CollectionUtils;
@@ -51,7 +52,6 @@ import com.gx.obe.web.service.UserRoleService;
 import com.gx.obe.web.service.UserService;
 import com.gx.obe.web.service.WorkerService;
 import com.gx.utils.NowTimeUtils;
-import org.eclipse.swt.core.utils.WidgetUtils;
 import com.swtdesigner.ResourceManager;
 
 /**
@@ -59,7 +59,7 @@ import com.swtdesigner.ResourceManager;
  * @author wangxiang
  */
 public class EditWorkerDialog extends EDialog {
-	
+	private boolean check = false;
 	private UserService userService ;
 	private UserRoleService userRoleService;
 	private WorkerService workerService;
@@ -84,7 +84,7 @@ public class EditWorkerDialog extends EDialog {
 	private TenderProjectEntity tenderProjectEntity;
 	private String workerType;
 	private ELink link;
-	private ModifyListener modifyListener;
+//	private ModifyListener modifyListener;
 	//private ELink createAccountLink;
 	//private Button initialPasswordButton;
 	//private final String DEFAULT_PASSWORD = PropertiesUtils.getProperty(ConfigConstants.EXPERT_DEFAULT_PASSWORD, "123456");
@@ -100,7 +100,7 @@ public class EditWorkerDialog extends EDialog {
 		this.workerType = workerType;
 		userService = new UserService();
 		userRoleService = new UserRoleService();
-		modifyListener = e -> validateInputs();
+//		modifyListener = e -> validateInputs();
 	}
 
 	@Override
@@ -125,9 +125,10 @@ public class EditWorkerDialog extends EDialog {
 		
 		Composite compContent = new Composite(compAll, SWT.NONE);
 		GridLayout gl_compContent = new GridLayout(3, false);
-		gl_compContent.marginWidth = 20;
 		compContent.setLayout(gl_compContent);
-		compContent.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, true, 1, 1));
+		GridData gd_compContent = new GridData(SWT.CENTER, SWT.FILL, true, true, 1, 1);
+		gd_compContent.widthHint = 338;
+		compContent.setLayoutData(gd_compContent);
 		
 		CLabel userNameLabel = new CLabel(compContent, SWT.NONE);
 		userNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -135,7 +136,7 @@ public class EditWorkerDialog extends EDialog {
 		
 		Composite userNameComposite = new Composite(compContent, SWT.NONE);
 		userNameComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
-		GridLayout gl_userNameComposite = new GridLayout(2, false);
+		GridLayout gl_userNameComposite = new GridLayout(1, false);
 		gl_userNameComposite.horizontalSpacing = 0;
 		gl_userNameComposite.verticalSpacing = 0;
 		gl_userNameComposite.marginWidth = 0;
@@ -143,23 +144,11 @@ public class EditWorkerDialog extends EDialog {
 		userNameComposite.setLayout(gl_userNameComposite);
 		
 		userNameText = new Text(userNameComposite, SWT.BORDER | SWT.DRAW_TAB);
-		GridData gd_userNameText = new GridData(SWT.FILL, SWT.CENTER, true, false,1,1);
-		gd_userNameText.widthHint = 300; // 设置宽度提示
-		userNameText.setLayoutData(gd_userNameText);
+		userNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false,1,1));
 		userNameText.setTextLimit(20);
 		userNameText.addVerifyListener(new VerifyRequiredListener(userNameText, "姓名不能为空！"));
-		userNameText.addModifyListener(modifyListener);
+//		userNameText.addModifyListener(modifyListener);
 		
-		GridData gd_link = new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1);
-		link = new ELink(userNameComposite, SWT.NONE);
-		link.addMouseListener(new MouseAdapter() {
-			public void mouseUp(MouseEvent e) {
-				queryUserAction();
-			}
-		});
-		link.setLayoutData(gd_link);
-		link.setText("检测");
-		link.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/query.png"));
 		
 //		Composite composite_1 = new Composite(compContent, SWT.NONE);
 //		GridLayout gl_composite_1 = new GridLayout(1, false);
@@ -288,20 +277,36 @@ public class EditWorkerDialog extends EDialog {
 		phoneText.setTextLimit(20);
 		phoneText.addVerifyListener(new VerifyRequiredListener(phoneText,"联系电话不能为空！"));
 		phoneText.addVerifyListener(new VerifyPhoneListener(MessageFormat.format(Messages.Tips_pleaseEnterTheValid, Messages.LinkerTel)));
-		phoneText.addModifyListener(modifyListener);
+//		phoneText.addModifyListener(modifyListener);
 		
 		CLabel IDCardLabel = new CLabel(compContent, SWT.NONE);
 		IDCardLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, false, false, 1, 1));
 		IDCardLabel.setText(Messages.IDCard + "：");
+		Composite idCardComposite = new Composite(compContent, SWT.None);
+		idCardComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+		idCardComposite.setLayout(new GridLayout(2, false));
 		
-		IDCardText = new Text(compContent, SWT.BORDER | SWT.DRAW_TAB);
-		IDCardText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+		IDCardText = new Text(idCardComposite, SWT.BORDER | SWT.DRAW_TAB);
+		IDCardText.addFocusListener(new FocusAdapter() {
+			@Override
+			public void focusGained(FocusEvent e) {
+				check = false;
+			}
+		});
+		IDCardText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
 		IDCardText.setTextLimit(18);
 //		IDCardText.addVerifyListener(new VerifyRequiredListener(IDCardText, MessageFormat.format(Messages.Tips_required, Messages.IDCard)));
 		IDCardText.addVerifyListener(new VerifyCardIdListener(MessageFormat.format(Messages.Tips_pleaseEnterTheCorrect, Messages.IDCard)));
 		
-
-		new Label(compContent, SWT.NONE);
+		link = new ELink(idCardComposite, SWT.NONE);
+		link.addMouseListener(new MouseAdapter() {
+			public void mouseUp(MouseEvent e) {
+				queryUserAction();
+			}
+		});
+		link.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		link.setText("检测");
+		link.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/query.png"));
 		
 //		CLabel label_1 = new CLabel(compContent, SWT.NONE);
 //		label_1.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -383,13 +388,6 @@ public class EditWorkerDialog extends EDialog {
 		return new Point(542, 474);
 	}
 	
-	private void validateInputs() {
-        String userName = userNameText.getText().trim();
-        String phoneNumber = phoneText.getText().trim();
-
-        boolean isInputValid = !userName.isEmpty() && !phoneNumber.isEmpty();
-        saveUserBtn.setEnabled(isInputValid);
-    }
 	
 	/**
 	 * @Description: 初始化界面
@@ -402,6 +400,7 @@ public class EditWorkerDialog extends EDialog {
 			user = (AuthUser) userService.findById(worker.getUserId());
 		}
 		refreshForm();
+		saveUserBtn.setEnabled(false);
 		getShell().pack();
 		SwtUtils.setCenter(getShell());
 	}
@@ -493,8 +492,9 @@ public class EditWorkerDialog extends EDialog {
 	 * @Description: 保存
 	 */
 	private void saveWorkerAction(){
+		
 		saveUserBtn.forceFocus();
-		if(!saveUserBtn.getEnabled())return;
+		if(!saveUserBtn.getEnabled() || !check)return;
 		if(!ValidateUtils.checkInput(userNameText.getParent()) || !ValidateUtils.checkInput(phoneText.getParent())){
 			return;
 		}
@@ -636,21 +636,28 @@ public class EditWorkerDialog extends EDialog {
 //	}
 	
 	private void queryUserAction() {
-		String userName = userNameText.getText().trim();
-		if (StringUtils.isEmpty(userName)) {
+		String IDCard = IDCardText.getText().trim();
+		if (StringUtils.isEmpty(IDCard)) {
+			MessageDialog.openError(getShell(), "请输入身份证号码！");
 			return;
 		}
-		List<AuthUser> userList = userService.getUserListByUserName(null, userName);
+		List<AuthUser> userList = userService.getUserListByIdCard(IDCard);
+//		AuthUser user = userService.getUserByIdCard(IDCard);
 		if (CollectionUtils.isNull(userList)) {
+			saveUserBtn.setEnabled(true);
+			check = true;
 			return;
 		}
 		
 		String userId = null != user ? user.getId() : null;
-		
-		SelectUserCommonDialog selectUserDialog = new SelectUserCommonDialog(getShell(), userId, userList);
+//		 List<AuthUser> userList = new ArrayList<AuthUser>();
+//		 userList.add(user);
+		SelectUserCommonDialog selectUserDialog = new SelectUserCommonDialog(getShell(), userId,userList);
 		selectUserDialog.open();
 		AuthUser selectUser = selectUserDialog.getSelectUser();
 		if (selectUser == null) {
+			check = false;
+			saveUserBtn.setEnabled(false);
 			return;
 		}
 		

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

@@ -874,7 +874,7 @@ public abstract class BaseDateSet implements IWordDataSet{
 							}
 						}
 						SupplierEvaluationStep priceStep = null;
-						if(!StringUtils.isEmpty(tenderProject.getTenderSourceId())) {
+						if(!StringUtils.isEmpty(tenderProject.getTenderSourceId())  && null != priceScoreId) {
 						priceStep=supplierEvaluationStepService.getSupplierEvaluationStep(tenderProject.getTenderSourceId(),supplierMap.get("sourceId").toString(),priceScoreId);
 						}
 						if(priceStep!=null) {

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

@@ -456,6 +456,7 @@ public class SysetemAdminLogComposite extends Composite {
 				querListAction(pageNo);
 			}
 		});
+ 		combo.select(0);
  		querListAction(1);
 	}
 	

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

@@ -3,7 +3,6 @@ package com.gx.obe.common.widget.dialog;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.eclipse.nebula.widgets.grid.Grid;
 import org.eclipse.nebula.widgets.grid.GridColumn;
@@ -48,6 +47,7 @@ import com.gx.obe.util.utils.CollectionUtils;
 import com.gx.obe.util.utils.NumberFormatUtils;
 import com.gx.obe.util.utils.ObjectUtils;
 import com.gx.obe.web.entity.Supplier;
+import com.gx.obe.web.entity.SupplierOpeningResult;
 import com.gx.obe.web.entity.price.BidPrice;
 import com.gx.obe.web.entity.price.BidPriceResult;
 import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
@@ -96,7 +96,6 @@ public class EditSubBidPriceItemDialog extends EDialog {
 	private Label exchangeRateDetail;
 
 	private Text modifyReasonText;
-	
 	/**
 	 * @author chenxw
 	 * @param parentShell
@@ -735,7 +734,7 @@ public class EditSubBidPriceItemDialog extends EDialog {
 	private void saveAction() {
 		curBidPriceResult.setFinalBidPrice(getBidPrice());
 		curBidPriceResult.setModifyReason(modifyReasonText.getText().trim());
-		
+//		supplierOpeningResult.setEvaluationPrice(getBidPrice());
 		if (!isEqualsCurrencyCode() && exchangeRateText.getBigDecimalValue() == null) {
 			MessageDialog.openWarning(getShell(), MessageFormat.format(Messages.Tips_notSetFormat, Messages.ExchangeRate));
 			return;
@@ -759,6 +758,7 @@ public class EditSubBidPriceItemDialog extends EDialog {
 						bidPriceResult.setEvaluationPrice(curBidPriceResult.getEvaluationPrice());
 						bidPriceResult.setModifyReason(curBidPriceResult.getModifyReason());
 						success = bidPriceResultService.updateAssignProperty(bidPriceResult, new String[] {"bidPrice", "evaluationPrice", "finalBidPrice", "modifyReason"});
+						success = bidPriceResultService.updateBidPriceResultOrSum(curBidPriceResult);
 					}else {
 						success = bidPriceResultService.updateBidPriceResultOrSum(curBidPriceResult);
 					}