Skip to content

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

京能提交12.21 

京能提交12.21
parent 98ba184e
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 165 deletions
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/composite/TianYanCheckComposite.java
View file @ 9d55d360
package com.gx.obe.evaluation.step.composite;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -26,7 +21,6 @@ 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.Dialog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
......@@ -46,11 +40,8 @@ import com.gx.obe.components.core.enumeration.TenderProjectEnum;
import com.gx.obe.config.ConfigConstants;
import com.gx.obe.config.utils.PropertiesUtils;
import com.gx.obe.evaluation.step.dialog.CreditChinaDialog;
import com.gx.obe.evaluation.step.dialog.CreditChinaDialog2;
import com.gx.obe.evaluation.step.inter.ITianYanCheckComposite;
import com.gx.obe.evaluation.step.listener.ExpertEvaluationListener;
import com.gx.obe.evaluation.step.listener.PriceReviewEvaluationListener;
import com.gx.obe.http.json.JsonUtil;
import com.gx.obe.util.utils.CollectionUtils;
import com.gx.obe.util.utils.Keys;
import com.gx.obe.util.utils.LogUtils;
......@@ -64,7 +55,6 @@ import com.gx.obe.web.entity.evaluation.EvaluationStep;
import com.gx.obe.web.entity.expert.Expert;
import com.gx.obe.web.entity.expert.ExpertEvaluationResult;
import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
import com.gx.obe.web.service.CheckResultService;
import com.gx.obe.web.service.ProjectRuleService;
import com.gx.obe.web.service.SupplierService;
......@@ -75,7 +65,6 @@ import com.gx.obe.web.service.expert.ExpertEvaluationStepService;
import com.gx.obe.web.service.expert.ExpertService;
import com.gx.tools.ole.DocumentFactory;
import com.gx.tools.ole.DocumentLoader;
import com.gx.utils.ActionLogUtils;
import com.swtdesigner.ResourceManager;
import com.swtdesigner.SWTResourceManager;
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/dialog/CreditChinaDialog.java
View file @ 9d55d360
package com.gx.obe.evaluation.step.dialog;
import java.awt.Cursor;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -12,44 +10,29 @@ import org.eclipse.nebula.widgets.grid.GridColumn;
import org.eclipse.nebula.widgets.grid.GridEditor;
import org.eclipse.nebula.widgets.grid.GridItem;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.core.utils.SwtUtils;
import org.eclipse.swt.core.MessageDialog;
import org.eclipse.swt.core.widgets.EDialog;
import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Color;
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.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
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;
import com.gx.obe.util.utils.ScreenUtils;
import com.gx.obe.web.entity.Supplier;
import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.swtdesigner.SWTResourceManager;
import org.eclipse.swt.core.MessageDialog;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
......
BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/review/composite/ExpertSignEvaluationComposite.java
View file @ 9d55d360
......@@ -5,6 +5,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.eclipse.nebula.widgets.grid.Grid;
import org.eclipse.nebula.widgets.grid.GridColumn;
import org.eclipse.nebula.widgets.grid.GridItem;
......@@ -35,6 +36,7 @@ import com.gx.obe.ColorConstants;
import com.gx.obe.WebserviceConstants;
import com.gx.obe.business.entity.SignatureFile;
import com.gx.obe.business.entity.SignatureUser;
import com.gx.obe.business.entity.Worker;
import com.gx.obe.business.http.HttpResponse;
import com.gx.obe.business.http.HttpUrl;
import com.gx.obe.business.http.HttpUtils;
......@@ -68,6 +70,7 @@ import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.gx.obe.web.service.ReportFileService;
import com.gx.obe.web.service.SupplierService;
import com.gx.obe.web.service.UserService;
import com.gx.obe.web.service.WorkerService;
import com.gx.obe.web.service.expert.ExpertEvaluationStepService;
import com.gx.obe.web.service.expert.ExpertService;
import com.gx.pdf.utils.transfer.TransferUtils;
......@@ -86,7 +89,7 @@ import com.swtdesigner.SWTResourceManager;
* @author guoyr
*/
public class ExpertSignEvaluationComposite extends Composite {
private WorkerService workerService = new WorkerService();
private TenderProjectEntity tenderProject;
private EvaluationStep evaluationStep;
private ExpertEvaluationListener expertEvaluationListener;
......@@ -116,6 +119,7 @@ public class ExpertSignEvaluationComposite extends Composite {
boolean hasSignatrueCommitment = false;
private TipsComposite tipsComposite;
private ExpertService expertService = new ExpertService();
private Logger logger = Logger.getLogger(ExpertSignEvaluationComposite.class);
{
LogUtils.logClass(ExpertSignEvaluationComposite.class);
......@@ -732,22 +736,50 @@ public class ExpertSignEvaluationComposite extends Composite {
* @author guoyr
*/
private void signAction(){
System.out.println();
if(saveBtn.getEnabled()){
if(!ValidateUtils.checkInput(userNameText.getParent()))return;
if(submitExpertSignEvaluationn(ExpertEnum.SIGN, null)){
goBackAction();
}else {
MessageDialog.openError(getShell(), Messages.Tips_operateFail);
return ;
}
//上传第一个签到时间
// Map<String, Map> biddingUser = new HashMap<>();
StringBuffer biddingBuffer = new StringBuffer();
List<Expert> expertList = expertService.getExpertListByTenderId(tenderProject.getId());
int i=0;
int index = 0;
for(Expert expert : expertList){
if(ExpertEnum.BIDDING.equals(expert.getExpertType())) {
if(i == 0) {
biddingBuffer.append(expert.getUser().getUserName()).append("_").append(expert.getUser().getPhone()).append("_").append(expert.getUser().getUserIdcard());
}else {
biddingBuffer.append("and").append(expert.getUser().getUserName()).append("_").append(expert.getUser().getPhone()).append("_").append(expert.getUser().getUserIdcard());
}
}
if(expert.getSignTime()!=null) {
i++;
index++;
}
i++;
}
if(i==0) {
List<Worker> workerList = workerService.getWorkerList(false,tenderProject.getId(), ExpertEnum.MONITOR);
StringBuffer jiandurenBuffer = new StringBuffer();
i=0;
if(null != workerList && workerList.size() > 0){
for(Worker Worker : workerList) {
if(i == 0) {
jiandurenBuffer.append(Worker.getUser().getUserName()).append("_").append(Worker.getUser().getPhone()).append("_").append(Worker.getUser().getUserIdcard());
i++;
}else {
jiandurenBuffer.append("and").append(Worker.getUser().getUserName()).append("_").append(Worker.getUser().getPhone()).append("_").append(Worker.getUser().getUserIdcard());
}
}
}
// if(index==0) {
HttpUrl httpUrl = HttpUtils.getProjectHttpUrl(tenderProject, PropertiesUtils.getWebserviceProperty(WebserviceConstants.PUSH_DATE_TO_VEDIO_PLAT_FORM, ""));
httpUrl.setName("上传第一个专家签到时间");
httpUrl.setAttribute("pushType", "01");
......@@ -756,10 +788,13 @@ public class ExpertSignEvaluationComposite extends Composite {
httpUrl.setAttribute("stageId", tenderProject.getStageId());
httpUrl.setAttribute("tenderNoNumber", tenderProject.getTenderNumber());
httpUrl.setAttribute("dateTime", NowTimeUtils.getDateTime());
httpUrl.setAttribute("jianduren", jiandurenBuffer.toString());
httpUrl.setAttribute("zhaobrdb", biddingBuffer.toString());
HttpResponse httpResponse = HttpUtils.doPost(httpUrl);
httpResponse.getStatus();
}
// }
goBackAction();
}
}
......
BID-OPENING/src/com/gx/obe/opening/composite/BidOpeningRemoteByProjectComposite.java
View file @ 9d55d360
......@@ -104,6 +104,7 @@ import com.gx.security.NowTimeUtils;
import com.gx.utils.ActionLogUtils;
import com.swtdesigner.ResourceManager;
import com.swtdesigner.SWTResourceManager;
import org.eclipse.swt.widgets.Label;
public class BidOpeningRemoteByProjectComposite extends OpeningTimeComposite implements BatchRemoteBidOpeningListener, BatchRemoteSignListener, BatchRemoteDecryptListener, BatchRemoteComplateAndUploadListener {
......@@ -523,6 +524,7 @@ public class BidOpeningRemoteByProjectComposite extends OpeningTimeComposite imp
}
WidgetUtils.setControlVisible(signatureBtn, showSignature);
WidgetUtils.setControlVisible(signatureNextBtn, showSignature);
new Label(operatorComposite, SWT.NONE);
meetingRoomListener.refreshOperator();
if(null != menuFunctions && MenuFunction.SHOW.equals(menuFunctions.getAuthority("SHOW_OPENING_TIPS"))){
showOpeningTips(bidOpeningBtn.getParent());
......
BID-OPENING/src/com/gx/obe/opening/composite/BidOpeningRemoteComposite.java
View file @ 9d55d360
......@@ -52,6 +52,8 @@ import org.eclipse.swt.widgets.Listener;
import com.gx.obe.ColorConstants;
import com.gx.obe.VideoConfigConstants;
import com.gx.obe.business.entity.MenuFunction;
import com.gx.obe.business.entity.Worker;
import com.gx.obe.business.enumeration.ExpertEnum;
import com.gx.obe.business.enumeration.MenuFunctionEnum;
import com.gx.obe.business.enumeration.SupplierEnum;
import com.gx.obe.common.dialog.BidOpeningReportDialog;
......@@ -106,6 +108,7 @@ import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
import com.gx.obe.web.service.ProjectRuleService;
import com.gx.obe.web.service.SupplierService;
import com.gx.obe.web.service.TenderProjectService;
import com.gx.obe.web.service.WorkerService;
import com.gx.obe.web.service.evaluation.EvaluationStepService;
import com.gx.obe.web.vo.TenderPackOpeningInfo;
import com.gx.security.NowTimeUtils;
......@@ -193,6 +196,7 @@ public class BidOpeningRemoteComposite extends OpeningTimeComposite implements S
private CountDownLabel countDownLabel;
private RoomOperatorButton startMeetingBtn;
private String publicType = "01";// 公开类型：默认或01为公开，02：不公开
private WorkerService workerService = new WorkerService();
/**
* Create the composite.
* @param parent
......@@ -1758,7 +1762,11 @@ public class BidOpeningRemoteComposite extends OpeningTimeComposite implements S
if(!checkStartDecrypt()){
return false;
}
List<Worker> workerList = workerService.getWorkerList(false,curTenderPack.getId(), ExpertEnum.MONITOR);
if(null == workerList || workerList.size() < 1) {
MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表及监督人！");//(getShell(), message.toString());
return false;
}
// if(!CommonEnum.YES.equals(curTenderPack.getLatestBidinfo())){//强制在解密时同步
if((showTips && !CommonEnum.COMPLETE.equals(curTenderPack.getBidOpeningStatus())) || !CommonEnum.YES.equals(curTenderPack.getLatestBidinfo())){
// 经济标不强制同步
......
BID-OPENING/src/com/gx/obe/opening/composite/BidOpeningRuleComposite.java
View file @ 9d55d360
......@@ -248,6 +248,8 @@ public class BidOpeningRuleComposite extends Composite {
ESepator bidPriceLimitSep = new ESepator(singBidPriceLimitComposite, SWT.NONE);
bidPriceLimitSep.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
bidPriceLimitSep.setBackground(ColorConstants.BORDER_LINE_COLOR);
new Label(singBidPriceLimitParentComposite, SWT.NONE);
new Label(singBidPriceLimitParentComposite, SWT.NONE);
Label label = new Label(baseRoleComposite, SWT.NONE);
label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
......@@ -316,8 +318,7 @@ public class BidOpeningRuleComposite extends Composite {
}
});
saveBtn.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.BOLD));
GridData gd_savebutton_1 = new GridData(SWT.CENTER, SWT.FILL, true, true, 1, 1);
saveBtn.setLayoutData(gd_savebutton_1);
saveBtn.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, true, 1, 1));
saveBtn.setText(Messages.Button_save);
menuFunctionUtils.addFunction(saveBtn, "SAVE");
tenderProjectService = new TenderProjectService();
......
BID-OPENING/src/com/gx/obe/opening/dialog/BatchRemoteBidOpeningDialog.java
View file @ 9d55d360
......@@ -33,6 +33,8 @@ import org.eclipse.swt.widgets.Shell;
import com.gx.obe.ColorConstants;
import com.gx.obe.business.entity.MenuFunction;
import com.gx.obe.business.entity.Worker;
import com.gx.obe.business.enumeration.ExpertEnum;
import com.gx.obe.business.enumeration.MenuFunctionEnum;
import com.gx.obe.common.icons.IconsActivator;
import com.gx.obe.common.widget.utils.MenuFunctionUtils;
......@@ -44,6 +46,7 @@ import com.gx.obe.config.utils.PropertiesUtils;
import com.gx.obe.message.Messages;
import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.gx.obe.web.service.TenderProjectService;
import com.gx.obe.web.service.WorkerService;
import com.gx.obe.web.vo.TenderPackOpeningInfo;
import com.swtdesigner.ResourceManager;
import com.swtdesigner.SWTResourceManager;
......@@ -75,7 +78,7 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
private Date bidOpeningTime;
private ELink selectionAllEffectiveBtn;
private boolean anonymousAllInfo = false;
private WorkerService workerService = new WorkerService();
/**
* Create the dialog.
......@@ -596,6 +599,13 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
MessageDialog.openShortMessage("请至少选择一个要远程解密的"+PACK_NAME+"！");
return;
}
for(TenderProjectEntity tenderProject: tenderPackList ) {
List<Worker> workerList = workerService.getWorkerList(false,tenderProject.getId(), ExpertEnum.MONITOR);
if(null == workerList || workerList.size() < 1) {
MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表及监督人！");//(getShell(), message.toString());
return;
}
}
if(isFocus){
StringBuilder msg = new StringBuilder();
if(effectiveNoThreeCount > 0){
......
OBE-COMPONENTS-CORE/L2HF7BA0858.cer deleted 100644 → 0
View file @ 98ba184e
PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGNlcnQ+PGNlcnRJZD4zPC9jZXJ0SWQ+PHByb2R1Y3Q+T0JFPC9wcm9kdWN0PjxtYWM+OUUtQTQtMkQtMzQtQzctRDI8L21hYz48bW90aGVyQm9hcmRTTj45RUE0MkQzNEM3RDI8L21vdGhlckJvYXJkU04+PGNlcnRUeXBlPlRyaWFsPC9jZXJ0VHlwZT48bmFtZT4zMDAwNSAyMzM3NiAyNDMyMCAzNTc4MCAyNjYzMTwvbmFtZT48YXV0aG9yPjI0MzIwIDI2NjMxIDI2NjMxIDI0MDM3IDIwODU1IDM4MjcxIDI2Mzk5IDI1NDgwIDI2NDM1PC9hdXRob3I+PHZlcnNpb24+VjcuMDwvdmVyc2lvbj48bnVtQ29waWVzPjE8L251bUNvcGllcz48ZXhwaXJlc0RhdGU+MjA0MC0xMi0zMSAyMzo1OTowMDwvZXhwaXJlc0RhdGU+PGV4cGlyZXNUaW1lcz4wPC9leHBpcmVzVGltZXM+PGNyZWF0aW9uRGF0ZT4yMDIxLTEyLTIyIDEwOjM1OjMyPC9jcmVhdGlvbkRhdGU+PHNpZ25hdHVyZT4zMDJjMDIxNDIzYjkwYjM4ZTY1OWRkNjQ1YTgzYWVjNzAyMzUwZGQ0YjBkYmUxZjQwMjE0NmFhODAxZDM4YjM2YjI1Zjg3ZWIzZGE1NzgxZDA0ZGRhZjhiM2I3MTwvc2lnbmF0dXJlPjxpc3N1ZXI+MjEyNzEgMjAxNDAgMjIyNjkgMjA0NDkgMjEwMTkgMjYwMzIgMzExODUgMjUyMTYgMzI5MjkgMjAyMjEgMjYzNzcgMzg0ODAgMjA4NDQgMjE0OTY8L2lzc3Vlcj48L2NlcnQ+
\ No newline at end of file
OBE-COMPONENTS-CORE/src/com/gx/obe/formula/CalculationParam.java
View file @ 9d55d360
......@@ -6,9 +6,6 @@ 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
......@@ -411,7 +408,7 @@ public class CalculationParam implements Serializable{
formula.append("×100%");
formula.append(" ");
formula.append("偏差率保留");
formula.append(StringUtil.empty(getDeviateRatePoint())?"2":getDeviateRatePoint());
formula.append(getDeviateRatePoint());
formula.append("位小数，之后一位四舍五入。");
formula.append("\r\n ");
formula.append("偏差率范围在[");
......@@ -464,7 +461,7 @@ public class CalculationParam implements Serializable{
formula.append("×100%");
formula.append(" ");
formula.append("偏差率保留");
formula.append(StringUtil.empty(getDeviateRatePoint())?"2":getDeviateRatePoint());
formula.append(getDeviateRatePoint());
formula.append("位小数，之后一位四舍五入。");
formula.append("\r\n ");
formula.append("偏差率范围在[");
......
OBE-CONFIG/config.properties
View file @ 9d55d360
#update
#Tue Oct 10 09:20:36 CST 2023
#Wed Jul 12 17:10:20 CST 2023
allowImportBidFile=
decryptType=11
controlBidOpening=01
......@@ -15,7 +15,7 @@ excelColumnStart=0
useCamera=01
intervalsTime=10
showNowTime=01
updateTime=2023-09-26 15\:19\:14
updateTime=2021-12-22 09\:54\:04
serverPort=1987
video=JmfVideo
threshold=255
......@@ -43,8 +43,8 @@ defaultStepProgress=02
passwordPattern=^(?\![0-9]+$)(?\![a-zA-Z]+$)[0-9A-Za-z\!@\#$%^&*?]{6,10}$
rebackEvaluation=01
monitoringCenterAddress=http\://1.202.77.139\:9587/
properties_path=/D\:/Developer/EclipseTool/eclipse-rcp-photon-R-win32/../../../GitHub/\u4EAC\u80FD/jingneng/OBE-CONFIG/config.properties
templateUpdateTime=2023-09-14 13\:11\:12
properties_path=/E\:/gitworkspace/mainline7.0/jingneng1/jingneng/OBE-CONFIG/config.properties
templateUpdateTime=2023-06-20 10\:45\:50
appServiceIsParallel=true
serverName=\u4EAC\u80FD\u96C6\u56E2\u7535\u5B50\u5546\u52A1\u5E73\u53F0(\u6D4B\u8BD5)
showUploadMaterial=00
......@@ -71,7 +71,7 @@ roomuseWindenScreen=01
useVideoMeeting=01
meetingServerAddress=http\://1.202.77.139\:3231/
downProjectEndDays=30
version=OBEV7.7.9.20231009
version=OBEV7.7.9.20230602
supervisorSignature=01
proxyPort=
singTenderName=00
......@@ -138,7 +138,7 @@ GuoXinPDFReaderLicense=MjAyMSwxMiwyMiwyOTk5LDMsMg\=\=
viewTenderPrice=01
openOfficeServerPort=8100
videoPort=8000
lastDownloadProjectTime=1696900836876
lastDownloadProjectTime=1689153020623
defaultRecommonedCount=
passwordPatternTips=\u5BC6\u7801\u5FC5\u987B\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57\uFF0C\u4E14\u57286~10\u4F4D\u4E4B\u95F4\uFF01
lockStep=
......@@ -156,7 +156,6 @@ 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 @ 9d55d360
#\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20231009
version=OBEV7.7.9.20230602
keyCharacter=
#\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801
versionUpdateType=OBE_FinalService
......@@ -15,5 +15,3 @@ 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 @ 9d55d360
#\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20231009
version=OBEV7.7.9.20230602
keyCharacter=g
versionUpdateType=OBE_Service
#\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1
......@@ -14,5 +14,3 @@ 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/action/LoadEvaluationResultCommonAction.java
View file @ 9d55d360
......@@ -37,8 +37,6 @@ import com.gx.obe.evaluation.step.review.action.LimitPriceEvaluationAction;
import com.gx.obe.evaluation.step.review.action.MultiWheelPriceEvaluationAction;
import com.gx.obe.evaluation.step.review.action.PriceEvaluationAction;
import com.gx.obe.evaluation.step.review.action.RecommonedEvaluationAction;
import com.gx.obe.evaluation.step.review.action.TianYanCheckAction;
import com.gx.obe.evaluation.step.review.action.TianYanCheckEvaluationAction;
import com.gx.obe.evaluation.step.review.action.TianYanCheckResultAction;
import com.gx.obe.evaluation.step.review.action.TotalPriceEvaluationAction;
import com.gx.obe.evaluation.step.review.action.VetoBidEvaluationAction;
......@@ -103,14 +101,6 @@ public class LoadEvaluationResultCommonAction extends Action {
} else if (evaluationStep.getStepType().equals(EvaluationStepEnum.ASSOCIATION_QUERY)) {
action = (Action) ActionUtil.getAction(TianYanCheckResultAction.class.getName());
action.setData("expertEvaluationListener", expertEvaluationListener);
// if (isOperatorRole && !isComplate) {
// action = (Action) ActionUtil.getAction(TianYanCheckAction.class.getName());
// action.setData("hideLeft", true);
// action.setData("expertEvaluationListener", expertEvaluationListener);
// action.setData("TianyanCheck", "true");
// } else {
// action = (Action) ActionUtil.getAction(TianYanCheckResultAction.class.getName());
// }
}else if (evaluationStep.getStepType().equals(EvaluationStepEnum.CLEAN_TENDER)) {
action = (Action) ActionUtil.getAction(ClearTenderEvaluationResultAction.class.getName());
action.setData("expertEvaluationListener", expertEvaluationListener);
......
OBE-MANAGEMENT/src/com/gx/obe/management/composite/SupplierEvaluactionOpinionComposite.java
View file @ 9d55d360
......@@ -52,8 +52,6 @@ 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;
......@@ -238,8 +236,7 @@ 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);
label_2.setText(Messages.Title_biddingFileRequir + "("+Messages.NoRequired+")");
requirementLength = new Label(composite_1, SWT.NONE);
requirementLength.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
......@@ -594,11 +591,7 @@ 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())){
if(supplierEvaluationResultService.saveSupplierEvaluationOpinion(true, tenderProjectEntity.getId(), supplier.getId(), requirementText.getText(), supplierEvalOpinionText.getText(),null)){
supplierEvaluationResult.setApplyUserId(null);
MessageDialog.openShortMessage(Messages.Tips_saveSuccess);
}else {
......
OBE-REPORT/src/com/gx/obe/report/composite/ReportContainerComposite.java
View file @ 9d55d360
......@@ -42,7 +42,6 @@ import com.gx.obe.report.composite.EvaluationReportComposite.ReportListener;
import com.gx.obe.report.dataset.ReportDataSetProvider;
import com.gx.obe.report.listener.ReportGenerateListener;
import com.gx.obe.report.utils.CreateReportThread;
import com.gx.obe.report.utils.WordAddBreakUtils;
import com.gx.obe.template.entity.ProjectTemplate;
import com.gx.obe.util.utils.FileUtils;
import com.gx.obe.util.utils.StringUtils;
......@@ -395,10 +394,6 @@ public class ReportContainerComposite extends Composite {
}
public void afterGenerate(ProjectTemplate templateFile, boolean generate, String reportPath) {
if(generate) {
//对于"评标报告"需要对得分公式需要得描述进行格式设置
if(templateFile.getLocalTemplateName().equals("评标报告 .docx") && reportPath.substring(reportPath.lastIndexOf(File.separator)+1,reportPath.length()).equals("评标报告 .docx")) {
WordAddBreakUtils.writer(reportPath, reportPath);
}
final FileOperatorButton fileOperatorButton = fileOperatorButtonMap.get(new File(reportPath).getAbsolutePath());
if(null != fileOperatorButton && !fileOperatorButton.isDisposed()){
Display.getDefault().syncExec(new Runnable(){
......
OBE-REPORT/src/com/gx/obe/report/dataset/word/JingNengEvaluationReportDataSet.java
View file @ 9d55d360
......@@ -458,7 +458,6 @@ public class JingNengEvaluationReportDataSet extends BaseDateSet {
priceParam = PriceParam.deserializePriceParam(evaluationFactor.getComputerParams());
}
if (priceParam != null) {
String separator=System.getProperty("line.separator");
formula = priceParam.getFormula();
}
if (!StringUtils.isEmpty(formula)) {
......
OBE-REPORT/src/com/gx/obe/report/utils/CreateReportThread.java
View file @ 9d55d360
......@@ -187,10 +187,6 @@ public class CreateReportThread implements Runnable{
public void afterGenerate(boolean generate, String reportPath) {
if(generate && null != reportPath){
ActionLogUtils.addServerLog(null,"生成word报告", reportPath);
//对于"评标报告"需要对得分公式需要得描述进行格式设置
if(reportPath.substring(reportPath.lastIndexOf(File.separator)+1,reportPath.length()).equals("评标报告 .docx")) {
WordAddBreakUtils.writer(reportPath, reportPath);
}
File file = new File(reportPath);
if(file.exists()){
if(isCreatePdfFile){
......
OBE-REPORT/src/com/gx/obe/report/utils/WordAddBreakUtils.java deleted 100644 → 0
View file @ 98ba184e
package com.gx.obe.report.utils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.List;
import org.apache.log4j.Logger;
import org.apache.poi.POIXMLDocument;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBookmark;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDocument1;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
public class WordAddBreakUtils {
private static Logger logger = Logger.getLogger(WordAddBreakUtils.class);
private final static String BOOK_MARK = "formula_param";
private final static String BREAK="\\n";
public static void writer(String inputSrc, String outSrc) {
try {
File file = new File(inputSrc);
// 获取文件输出流
FileInputStream fileInputStream = new FileInputStream (file);
// 创建操作word的对象
XWPFDocument doc = new XWPFDocument(fileInputStream);
List<XWPFParagraph> paragraphs = doc.getParagraphs();
for(XWPFParagraph p :paragraphs){
CTP ctp = p.getCTP();
for(int i=0;i<ctp.sizeOfBookmarkStartArray();i++){
CTBookmark ctBookmark = ctp.getBookmarkStartArray(i);
if(ctBookmark.getName().equals(BOOK_MARK)){
List<XWPFRun> runs = p.getRuns();
if (runs != null) {
for (XWPFRun r : runs) {
//需要替换的文本
String text = r.getText(0);
//替换指定的文本
r.setText("",0);
String[] split = text.split(BREAK);
for(String textSlice : split){
r.setText(textSlice);
r.addBreak();
}
}
}
}
}
}
doc.write(new FileOutputStream(outSrc));
System.out.println("评标报告替换完成");
logger.error("评标报告替换完成");
} catch (IOException e) {
logger.error("评标报告替换失败");
e.printStackTrace();
}
}
public static void main(String[] args) throws IOException, InvalidFormatException {
//文件路径
String srcPath = "C:/bidFile/e6e67506e92c4b7b80aa4581fd1a4808/reportFile/临时报表/评标报告 .docx";
srcPath = URLDecoder.decode(srcPath, "UTF-8");
//替换后新文件的路径
String destPath = "C:/bidFile/e6e67506e92c4b7b80aa4581fd1a4808/reportFile/临时报表/评标报告 .docx";
writer(srcPath,destPath);
}
}
com.gx.obe.quote/src/com/gx/obe/quote/dialog/ModifyBidPriceDialog.java
View file @ 9d55d360
......@@ -224,7 +224,7 @@ public class ModifyBidPriceDialog extends EDialog {
String modifyReason = modifyReason_text.getText();
if (VerificationUtils.ver(modifyReason_text, modifyReason::isEmpty, "修正原因不能为空！")) return;
if (evaluationStepService.isCompletePriceAndRecommendStep(tenderId)) {
if (evaluationStepService.isCompletePriceAndRecommonedStep(tenderId)) {
MessageDialog.openWarning(getShell(), "已完成价格评审或推荐中标候选人，无法修正投标价！");
return;
}
......
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