Skip to content

京
京能客户端
Commit 34152210 authored by 黄重's avatar 黄重
Browse files
Options

正式站代码提交

parent 89f5546c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2811 additions and 2001 deletions
BID-OPENING/src/com/gx/obe/opening/dialog/BatchRemoteBidOpeningDialog.java
View file @ 34152210
......@@ -603,6 +603,7 @@ public class BatchRemoteBidOpeningDialog extends EDialog {
List<Worker> workerList = workerService.getWorkerList(false,tenderProject.getId(), ExpertEnum.MONITOR);
if(null == workerList || workerList.size() < 1) {
MessageDialog.openError(getShell(), "请先在评标管理中设置招标人代表及监督人！");//(getShell(), message.toString());
tenderPackList.clear();
return;
}
}
......
OBE-BUSINESS/src/com/gx/obe/web/utils/NetworkRequest.java
View file @ 34152210
......@@ -133,7 +133,9 @@ public class NetworkRequest {
*/
private static Map<String, String> getHeaderMap(){
Map<String, String> headerMap = new HashMap<String, String>();
headerMap.put("userName", Constants.USER.getUserAccount());
if(null != Constants.USER && null != Constants.USER.getUserAccount()) {
headerMap.put("userName", Constants.USER.getUserAccount());
}
headerMap.put("ATUOKTHEN", Constants.TOKEN);
return headerMap;
}
......
OBE-COMMON-TOOLS/src/com/gx/tools/ole/bjca/BJCAHandPDFLoaderImpl.java
View file @ 34152210
......@@ -35,7 +35,7 @@ public class BJCAHandPDFLoaderImpl extends DocumentLoader {
private OleControlSite site;
private OleAutomation oleAutomation;
private AutomationWrapper automaticWrapper;
// private BJCAHandSignThread bjcaHandSignThread;
private BJCAHandSignThread bjcaHandSignThread;
private BJCAHandSignListener handSignListener;
private File file;
private Logger LOG = Logger.getLogger(BJCAHandPDFLoaderImpl.class);
......@@ -175,10 +175,10 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
* @return
*/
public boolean openFile(File file){
// if(null != bjcaHandSignThread) {
// bjcaHandSignThread.stop();
// bjcaHandSignThread = null;
// }
if(null != bjcaHandSignThread) {
bjcaHandSignThread.stop();
bjcaHandSignThread = null;
}
this.file = file;
if(null != file && file.exists() && null != automaticWrapper){
Display.getDefault().syncExec(new Runnable(){
......@@ -337,11 +337,11 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
// int[] ids = oleAutomation.getIDsOfNames(new String[] {"Pdf_GetSealCount"});
int[] ids = oleAutomation.getIDsOfNames(new String[] {"pdf_get_sealcount"});
int totalCount = 0;
totalCount += oleAutomation.invoke(ids[0], new Variant[] {new Variant(0)}).getInt();
// if(null != ids) {
if(null != ids) {
totalCount += oleAutomation.invoke(ids[0], new Variant[] {new Variant(0)}).getInt();
// for(int i = 1 ; i <= pageCount; i++) {
// }
// }
}
if(totalCount > 0){
signatureCount = totalCount;
}
......@@ -424,7 +424,7 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
if(null != handSignListener) {
handSignListener.signScript();
}
// startSignListenerThread();
startSignListenerThread();
signatureCount ++;
}else {
if(null != handSignListener) {
......@@ -433,31 +433,7 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
}
}
}
/**
* @Description: 签章复用
* @author guoyr
*/
public void getSignImage() {
if(null != automaticWrapper){
String returnValue = automaticWrapper.invoke("Pdf_Get_ScriptImg").getString();
String returnValue2 = automaticWrapper.invoke("Pdf_Get_FpImg").getString();
System.out.println(returnValue);
System.out.println("\r\n");
System.out.println(returnValue2);
// if(returnValue == 0){
// if(null != handSignListener) {
// handSignListener.signScript();
// }
//// startSignListenerThread();
// signatureCount ++;
// }else {
// if(null != handSignListener) {
// handSignListener.signatrue(false);
// }
// }
}
}
/**
* @Description: 添加签章
* @author guoyr
......@@ -483,7 +459,7 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
if(null != handSignListener) {
handSignListener.signScript();
}
// startSignListenerThread();
startSignListenerThread();
// signatureCount ++;
}else {
if(null != handSignListener) {
......@@ -493,17 +469,17 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
}
}
//
// private void startSignListenerThread() {
// if(null != bjcaHandSignThread) {
// bjcaHandSignThread.stop();
// bjcaHandSignThread = null;
// }
// if(null != handSignListener) {
// bjcaHandSignThread = new BJCAHandSignThread(this, handSignListener);
// bjcaHandSignThread.start();
// }
// }
private void startSignListenerThread() {
if(null != bjcaHandSignThread) {
bjcaHandSignThread.stop();
bjcaHandSignThread = null;
}
if(null != handSignListener) {
bjcaHandSignThread = new BJCAHandSignThread(this, handSignListener);
bjcaHandSignThread.start();
}
}
public AutomationWrapper getAutomationWrapper(){
return automaticWrapper;
......
OBE-COMPONENTS-MESSAGES/bin/com/gx/obe/message/messages.properties
View file @ 34152210
#Eclipse modern messages class
#Thu Jun 08 17:37:46 CST 2023
#Tue Jan 23 11:29:02 CST 2024
About=\u5173\u4E8E
AboutAttachment=\u76F8\u5173\u9644\u4EF6
AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
......@@ -653,6 +653,22 @@ FeatureCode=\u7279\u5F81\u7801
Female=\u5973
FetchingNumber=\u8303\u56F4\u5185\u53D6\u503C\u6570\u91CF
File=\u6587\u4EF6
FileDownloadShell2_label_10_text=\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF01
FileDownloadShell2_label_11_text=\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E\u6210\u529F\uFF01
FileDownloadShell2_label_12_text=\u5F00\u59CB\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\uFF01
FileDownloadShell2_label_13_text=\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF01
FileDownloadShell2_label_14_text="\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\u6210\u529F\uFF01"
FileDownloadShell2_label_15_text=\u89E3\u6790\u7ED3\u6784\u5316\u6570\u636E\u7ED3\u675F\uFF01
FileDownloadShell2_label_1_text=\u5F00\u59CB\u89E3\u6790\u62DB\u6807\u6587\u4EF6\u89C4\u5219..."
FileDownloadShell2_label_2_text=\u5F00\u59CB\u83B7\u53D6\u83B7\u53D6\u4F9B\u5E94\u5546\u5217\u8868...
FileDownloadShell2_label_3_text=\u4F9B\u5E94\u5546\u5217\u8868\u83B7\u53D6\u5931\u8D25
FileDownloadShell2_label_4_text=\u4F9B\u5E94\u5546\u5217\u8868\u83B7\u53D6\u6210\u529F
FileDownloadShell2_label_5_text=\u5F00\u59CB\u89E3\u6790\u7ED3\u6784\u5316\u6807\u4E66\u7ED3\u6784...
FileDownloadShell2_label_6_text=\u89E3\u6790\u62DB\u6807\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u4E0B\u8F7D\u62DB\u6807\u6587\u4EF6\uFF01
FileDownloadShell2_label_7_text=\u7ED3\u6784\u5316\u6807\u4E66\u7ED3\u6784\u89E3\u6790\u6210\u529F\uFF01
FileDownloadShell2_label_8_text=\u6B63\u5728\u89E3\u6790
FileDownloadShell2_label_9_text=\u7ED3\u6784\u5316\u6570\u636E...
FileDownloadShell2_lblNewLabel_text=\u5F00\u59CB\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E
FileName=\u6587\u4EF6\u540D\u79F0
FileSize=\u6587\u4EF6\u5927\u5C0F
FilterConditions=\u8FC7\u6EE4\u6761\u4EF6
......@@ -768,6 +784,34 @@ LoginDialog_connectionFail=\u670D\u52A1\u5668\u8FDE\u63A5\u5931\u8D25\uFF01
LoginDialog_editConfig=\u4FEE\u6539\u914D\u7F6E
LoginDialog_environment=\u73AF\u5883\u68C0\u6D4B
LoginDialog_installCaDriverTips=\u82E5\u60A8\u7684\u7535\u8111\u5C1A\u672A\u5B89\u88C5USBKey\u9A71\u52A8\u7A0B\u5E8F\uFF0C\u8BF7\u5148\u5B89\u88C5\u3002
LoginDialog_label_10_text=\u4F01\u4E1A\u8D44\u8D28\u7B49\u7EA7
LoginDialog_label_11_text=\u6CE8\u518C\u8D44\u91D1(\u4E07\u5143 )
LoginDialog_label_12_text=\u8425\u4E1A\u6267\u7167\u53F7
LoginDialog_label_13_text=\u5F00\u6237\u94F6\u884C
LoginDialog_label_14_text=\u94F6\u884C\u8D26\u53F7
LoginDialog_label_15_text=\u8D22\u52A1\u5E74\u5EA6\u62A5\u544A
LoginDialog_label_16_text=\u8D44\u4EA7\u603B\u989D(\u4E07\u5143)
LoginDialog_label_17_text=\u8D1F\u503A\u989D(\u4E07\u5143)
LoginDialog_label_18_text=\u8D44\u4EA7\u8D1F\u503A\u7387(%)
LoginDialog_label_19_text=\u4E3B\u8425\u4E1A\u52A1\u6536\u5165(\u4E07\u5143)
LoginDialog_label_1_text=\u4F9B\u5E94\u5546\u540D\u79F0
LoginDialog_label_20_text=\u51C0\u5229\u6DA6(\u4E07\u5143)
LoginDialog_label_21_text=\u51C0\u5229\u7387(%)
LoginDialog_label_22_text=\u9879\u76EE\u540D\u79F0
LoginDialog_label_23_text=\u9879\u76EE\u6240\u5728\u5730
LoginDialog_label_24_text=\u53D1\u5305\u4EBA\u540D\u79F0
LoginDialog_label_25_text=\u53D1\u5305\u4EBA\u5730\u5740
LoginDialog_label_26_text=\u53D1\u5305\u4EBA\u7535\u8BDD
LoginDialog_label_27_text=\u5408\u540C\u4EF7\u683C(\u4E07\u5143)
LoginDialog_label_28_text=\u5F00\u5DE5\u65E5\u671F
LoginDialog_label_29_text=\u8BA1\u5212\u7AE3\u5DE5\u65E5\u671F
LoginDialog_label_2_text=\u6CE8\u518C\u5730\u5740
LoginDialog_label_30_text=\u5F53\u524D\u6307\u6807\u672A\u7ED1\u5B9A\u8BC4\u5BA1\u70B9
LoginDialog_label_3_text=\u8054\u7CFB\u4EBA
LoginDialog_label_5_text=\u7EC4\u7EC7\u673A\u6784
LoginDialog_label_6_text=\u6CD5\u4EBA\u540D\u79F0
LoginDialog_label_7_text=\u6280\u672F\u8D1F\u8D23\u4EBA\u540D\u79F0
LoginDialog_label_8_text=\u6210\u7ACB\u65F6\u95F4
LoginDialog_login=\u767B \u5F55
LoginDialog_logoIco=icons/login/logo.png
LoginDialog_machineCode=\u673A\u4F4D\u6807\u8BC6\u7801
......
OBE-COMPONENTS-MESSAGES/bin/com/gx/obe/message/messages_zh_CN.properties
View file @ 34152210
This source diff could not be displayed because it is too large. You can view the blob instead.
OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/Messages.java
View file @ 34152210
......@@ -1913,6 +1913,22 @@ public class Messages extends NLS {
public static String LoginDialog_label_28_text;
public static String LoginDialog_label_29_text;
public static String LoginDialog_label_30_text;
public static String FileDownloadShell2_label_1_text;
public static String FileDownloadShell2_label_2_text;
public static String FileDownloadShell2_label_3_text;
public static String FileDownloadShell2_label_4_text;
public static String FileDownloadShell2_label_5_text;
public static String FileDownloadShell2_label_6_text;
public static String FileDownloadShell2_label_7_text;
public static String FileDownloadShell2_lblNewLabel_text;
public static String FileDownloadShell2_label_8_text;
public static String FileDownloadShell2_label_9_text;
public static String FileDownloadShell2_label_10_text;
public static String FileDownloadShell2_label_11_text;
public static String FileDownloadShell2_label_12_text;
public static String FileDownloadShell2_label_13_text;
public static String FileDownloadShell2_label_14_text;
public static String FileDownloadShell2_label_15_text;
static {
......
OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/messages.properties
View file @ 34152210
#Eclipse modern messages class
#Sun Nov 19 21:49:57 CST 2023
#Tue Jan 23 11:29:02 CST 2024
About=\u5173\u4E8E
AboutAttachment=\u76F8\u5173\u9644\u4EF6
AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
......@@ -653,6 +653,22 @@ FeatureCode=\u7279\u5F81\u7801
Female=\u5973
FetchingNumber=\u8303\u56F4\u5185\u53D6\u503C\u6570\u91CF
File=\u6587\u4EF6
FileDownloadShell2_label_10_text=\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF01
FileDownloadShell2_label_11_text=\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E\u6210\u529F\uFF01
FileDownloadShell2_label_12_text=\u5F00\u59CB\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\uFF01
FileDownloadShell2_label_13_text=\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF01
FileDownloadShell2_label_14_text="\u4FDD\u5B58\u7ED3\u6784\u5316\u6570\u636E\u6210\u529F\uFF01"
FileDownloadShell2_label_15_text=\u89E3\u6790\u7ED3\u6784\u5316\u6570\u636E\u7ED3\u675F\uFF01
FileDownloadShell2_label_1_text=\u5F00\u59CB\u89E3\u6790\u62DB\u6807\u6587\u4EF6\u89C4\u5219..."
FileDownloadShell2_label_2_text=\u5F00\u59CB\u83B7\u53D6\u83B7\u53D6\u4F9B\u5E94\u5546\u5217\u8868...
FileDownloadShell2_label_3_text=\u4F9B\u5E94\u5546\u5217\u8868\u83B7\u53D6\u5931\u8D25
FileDownloadShell2_label_4_text=\u4F9B\u5E94\u5546\u5217\u8868\u83B7\u53D6\u6210\u529F
FileDownloadShell2_label_5_text=\u5F00\u59CB\u89E3\u6790\u7ED3\u6784\u5316\u6807\u4E66\u7ED3\u6784...
FileDownloadShell2_label_6_text=\u89E3\u6790\u62DB\u6807\u7ED3\u6784\u5316\u6570\u636E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u4E0B\u8F7D\u62DB\u6807\u6587\u4EF6\uFF01
FileDownloadShell2_label_7_text=\u7ED3\u6784\u5316\u6807\u4E66\u7ED3\u6784\u89E3\u6790\u6210\u529F\uFF01
FileDownloadShell2_label_8_text=\u6B63\u5728\u89E3\u6790
FileDownloadShell2_label_9_text=\u7ED3\u6784\u5316\u6570\u636E...
FileDownloadShell2_lblNewLabel_text=\u5F00\u59CB\u89E3\u6790\u6295\u6807\u7ED3\u6784\u5316\u6570\u636E
FileName=\u6587\u4EF6\u540D\u79F0
FileSize=\u6587\u4EF6\u5927\u5C0F
FilterConditions=\u8FC7\u6EE4\u6761\u4EF6
......@@ -776,12 +792,11 @@ LoginDialog_label_14_text=\u94F6\u884C\u8D26\u53F7
LoginDialog_label_15_text=\u8D22\u52A1\u5E74\u5EA6\u62A5\u544A
LoginDialog_label_16_text=\u8D44\u4EA7\u603B\u989D(\u4E07\u5143)
LoginDialog_label_17_text=\u8D1F\u503A\u989D(\u4E07\u5143)
LoginDialog_label_18_text=\u8D44\u4EA7\u8D1F\u503A\u7387
LoginDialog_label_18_text=\u8D44\u4EA7\u8D1F\u503A\u7387(%)
LoginDialog_label_19_text=\u4E3B\u8425\u4E1A\u52A1\u6536\u5165(\u4E07\u5143)
LoginDialog_label_1_text=\u4F9B\u5E94\u5546\u540D\u79F0
LoginDialog_label_30_text=\u5F53\u524D\u6307\u6807\u672A\u7ED1\u5B9A\u8BC4\u5BA1\u70B9
LoginDialog_label_20_text=\u51C0\u5229\u6DA6(\u4E07\u5143)
LoginDialog_label_21_text=\u51C0\u5229\u7387
LoginDialog_label_21_text=\u51C0\u5229\u7387(%)
LoginDialog_label_22_text=\u9879\u76EE\u540D\u79F0
LoginDialog_label_23_text=\u9879\u76EE\u6240\u5728\u5730
LoginDialog_label_24_text=\u53D1\u5305\u4EBA\u540D\u79F0
......@@ -791,6 +806,7 @@ LoginDialog_label_27_text=\u5408\u540C\u4EF7\u683C(\u4E07\u5143)
LoginDialog_label_28_text=\u5F00\u5DE5\u65E5\u671F
LoginDialog_label_29_text=\u8BA1\u5212\u7AE3\u5DE5\u65E5\u671F
LoginDialog_label_2_text=\u6CE8\u518C\u5730\u5740
LoginDialog_label_30_text=\u5F53\u524D\u6307\u6807\u672A\u7ED1\u5B9A\u8BC4\u5BA1\u70B9
LoginDialog_label_3_text=\u8054\u7CFB\u4EBA
LoginDialog_label_5_text=\u7EC4\u7EC7\u673A\u6784
LoginDialog_label_6_text=\u6CD5\u4EBA\u540D\u79F0
......
OBE-MANAGEMENT/src/com/gx/obe/management/composite/SupplierEvaluactionOpinionComposite.java
View file @ 34152210
......@@ -591,7 +591,7 @@ public class SupplierEvaluactionOpinionComposite extends Composite {
}
return;
}
if(supplierEvaluationResultService.saveSupplierEvaluationOpinion(true, tenderProjectEntity.getId(), supplier.getId(), requirementText.getText(), supplierEvalOpinionText.getText(),null)){
if(supplierEvaluationResultService.saveSupplierEvaluationOpinion(true, tenderProjectEntity.getId(), supplier.getId(), requirementText.getText(), supplierEvalOpinionText.getText(),null !=supplierEvaluationResult.getVetoType()? supplierEvaluationResult.getVetoType(): null )){
supplierEvaluationResult.setApplyUserId(null);
MessageDialog.openShortMessage(Messages.Tips_saveSuccess);
}else {
......
OBE-REPORT/src/com/gx/obe/report/composite/ReportContainerComposite.java
View file @ 34152210
......@@ -42,6 +42,7 @@ 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;
......@@ -393,7 +394,24 @@ public class ReportContainerComposite extends Composite {
reportGroupListener.refreshTemplate(templateFile, 0);
}
public void afterGenerate(ProjectTemplate templateFile, boolean generate, String reportPath) {
// if(generate) {
// final FileOperatorButton fileOperatorButton = fileOperatorButtonMap.get(new File(reportPath).getAbsolutePath());
// if(null != fileOperatorButton && !fileOperatorButton.isDisposed()){
// Display.getDefault().syncExec(new Runnable(){
// public void run(){
// fileOperatorButton.dispose();
// reportItemComposite.layout();
// }
// });
// }
// }
// reportGroupListener.refreshTemplate(templateFile, generate ?1:2);
// afterGeneratedAction(reportItemComposite, generate, 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/BaseDateSet.java
View file @ 34152210
......@@ -891,6 +891,7 @@ public abstract class BaseDateSet implements IWordDataSet{
* @return
*/
public List<Map<String, Object>> getFinalScoreSupplierList(){
System.out.println();
List<Supplier> accessmentSupplierList = getEvaluationAccessmentSupplierList();
List<Map<String, Object>> finalScoreSupplierList = getSupplierMapList(accessmentSupplierList);
......@@ -906,17 +907,45 @@ public abstract class BaseDateSet implements IWordDataSet{
List<Double> tecSortList = new ArrayList<Double>();
for(Map<String, Object> supplierMap : finalScoreSupplierList) {
priceSortList.add(((BigDecimal)supplierMap.get("bidPriceValue")).doubleValue());
busSortList.add(((BigDecimal)supplierMap.get("busScore")).doubleValue());
tecSortList.add(((BigDecimal)supplierMap.get("tecScore")).doubleValue());
if(null != supplierMap.get("bidPriceValue")) {
priceSortList.add(((BigDecimal)ObjectUtils.getObjBigDecimal(supplierMap.get("bidPriceValue"))).doubleValue());
}else {
priceSortList.add(0.00);
}
if(null != supplierMap.get("tecScore")) {
tecSortList.add(((BigDecimal)ObjectUtils.getObjBigDecimal(supplierMap.get("tecScore"))).doubleValue());
}else {
tecSortList.add(0.00);
}
if(null != supplierMap.get("busScore")) {
busSortList.add(((BigDecimal)ObjectUtils.getObjBigDecimal(supplierMap.get("busScore"))).doubleValue());
}else {
busSortList.add(0.00);
}
// busSortList.add(((BigDecimal)ObjectUtils.getObjBigDecimal(supplierMap.get("busScore"))).doubleValue());
// tecSortList.add(((BigDecimal)ObjectUtils.getObjBigDecimal(supplierMap.get("tecScore"))).doubleValue());
}
SortUtils priceSortUtil = new SortUtils(priceSortList, false);
SortUtils busSortUtil = new SortUtils(busSortList);
SortUtils tecSortUtil = new SortUtils(tecSortList);
for(Map<String, Object> supplierMap : finalScoreSupplierList) {
supplierMap.put("bidPriceSort", priceSortUtil.getSortNo(((BigDecimal)supplierMap.get("bidPriceValue")).doubleValue()));
supplierMap.put("busSort", busSortUtil.getSortNo(((BigDecimal)supplierMap.get("busScore")).doubleValue()));
supplierMap.put("tecSort", tecSortUtil.getSortNo(((BigDecimal)supplierMap.get("tecScore")).doubleValue()));
if(null != supplierMap.get("bidPriceValue")) {
supplierMap.put("bidPriceSort", priceSortUtil.getSortNo(((BigDecimal)supplierMap.get("bidPriceValue")).doubleValue()));
}else {
supplierMap.put("bidPriceSort", priceSortUtil.getSortNo(0.00));
}
if(null != supplierMap.get("busScore")) {
supplierMap.put("busSort", busSortUtil.getSortNo(((BigDecimal)supplierMap.get("busScore")).doubleValue()));
}else {
supplierMap.put("busSort", busSortUtil.getSortNo(0.00));
}
if(null != supplierMap.get("tecScore")) {
supplierMap.put("tecSort", tecSortUtil.getSortNo(((BigDecimal)supplierMap.get("tecScore")).doubleValue()));
}else {
supplierMap.put("tecSort", tecSortUtil.getSortNo(0.00));
}
// supplierMap.put("", busSortUtil.getSortNo(((BigDecimal)supplierMap.get("")).doubleValue()));
// supplierMap.put("", tecSortUtil.getSortNo(((BigDecimal)supplierMap.get("")).doubleValue()));
// priceSortList.add((BigDecimal)supplierMap.get("bidPriceValue"));
// busSortList.add((BigDecimal)supplierMap.get("busScore"));
// tecSortList.add((BigDecimal)supplierMap.get("tecScore"));
......
OBE-REPORT/src/com/gx/obe/report/utils/WordAddBreakUtils.java 0 → 100644
View file @ 34152210
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.component/src/com/gx/obe/component/comparison/ComparisonTable.java
View file @ 34152210
......@@ -58,11 +58,15 @@ public class ComparisonTable extends KTable {
this.model = new CommonKtableCModel(this, HEAD_ROW, headColList.size(), this.rowList.size(), titleColList.size() * itemColList.size());
this.setModel(model);
// this.model.setColumnWidth(sortCol, 40);
// this.model.setColumnMaxWidth(sortCol, 80);
IntStream.range(0, headColList.size()).forEach(i -> model.addRowSpan(0, i, HEAD_ROW));
IntStream.range(0, titleColList.size()).map(i -> i * itemColList.size()).map(i -> i + headColList.size()).forEach(i -> model.addColSpan(0, i, itemColList.size()));
IntStream.range(0, titleColList.size() * itemColList.size( )+ headColList.size()).forEach(i -> model.setColumnWidth(i, 100));
IntStream.range(0, titleColList.size() * itemColList.size( )+ headColList.size()).forEach(i -> {
model.setColumnWidth(i, 100);
model.setColumnMaxWidth(i, 200);
});
this.model.setRowHeightRender($ -> 30);
// this.model.setCellBackgroundRender(($, $$) -> SWTResourceManager.getColor(SWT.COLOR_WHITE));
......
com.gx.obe.component/src/com/gx/obe/component/comparison/OtherMessageSHowTable.java
View file @ 34152210
package com.gx.obe.component.comparison;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.IntStream;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import com.gx.obe.util.utils.ObjectUtils;
import de.kupzog.ktable.KTable;
import de.kupzog.ktable.KTableCellRenderer;
import de.kupzog.ktable.SWTX;
......@@ -43,6 +49,18 @@ public class OtherMessageSHowTable extends KTable {
super(parent, SWTX.AUTO_SCROLL | SWT.FULL_SELECTION | SWTX.EDIT_ON_KEY | SWTX.FILL_WITH_LASTCOL);
this.kTableDataSource = Optional.ofNullable(kTableDataSource).orElseGet(KTableDataSource::new);
Map<String ,Integer > columnLengthValue = new HashMap<>();
for(List<Object> list : kTableDataSource.getRowList()){
for(int index = 0 ;index < list.size();index++) {
String objectValue = ObjectUtils.getObjString(list.get(index));
if(null == columnLengthValue.get(index+"") || columnLengthValue.get(index+"") <objectValue.length() ) {
columnLengthValue.put(index+ "", objectValue.length());
}
}
}
// this.headColList = comparisonData.getHeadColList();
// this.titleColList = comparisonData.getTitleColList();
......@@ -58,7 +76,24 @@ public class OtherMessageSHowTable extends KTable {
// IntStream.range(0, headColList.size()).forEach(i -> model.addRowSpan(0, i, HEAD_ROW));
//// IntStream.range(0, titleColList.size()).map(i -> i * itemColList.size()).map(i -> i + headColList.size()).forEach(i -> model.addColSpan(0, i, itemColList.size()));
//
// IntStream.range(0, titleColList.size() * itemColList.size( )+ headColList.size()).forEach(i -> model.setColumnWidth(i, 100));
IntStream.range(0, kTableDataSource.getRowList().size() * kTableDataSource.getTitleList().size()+ 1).forEach(i -> {
if(null != columnLengthValue.get(i+ "") ) {
int length = columnLengthValue.get(i+ "");
if(length > 100) {
model.setColumnWidth(i, 400);
model.setColumnMaxWidth(i, 400);
}else {
model.setColumnWidth(i, 100);
model.setColumnMaxWidth(i, 200);
}
}else {
model.setColumnWidth(i, 100);
model.setColumnMaxWidth(i, 200);
}
});
this.model.setRowHeightRender($ -> 30);
// this.model.setCellBackgroundRender(($, $$) -> SWTResourceManager.getColor(SWT.COLOR_WHITE));
......
com.gx.obe.struct/src/com/gx/obe/struct/beans/BidderBasicInfo.java
View file @ 34152210
......@@ -4,6 +4,10 @@ package com.gx.obe.struct.beans;
* @author mazc
* @Description:
*/
/**
* @author 56813
*
*/
public class BidderBasicInfo {
/**
......@@ -151,6 +155,62 @@ public class BidderBasicInfo {
*/
private String memo;
/**
* 近三年业绩
*/
private String threeYearTurnover;
/**
* 投标材料制造商名称
*/
private String manufacturerName;
/**
* 投标人须知要求投标材料制造商需具有的资质证书
*/
private String manufacturerHaveQuaCertificate;
/**
* 投标人须知要求投标人需具有的各类资质证书
*/
private String bidderHaveQuaCertificate;
/**
* 各类注册人员
*/
private String registerPeople;
/**
* 企业服务资质证书
*/
private String serviceQuaCertificate;
private String surveyQuaCertificate;
/**
* 质量管理体系证书（如有）
*/
private String isoQuaCertificate;
public String getRegisterPeople() {
return registerPeople;
}
public void setRegisterPeople(String registerPeople) {
this.registerPeople = registerPeople;
}
public String getServiceQuaCertificate() {
return serviceQuaCertificate;
}
public void setServiceQuaCertificate(String serviceQuaCertificate) {
this.serviceQuaCertificate = serviceQuaCertificate;
}
public String getIsoQuaCertificate() {
return isoQuaCertificate;
}
public void setIsoQuaCertificate(String isoQuaCertificate) {
this.isoQuaCertificate = isoQuaCertificate;
}
public String getId() {
return id;
}
......@@ -438,5 +498,45 @@ public class BidderBasicInfo {
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getThreeYearTurnover() {
return threeYearTurnover;
}
public void setThreeYearTurnover(String threeYearTurnover) {
this.threeYearTurnover = threeYearTurnover;
}
public String getManufacturerName() {
return manufacturerName;
}
public void setManufacturerName(String manufacturerName) {
this.manufacturerName = manufacturerName;
}
public String getManufacturerHaveQuaCertificate() {
return manufacturerHaveQuaCertificate;
}
public void setManufacturerHaveQuaCertificate(String manufacturerHaveQuaCertificate) {
this.manufacturerHaveQuaCertificate = manufacturerHaveQuaCertificate;
}
public String getBidderHaveQuaCertificate() {
return bidderHaveQuaCertificate;
}
public void setBidderHaveQuaCertificate(String bidderHaveQuaCertificate) {
this.bidderHaveQuaCertificate = bidderHaveQuaCertificate;
}
public String getSurveyQuaCertificate() {
return surveyQuaCertificate;
}
public void setSurveyQuaCertificate(String surveyQuaCertificate) {
this.surveyQuaCertificate = surveyQuaCertificate;
}
}
\ No newline at end of file
com.gx.obe.struct/src/com/gx/obe/struct/beans/Performance.java
View file @ 34152210
......@@ -223,7 +223,31 @@ public class Performance {
* 合同履行获奖情况/合同履行情况
*/
private String contractExecuteCondition;
/**
* 服务内容
*/
private String content;
/**
* 服务期限
*/
private String termOfService;
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getTermOfService() {
return termOfService;
}
public void setTermOfService(String termOfService) {
this.termOfService = termOfService;
}
public String getId() {
return id;
}
......
com.gx.obe.struct/src/com/gx/obe/struct/composite/TestComposite.java 0 → 100644
View file @ 34152210
package com.gx.obe.struct.composite;
import org.eclipse.swt.widgets.Composite;
public class TestComposite extends Composite {
/**
* Create the composite.
* @param parent
* @param style
*/
public TestComposite(Composite parent, int style) {
super(parent, style);
}
@Override
protected void checkSubclass() {
// Disable the check that prevents subclassing of SWT components
}
}
com.gx.obe.struct/src/com/gx/obe/struct/thread/ParsingStructThread.java
View file @ 34152210
......@@ -19,6 +19,7 @@ import com.gx.obe.common.file.utils.BidFileUtils;
import com.gx.obe.common.widget.listener.ProgressMessageAdapter;
import com.gx.obe.common.widget.listener.ProgressMessageListener;
import com.gx.obe.components.core.Constants;
import com.gx.obe.message.Messages;
import com.gx.obe.struct.beans.ModelData;
import com.gx.obe.struct.beans.StructDateInfo;
import com.gx.obe.struct.enums.DataCategoryEnum;
......@@ -73,8 +74,8 @@ public class ParsingStructThread implements Runnable {
*/
private void parsingStruct() {
//--------------------------------获取供应商列表--------------------------------------------------
messageProgress.message("开始解析招标文件规则...", 0);
LOG.error("开始解析招标文件规则...");
messageProgress.message(Messages.FileDownloadShell2_label_1_text, 0);
// LOG.error("开始解析招标文件规则...");
String bidFilePath = FileConstants.getBiddingFilePath(tenderId).concat("SingleFileBaseInfo.xml");
// File singleFileBaseInfoFile = new File(bidFilePath);
Document document = XmlUtils.getXmlDocument(bidFilePath);
......@@ -88,52 +89,52 @@ public class ParsingStructThread implements Runnable {
}
// professionalCodeElement
// professionalCodeElement.att
messageProgress.message("开始获取获取供应商列表...", 0);
LOG.error("开始获取获取供应商列表...");
messageProgress.message(Messages.FileDownloadShell2_label_2_text, 0);
LOG.error(Messages.FileDownloadShell2_label_2_text);
Optional<List<Supplier>> supplierListQptional = Optional.ofNullable(supplierService.getOpenBidSuccessSupplier(tenderId)).filter(t -> !t.isEmpty());
// isPresent判断是否有值
if (!supplierListQptional.isPresent()) {
messageProgress.message("供应商列表获取失败!", -1);
LOG.error("供应商列表获取失败!");
messageProgress.message(Messages.FileDownloadShell2_label_3_text, -1);
LOG.error(Messages.FileDownloadShell2_label_3_text);
return;
}
messageProgress.message("供应商列表获取成功!", 1);
LOG.error("供应商列表获取成功!");
Charset charset = Charset.defaultCharset();
messageProgress.message("获取目前系统编码格式" + charset.displayName(), 1);
LOG.error("获取目前系统编码格式" + charset.displayName());
System.out.println("获取目前系统编码格式" + charset.displayName());
messageProgress.message(Messages.FileDownloadShell2_label_4_text, 1);
LOG.error(Messages.FileDownloadShell2_label_4_text);
// Charset charset = Charset.defaultCharset();
// messageProgress.message("获取目前系统编码格式" + charset.displayName(), 1);
// LOG.error("获取目前系统编码格式" + charset.displayName());
// System.out.println("获取目前系统编码格式" + charset.displayName());
//--------------------------------解析供应商评议表数据--------------------------------------------------
ParsingSupplierSelfOpinionThread parsingSupplierSelfOpinionThread = new ParsingSupplierSelfOpinionThread(tenderproject, supplierListQptional.get(),new ProgressMessageAdapter () {
@Override
public void message(String message, int flag) {
messageProgress.message(message, flag);
}
@Override
public void finish(boolean flag) {
}
}) ;
parsingSupplierSelfOpinionThread.start();
parsingSupplierSelfOpinionThread.join();
//
// ParsingSupplierSelfOpinionThread parsingSupplierSelfOpinionThread = new ParsingSupplierSelfOpinionThread(tenderproject, supplierListQptional.get(),new ProgressMessageAdapter () {
// @Override
// public void message(String message, int flag) {
// messageProgress.message(message, flag);
// }
//
// @Override
// public void finish(boolean flag) {
// }
// }) ;
// parsingSupplierSelfOpinionThread.start();
// parsingSupplierSelfOpinionThread.join();
//--------------------------------解析供应商标书定位数据--------------------------------------------------
// String isIntelligentScore = tenderproject.getEvaluationParamByKey("isIntelligentScore");
// if(null != isIntelligentScore && CommonEnum.YES.equals(isIntelligentScore)) {
// }
ParsingSupplierRespItemThread parsingSupplierRespItemThread = new ParsingSupplierRespItemThread(tenderproject, supplierListQptional.get(),new ProgressMessageAdapter () {
@Override
public void message(String message, int flag) {
messageProgress.message(message, flag);
}
@Override
public void finish(boolean flag) {
}
}) ;
parsingSupplierRespItemThread.start();
parsingSupplierRespItemThread.join();
// ParsingSupplierRespItemThread parsingSupplierRespItemThread = new ParsingSupplierRespItemThread(tenderproject, supplierListQptional.get(),new ProgressMessageAdapter () {
// @Override
// public void message(String message, int flag) {
// messageProgress.message(message, flag);
// }
//
// @Override
// public void finish(boolean flag) {
// }
// }) ;
// parsingSupplierRespItemThread.start();
// parsingSupplierRespItemThread.join();
//--------------------------------获取评审内容列表--------------------------------------------------
......@@ -157,8 +158,8 @@ public class ParsingStructThread implements Runnable {
//--------------------------------解析投标结构化数据--------------------------------------------------
messageProgress.message("开始解析结构化标书结构...", 0);
LOG.error("开始解析结构化标书结构...");
messageProgress.message(Messages.FileDownloadShell2_label_5_text, 0);
LOG.error(Messages.FileDownloadShell2_label_5_text);
try {
relChapterTypeListMapOptional.map(m -> m.get(DataCategoryEnum.TT.getKey())).map(Set::parallelStream).ifPresent(s -> {
s.forEach(t -> {
......@@ -166,43 +167,42 @@ public class ParsingStructThread implements Runnable {
});
});
} catch (Exception e) {
messageProgress.message("解析招标结构化数据失败，请检查是否下载招标文件！", -1);
LOG.error("解析招标结构化数据失败，请检查是否下载招标文件！");
messageProgress.message(Messages.FileDownloadShell2_label_6_text, -1);
LOG.error(Messages.FileDownloadShell2_label_6_text);
// System.out.println(e.getMessage());
return;
}
messageProgress.message("结构化标书结构解析成功！", 1);
LOG.error("结构化标书结构解析成功！");
messageProgress.message(Messages.FileDownloadShell2_label_7_text, 1);
LOG.error(Messages.FileDownloadShell2_label_7_text);
//--------------------------------解析投标结构化数据--------------------------------------------------
messageProgress.message("开始解析投标结构化数据！", 1);
LOG.error("结构化标书结构解析成功！");
messageProgress.message(Messages.FileDownloadShell2_lblNewLabel_text, 1);
try {
// supplierListQptional.get().parallelStream().forEach(t -> parsingSupplierBidFileStruct(t, relChapterTypeListMapOptional.get(), Constants.getBidFilePath(tenderId, t.getId())));
supplierListQptional.get().stream().forEach(t -> {
messageProgress.message("正在解析[" + t.getSupplierName() +"]结构化数据...", 0);
messageProgress.message(Messages.FileDownloadShell2_label_8_text + "[" + t.getSupplierName() +"]" + Messages.FileDownloadShell2_label_9_text, 0);
parsingSupplierBidFileStruct(t, relChapterTypeListMapOptional.get(), Constants.getBidFilePath(tenderId, t.getId()));
});
} catch (Exception e) {
messageProgress.message("解析投标结构化数据失败！", -1);
messageProgress.message(Messages.FileDownloadShell2_label_10_text, -1);
// System.out.println(e.getStackTrace());
return;
}
messageProgress.message("解析投标结构化数据成功！", 1);
messageProgress.message(Messages.FileDownloadShell2_label_11_text, 1);
//--------------------------------保存结构化数据--------------------------------------------------
messageProgress.message("开始保存结构化数据！", 0);
messageProgress.message(Messages.FileDownloadShell2_label_12_text, 0);
if (!evaluationContentService.deleteOrSaveStructDateInfo(tenderId, structDateInfo)) {
messageProgress.message("保存结构化数据失败！", -1);
messageProgress.message(Messages.FileDownloadShell2_label_13_text, -1);
return;
}
messageProgress.message("保存结构化数据成功！", 1);
messageProgress.message(Messages.FileDownloadShell2_label_14_text, 1);
//--------------------------------end--------------------------------------------------
messageProgress.message( "解析结构化数据结束！", 0);
messageProgress.message(Messages.FileDownloadShell2_label_15_text, 0);
messageProgress.message("---------------------------------", 0);
}
......
com.gx.obe.struct/src/com/gx/obe/struct/utils/ParsingStructXmlUtils.java
View file @ 34152210
......@@ -493,6 +493,8 @@ public class ParsingStructXmlUtils {
performance.setDesignRange(performanceElement.elementTextTrim("designRange"));
performance.setCooperationWay(performanceElement.elementTextTrim("cooperationWay"));
performance.setContractExecuteCondition(performanceElement.elementTextTrim("contractExecuteCondition"));
performance.setContent(performanceElement.elementTextTrim("content"));
performance.setTermOfService(performanceElement.elementTextTrim("termOfService"));
return performance;
}
......@@ -559,6 +561,14 @@ public class ParsingStructXmlUtils {
bidderBasicInfo.setServiceAbility(bidderBasicInfoElement.elementTextTrim("serviceAbility"));
bidderBasicInfo.setPreInputDevice(bidderBasicInfoElement.elementTextTrim("preInputDevice"));
bidderBasicInfo.setMemo(bidderBasicInfoElement.elementTextTrim("memo"));
bidderBasicInfo.setThreeYearTurnover(bidderBasicInfoElement.elementTextTrim("threeYearTurnover"));
bidderBasicInfo.setManufacturerHaveQuaCertificate(bidderBasicInfoElement.elementTextTrim("manufacturerHaveQuaCertificate"));
bidderBasicInfo.setManufacturerName(bidderBasicInfoElement.elementTextTrim("manufacturerName"));
bidderBasicInfo.setBidderHaveQuaCertificate(bidderBasicInfoElement.elementTextTrim("bidderHaveQuaCertificate"));
bidderBasicInfo.setRegisterPeople(bidderBasicInfoElement.elementTextTrim("registerPeople"));
bidderBasicInfo.setServiceQuaCertificate(bidderBasicInfoElement.elementTextTrim("serviceQuaCertificate"));
bidderBasicInfo.setIsoQuaCertificate(bidderBasicInfoElement.elementTextTrim("isoQuaCertificate"));
bidderBasicInfo.setSurveyQuaCertificate(bidderBasicInfoElement.elementTextTrim("surveyQuaCertificate"));
return bidderBasicInfo;
}
......
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