Skip to content

京
京能客户端
Commit e13e309f authored by realize1020's avatar realize1020
Browse files
Options

信用中国功能、初步评审、评标办法相关 

信用中国功能、初步评审不合格关闭弹窗显示问题、评标办法价格计算公式显示小数位数null的问题
parent b4e62e24
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 28 deletions
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/composite/TianYanCheckComposite.java
View file @ e13e309f
......@@ -232,11 +232,10 @@ public class TianYanCheckComposite extends Composite implements ITianYanCheckCom
loserButton.setImage(ResourceManager.getPluginImage("com.gx.obe.common", "icons/btn/blue/view.png"));
loserButton.addMouseListener(new MouseAdapter() {
public void mouseUp(MouseEvent e) {
//openCreditChina();
openCreditChina();
}
});
//loserButton.setText("失信被执行人查询");
loserButton.setText(" ");
loserButton.setText("失信被执行人查询");
ESepator topSep = new ESepator(featureEvaluationResultComposite, SWT.NONE);
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/composite/business/BusinessVetoEvalResultComposite.java
View file @ e13e309f
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import org.eclipse.swt.SWT;
import org.eclipse.swt.core.CallBack;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
......@@ -186,10 +187,19 @@ public class BusinessVetoEvalResultComposite extends Composite {
Supplier supplier = supplierList.get(row - headRow);
ExpertEvaluationResult evalResult = evalResultMap.get(supplier.getId());
if (com.gx.obe.components.core.enumeration.EvaluationStepEnum.UNQUALIFIED.equals(content)) {
// EvaluationOpinionDialog dialog = new EvaluationOpinionDialog(getShell(), tenderProject, supplier, Constants.USER, evalResult,new CallBack() {
// public void callBackBoolean(final boolean isEmpyt) {
// if(isEmpyt) {
// refreshTableComposite();
// }else {
// evalResult.setAccessment(content.toString());
// }
// }
// });
EvaluationOpinionDialog dialog = new EvaluationOpinionDialog(getShell(), tenderProject, supplier, Constants.USER, evalResult);
dialog.open();
}
evalResult.setAccessment(content.toString());
//evalResult.setAccessment(content.toString());
}
}
});
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/CreditChinaDetailDialog.java
View file @ e13e309f
......@@ -25,6 +25,7 @@ import com.google.gson.reflect.TypeToken;
import com.gx.obe.business.http.HttpResponse;
import com.gx.obe.business.http.HttpUrl;
import com.gx.obe.business.http.HttpUtils;
import com.gx.obe.config.utils.PropertiesUtils;
import com.gx.obe.evaluation.step.entity.CreditChinaData;
import com.gx.obe.evaluation.step.entity.SupplierCreditEntity;
import com.gx.obe.http.HttpUtil;
......@@ -62,7 +63,8 @@ public class CreditChinaDetailDialog extends EDialog{
private Label combo10;
private Label combo11;
private Label combo12;
private final static String URL="https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo=";
//private final static String URL="https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo=";
private final static String URL=PropertiesUtils.getProperty("creditChinaDetialURL","https://www.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo=");
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/CreditChinaDialog.java
View file @ e13e309f
......@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.TableItem;
import com.gx.obe.business.http.HttpResponse;
import com.gx.obe.business.http.HttpUrl;
import com.gx.obe.business.http.HttpUtils;
import com.gx.obe.config.utils.PropertiesUtils;
import com.gx.obe.evaluation.step.entity.SupplierCreditEntity;
import com.gx.obe.http.HttpUtil;
import com.gx.obe.util.utils.ObjectUtils;
......@@ -67,7 +68,8 @@ public class CreditChinaDialog extends EDialog{
private Composite composite;
private Map<String,String> supplierCreditMap =new HashMap<String,String>();
private ArrayList<SupplierCreditEntity> supplierCreditEntityList=null;
private static final String URL="https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids=";
//private static final String URL="https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids=";
private final static String URL=PropertiesUtils.getProperty("creditChinaURL","https://www.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids=");
/**
* @author guoyr
......@@ -154,7 +156,7 @@ public class CreditChinaDialog extends EDialog{
}
private void init() {
getSupplierCredit();
getSupplierCredit();
refreshSupplierCredit();
}
......@@ -168,6 +170,7 @@ public class CreditChinaDialog extends EDialog{
String url =URL+ids;
HttpUrl httpUrl = new HttpUrl(url);
HttpResponse httpResponse = HttpUtils.doPost(httpUrl);
System.err.println("接口信息："+httpUrl.getUrl() +"\r\n接口参数："+httpUrl.getAttributs()+"\r\n接口返回内容："+httpResponse);
supplierCreditEntityList = new ArrayList<SupplierCreditEntity>();
if(null != httpResponse && httpResponse.getStatus()){
JSONArray supplierCreditListArray = httpResponse.getDataJSONArray("zhiXingSupplierList");
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/EvaluationOpinionDialog.java
View file @ e13e309f
......@@ -2,7 +2,9 @@ package com.gx.obe.evaluation.step.dialog;
import java.text.MessageFormat;
import org.apache.commons.lang.StringUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.core.CallBack;
import org.eclipse.swt.core.MessageDialog;
import org.eclipse.swt.core.widgets.EButton;
import org.eclipse.swt.core.widgets.EDialog;
......@@ -66,6 +68,7 @@ public class EvaluationOpinionDialog extends EDialog {
private EButton submitBtn;
private Label openionTitleLabel;
private Combo combo;
private CallBack callBack;
{
LogUtils.logClass(EvaluationOpinionDialog.class);
}
......@@ -87,6 +90,18 @@ public class EvaluationOpinionDialog extends EDialog {
this.curUser = curUser;
this.expertEvaluationResult = expertEvaluationResult;
supplierEvaluationResultService = new SupplierEvaluationResultService();
}
public EvaluationOpinionDialog(Shell parentShell, TenderProjectEntity tenderProject, Supplier supplier, AuthUser curUser, ExpertEvaluationResult expertEvaluationResult,CallBack callBack) {
super(parentShell);
setTitle(supplier.getSupplierName());
this.tenderProject = tenderProject;
this.supplier = supplier;
this.curUser = curUser;
this.expertEvaluationResult = expertEvaluationResult;
supplierEvaluationResultService = new SupplierEvaluationResultService();
this.callBack=callBack;
}
/**
......@@ -517,6 +532,7 @@ public class EvaluationOpinionDialog extends EDialog {
}else {
MessageDialog.openShortMessage(Messages.Tips_saveSuccess);
}
callBack.callBackBoolean(true);
}else {
MessageDialog.openError(getShell(), isSubmit ? Messages.Tips_submitFail : Messages.Tips_saveFail);
}
......@@ -529,6 +545,14 @@ public class EvaluationOpinionDialog extends EDialog {
if(null != supplierEvaluationResult && null != supplierEvaluationResult.getApplyUserId() && supplierEvaluationResult.getApplyUserId().equals(curUser.getId())){
supplierEvaluationResultService.releaseEditSupplierEvaluationResult(tenderProject.getId(), supplier.getId(), curUser.getId());
}
if(null != callBack) {
//判断有没有填不合格的理由
if(requirementText.getText().trim().equals("")||supplierEvalOpinionText.getText().trim().equals("")||combo.getSelectionIndex()==0) {
callBack.callBackBoolean(false);
return super.close();
}
}
return super.close();
}
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/SelectBidRegulationsDialog.java
View file @ e13e309f
......@@ -179,8 +179,7 @@ public class SelectBidRegulationsDialog extends EDialog {
saveAction();
}
});
GridData gd_confirmBtn = new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1);
saveBtn.setLayoutData(gd_confirmBtn);
saveBtn.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
saveBtn.setText(Messages.Button_ok);
EButton cancel_btn = new EButton(composite_2, SWT.NONE);
......@@ -190,8 +189,6 @@ public class SelectBidRegulationsDialog extends EDialog {
getShell().close();
}
});
GridData gd_button = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
cancel_btn.setLayoutData(gd_button);
cancel_btn.setText(Messages.Button_close);
init();
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/review/composite/ComplianceEvaluationTableComposite.java
View file @ e13e309f
......@@ -282,6 +282,7 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
gd_evaluationOpinionText.heightHint = 24;
gd_evaluationOpinionText.widthHint = 200;
factor_evaluation_opinion.setLayoutData(gd_evaluationOpinionText);
new Label(composite_5, SWT.NONE);
factor_evaluation_opinion.addPaintListener(new PaintListener() {
public void paintControl(PaintEvent e) {
if (factor_evaluation_opinion.getText().trim().length() == 0) {
......@@ -1553,7 +1554,7 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
// 编辑单元格内容
CellEditContentRender editContentRender = new CellEditContentRender() {
public void receiveContent(int row, int col, Object content) {
if (col >= commKTableModel.getFixedColumnCount()) {
if (col >= commKTableModel.getFixedColumnCount()) {
if (null == content) return;
resultChanged = true;
Supplier supplier = evalSupplierList.get(col - commKTableModel.getFixedColumnCount());
......@@ -1567,7 +1568,9 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
ExpertEvaluationResult expertEvaluationResult = expertEvaluationResultMap.get(supplier.getId());
Map<String, EvaluationFactorResult> supplierFactorResultMap = supplierEvaluationFactorResultMap.get(supplier.getId());
EvaluationFactorResult evalFactorResult = supplierFactorResultMap.get(evaluationFactor.getId());
evalFactorResult.setEvaluationResult(content.toString());
if(EvaluationFactorEnum.CONFORM.equals(content.toString())) {
evalFactorResult.setEvaluationResult(content.toString());
}
// if(evalFactorResult.getEvaluationResult().equals(EvaluationFactorEnum.UNCONFORM)){
// EvaluationOpinionInputDialog evaluationOpinionDialog = new EvaluationOpinionInputDialog(getShell(), evaluationFactor, evalFactorResult);
// evaluationOpinionDialog.setTitle("请输入评审意见");
......@@ -1599,18 +1602,29 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
expertEvaluationResult.setAccessment(isUnqualified ? EvaluationStepEnum.UNQUALIFIED : EvaluationStepEnum.QUALIFIED);
//如果是合格的，意见不是空
boolean changeOpinion = false;
changeOpinion = !StringUtils.isNotEmpty(evalFactorResult.getEvaluationOpinion()) && EvaluationFactorEnum.CONFORM.equals(evalFactorResult.getEvaluationResult());
// boolean changeOpinion = false;
// changeOpinion = !StringUtils.isNotEmpty(evalFactorResult.getEvaluationOpinion()) && EvaluationFactorEnum.CONFORM.equals(evalFactorResult.getEvaluationResult());
if ((EvaluationFactorEnum.UNCONFORM.equals(evalFactorResult.getEvaluationResult()) && isUnqualified) || changeOpinion) {
// if ((EvaluationFactorEnum.UNCONFORM.equals(evalFactorResult.getEvaluationResult()) && isUnqualified) || changeOpinion) {
// if ((EvaluationFactorEnum.UNCONFORM.equals(evalFactorResult.getEvaluationResult()) && isUnqualified)) {
if (EvaluationFactorEnum.UNCONFORM.equals(content.toString())) {
EvaluationOpinionDialog dialog = new EvaluationOpinionDialog(getShell(), tenderProject, supplier, Constants.USER, expertEvaluationResult);
EvaluationOpinionDialog dialog = new EvaluationOpinionDialog(getShell(), tenderProject, supplier, Constants.USER, expertEvaluationResult,new CallBack() {
public void callBackBoolean(final boolean isEmpyt) {
if(isEmpyt) {
evalFactorResult.setEvaluationResult(content.toString());
expertEvaluationResult.setAccessment(EvaluationStepEnum.UNQUALIFIED);
}
}
});
// EvaluationOpinionDialog dialog = new EvaluationOpinionDialog(getShell(), tenderProject, supplier, Constants.USER, expertEvaluationResult);
dialog.setTitle(supplier.getSupplierName() +" - "+(deviateClauseCount > unqualifiedDeviateClauseCount && unqualifiedDeviateClauseCount > 0? ("偏离条款超过"+unqualifiedDeviateClauseCount+Messages.Number_2):"" )+"否决投标");
dialog.open();
// evalFactorResult.setEvaluationOpinion(expertEvaluationResult.getSupplierOpinion());
// showFactorEvaluationOpinion(evalFactorResult);
//evalFactorResult.setEvaluationOpinion(expertEvaluationResult.getSupplierOpinion());
showFactorEvaluationOpinion(evalFactorResult);
}
// 如果是客观项，检查所有评标专家的评标结果是否相同
if (isDeviateClause || EvaluationFactorEnum.OBJECTIVE_YES.equals(evaluationFactor.getObjective())) {
......
OBE-COMPONENTS-CORE/src/com/gx/obe/formula/CalculationParam.java
View file @ e13e309f
......@@ -6,6 +6,9 @@ import java.util.List;
import java.util.Map;
import com.gx.obe.message.Messages;
import com.gx.obe.util.utils.StringUtil;
import antlr.StringUtils;
/**
* @preserve private
......@@ -408,7 +411,7 @@ public class CalculationParam implements Serializable{
formula.append("×100%");
formula.append(" ");
formula.append("偏差率保留");
formula.append(getDeviateRatePoint());
formula.append(StringUtil.empty(getDeviateRatePoint())?"2":getDeviateRatePoint());
formula.append("位小数，之后一位四舍五入。");
formula.append("\r\n ");
formula.append("偏差率范围在[");
......@@ -461,7 +464,7 @@ public class CalculationParam implements Serializable{
formula.append("×100%");
formula.append(" ");
formula.append("偏差率保留");
formula.append(getDeviateRatePoint());
formula.append(StringUtil.empty(getDeviateRatePoint())?"2":getDeviateRatePoint());
formula.append("位小数，之后一位四舍五入。");
formula.append("\r\n ");
formula.append("偏差率范围在[");
......
OBE-CONFIG/config.properties
View file @ e13e309f
#update
#Thu Sep 21 17:29:07 CST 2023
#Tue Oct 10 09:20:36 CST 2023
allowImportBidFile=
decryptType=11
controlBidOpening=01
......@@ -15,7 +15,7 @@ excelColumnStart=0
useCamera=01
intervalsTime=10
showNowTime=01
updateTime=2021-12-22 09\:54\:04
updateTime=2023-09-26 15\:19\:14
serverPort=1987
video=JmfVideo
threshold=255
......@@ -71,7 +71,7 @@ roomuseWindenScreen=01
useVideoMeeting=01
meetingServerAddress=http\://1.202.77.139\:3231/
downProjectEndDays=30
version=OBEV7.7.9.20230602
version=OBEV7.7.9.20231009
supervisorSignature=01
proxyPort=
singTenderName=00
......@@ -138,7 +138,7 @@ GuoXinPDFReaderLicense=MjAyMSwxMiwyMiwyOTk5LDMsMg\=\=
viewTenderPrice=01
openOfficeServerPort=8100
videoPort=8000
lastDownloadProjectTime=1695288547063
lastDownloadProjectTime=1696900836876
defaultRecommonedCount=
passwordPatternTips=\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57\uFF0C\u4E14\u57286~10\u4F4D\u4E4B\u95F4\uFF01
lockStep=
......@@ -156,6 +156,7 @@ checkNewVersion=01
gfaServiceAddress=http\://60.209.80.97\:28443/soa/WSMServlet
videoMeetingUrl=114.116.148.159\:8181
versionUpdateType=OBE_Service
creditChinaDetialURL=https\://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo\=
qrCodeServcerAddress=http\://39.96.40.58\:8811/gxapp/scanning/
zipEncoding=GBK
viewEvaluationResult=01
......
OBE-CONFIG/config_final.properties
View file @ e13e309f
#\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20230714
version=OBEV7.7.9.20231009
keyCharacter=
#\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801
versionUpdateType=OBE_FinalService
......@@ -15,3 +15,5 @@ handSignaturePdf=BJCAHANDPDF
saomaSignaturePdf=
pdfActiveType=GuoXin
evalFullScreen=01
creditChinaURL=https://www.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids=
creditChinaDetialURL=https://www.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo=
OBE-CONFIG/config_test.properties
View file @ e13e309f
#\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20230602
version=OBEV7.7.9.20231009
keyCharacter=g
versionUpdateType=OBE_Service
#\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1
......@@ -14,3 +14,5 @@ handSignaturePdf=BJCAHANDPDF
saomaSignaturePdf=
pdfActiveType=GuoXin
evalFullScreen=01
creditChinaURL=https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingList&ids=
creditChinaDetialURL=https://test.powerbeijing-ec.com/jndzzb/creditChinaController.do?getZhixingDetail&creditNo=
\ No newline at end of file
OBE-MANAGEMENT/src/com/gx/obe/management/composite/SupplierEvaluactionOpinionComposite.java
View file @ e13e309f
......@@ -52,6 +52,8 @@ import com.gx.obe.web.service.expert.ExpertEvaluationResultService;
import com.swtdesigner.ResourceManager;
import com.swtdesigner.SWTResourceManager;
import fr.opensagres.xdocreport.core.utils.StringUtils;
public class SupplierEvaluactionOpinionComposite extends Composite {
private SupplierService supplierService = new SupplierService();
private TenderProjectEntity tenderProjectEntity;
......@@ -236,7 +238,8 @@ public class SupplierEvaluactionOpinionComposite extends Composite {
label_2.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.BOLD));
label_2.setForeground(ColorConstants.FONT_BLACK_COLOR);
label_2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
label_2.setText(Messages.Title_biddingFileRequir + "("+Messages.NoRequired+")");
//label_2.setText(Messages.Title_biddingFileRequir + "("+Messages.NoRequired+")");
label_2.setText(Messages.Title_biddingFileRequir);
requirementLength = new Label(composite_1, SWT.NONE);
requirementLength.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
......@@ -591,6 +594,10 @@ public class SupplierEvaluactionOpinionComposite extends Composite {
}
return;
}
if(requirementText.getText().trim().equals("")) {
MessageDialog.openShortMessage(getShell(),"招标文件要求不能为空!");
return;
}
if(supplierEvaluationResultService.saveSupplierEvaluationOpinion(true, tenderProjectEntity.getId(), supplier.getId(), requirementText.getText(), supplierEvalOpinionText.getText(),supplierEvaluationResult.getVetoType())){
supplierEvaluationResult.setApplyUserId(null);
MessageDialog.openShortMessage(Messages.Tips_saveSuccess);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment