提交代码

.recommenders/caches/identified-project-coordinates.json

-{}
+[[{"location":"E:\\gitWorkSpace\\client_V7.0\\jingnengdabao\\com.gx.obe.common.widget","type":"PROJECT","hints":{"PROJECT_NAME":"com.gx.obe.common.widget"}},"com.gx.obe:com.gx.obe.common.widget:1.0.0"]]
\ No newline at end of file

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

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

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

@@ -323,7 +323,7 @@ public class MyEvaluationStepComposite extends Composite implements ActionListen
 		preEvalLink.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/signature.png"));
 		menuFunctionUtils.addFunction(preEvalLink, "EVALUATION_PREEVAL");
 		//如果需要屏蔽，直接注释掉该行
-//		new AiEvalLeftButton(toolsComposite, SWT.NONE, tenderProject, "标书查重");
+		new AiEvalLeftButton(toolsComposite, SWT.NONE, tenderProject, "标书查重");
 		
 		signature_btn = new ELink(toolsComposite, SWT.NONE);
 		signature_btn.setFont(SWTResourceManager.getFont("微软雅黑", 12, SWT.BOLD));

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

@@ -1005,6 +1005,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(uploadEvalResultRecordFile.exists()){
 				addSectionElement(rootElement, "评标结果", "ExpertEvalResult", uploadEvalResultRecordFile.getName(), "sytemReport");
 				zipFileList.add(uploadEvalResultRecordFile.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果ExpertEvalResult.xml失败");
+				return null;
 			}
 			
 			File uploadEvaluationResultFile = new File(autoCreateFilePath+"EvaluationResult.xml");
@@ -1013,6 +1016,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(uploadEvaluationResultFile.exists()){
 				addSectionElement(rootElement, "评审结果", "EvaluationResult", uploadEvaluationResultFile.getName(), "sytemReport");
 				zipFileList.add(uploadEvaluationResultFile.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果EvaluationResult.xml失败");
+				return null;
 			}
 			
 			File upLoadSupplierValuactionFile = new File(autoCreateFilePath+"SupplierEvalResult.xml");
@@ -1021,6 +1027,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadSupplierValuactionFile.exists()){
 				addSectionElement(rootElement, "供应商评审结果", "SupplierEvalResult", upLoadSupplierValuactionFile.getName(), "sytemReport");
 				zipFileList.add(upLoadSupplierValuactionFile.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果SupplierEvalResult.xml失败");
+				return null;
 			}
 			
 			File upLoadcreateClearBidContentXml = new File(autoCreateFilePath+"ClearBidContent.xml");
@@ -1029,6 +1038,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadcreateClearBidContentXml.exists()){
 				addSectionElement(rootElement, "清标内容", "ClearBidContent", upLoadcreateClearBidContentXml.getName(), "sytemReport");
 				zipFileList.add(upLoadcreateClearBidContentXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果ClearBidContent.xml失败");
+				return null;
 			}
 			
 			File upLoadcreateEvaluationScoreXml = new File(autoCreateFilePath+"EvaluationScores.xml");
@@ -1037,6 +1049,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadcreateEvaluationScoreXml.exists()){
 				addSectionElement(rootElement, "供应商详细评审结果", "EvaluationScore", upLoadcreateEvaluationScoreXml.getName(), "sytemReport");
 				zipFileList.add(upLoadcreateEvaluationScoreXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果ClearBidContent.xml失败");
+				return null;
 			}
 			
 			
@@ -1046,13 +1061,20 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadExpertXml.exists()){
 				addSectionElement(rootElement, Messages.Title_expertInfo, "Expert", upLoadExpertXml.getName(), "sytemReport");
 				zipFileList.add(upLoadExpertXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果Expert.xml失败");
+				return null;
 			}
+			
 			File upLoadEvaluationStepXml = new File(autoCreateFilePath+"EvaluationStep.xml");
 			callBackMsg("正在生成评标步骤信息...");
 			createupLoadEvaluationStepXml(upLoadEvaluationStepXml.getAbsolutePath());
 			if(upLoadEvaluationStepXml.exists()){
 				addSectionElement(rootElement, "评标步骤信息", "EvaluationStep", upLoadEvaluationStepXml.getName(), "sytemReport");
 				zipFileList.add(upLoadEvaluationStepXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果EvaluationStep.xml失败");
+				return null;
 			}
 			
 			File upLoadMultiRoundPriceXml = new File(autoCreateFilePath+"MultiRoundsBidPrice.xml");
@@ -1069,6 +1091,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(associationOpinionXml.exists()){
 				addSectionElement(rootElement, "关联关系", "AssociationOpinion", associationOpinionXml.getName(), "sytemReport");
 				zipFileList.add(associationOpinionXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果AssociationOpinionXml.xml失败");
+				return null;
 			}
 			
 			
@@ -1078,6 +1103,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadWasteBidReasonXml.exists()){
 				addSectionElement(rootElement, "废标意见", "WasteBidReason", upLoadWasteBidReasonXml.getName(), "sytemReport");
 				zipFileList.add(upLoadWasteBidReasonXml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果WasteBidReason.xml失败");
+				return null;
 			}
 			
 			File upLoadFactorsEvalResultxml = new File(autoCreateFilePath+"FactorsEvalResult.xml");
@@ -1086,6 +1114,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadFactorsEvalResultxml.exists()){
 				addSectionElement(rootElement, "评标步骤详细评审信息", "FactorsEvalResult", upLoadFactorsEvalResultxml.getName(), "sytemReport");
 				zipFileList.add(upLoadFactorsEvalResultxml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果FactorsEvalResult.xml失败");
+				return null;
 			}
 			
 			File upLoadEvaluationFactorsxml = new File(autoCreateFilePath+"EvaluationFactors.xml");
@@ -1094,6 +1125,9 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			if(upLoadEvaluationFactorsxml.exists()){
 				addSectionElement(rootElement, "评审指标信息", "EvaluationFactors", upLoadEvaluationFactorsxml.getName(), "sytemReport");
 				zipFileList.add(upLoadEvaluationFactorsxml.getAbsolutePath());
+			}else {
+				callBackMsg("生成评标结果EvaluationFactors.xml失败");
+				return null;
 			}
 			if(reportFileList!=null && reportFileList.size()>0){
 				if (executorService != null) {
@@ -1157,7 +1191,14 @@ public class UploadEvaluationResultAndFile implements IUploadEvaluateResult{
 			
 			callBackMsg("正在生成评标结果描述文件...");
 			XmlUtils.createXmlFile(document, autoCreateFilePath+"BidEvaluationResultFileIndex.xml", XML_ENCODING);
+			File indexFile = new File(autoCreateFilePath+"BidEvaluationResultFileIndex.xml");
+			if(indexFile.exists()) {
 				zipFileList.add(autoCreateFilePath+"BidEvaluationResultFileIndex.xml");
+			}else {
+				callBackMsg("生成BidEvaluationResultFileIndex.xml失败");
+				return null;
+			}
+			
 		}
 		
 		

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

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

com.gx.obe.template/src/com/gx/obe/template/composite/ProjectTemplateManageComposite.java

@@ -138,9 +138,9 @@ public class ProjectTemplateManageComposite extends ManageComposite<ProjectTempl
 		boolean defaultType = formComposite.getDefaultTypeButton().getSelection();
 		List<String> keyList = formComposite.getAgentBtnCheckMap().entrySet().stream().filter(e -> e.getValue().getSelection()).map(Map.Entry::getKey).collect(Collectors.toList());
 		return ProjectTemplateAgent.initAllList()
-				.filter(ProjectTemplate::getTemplateType, t -> templateType == null || templateType.equals(t))
-				.filterType(ProjectTypeVo::isFixedFactor, t -> fixedFactor == t)
-				.filterType(ProjectTypeVo::isDefaultType, t -> defaultType == t)
+//				.filter(ProjectTemplate::getTemplateType, t -> templateType == null || templateType.equals(t))
+//				.filterType(ProjectTypeVo::isFixedFactor, t -> fixedFactor == t)
+//				.filterType(ProjectTypeVo::isDefaultType, t -> defaultType == t)
 				.filterType(ProjectTypeVo::getAgentKeyList, t -> keyList.isEmpty() || (Objects.nonNull(t) && keyList.stream().anyMatch(t::contains)))
 				.sorted(TemplateUtil.COMPARATOR)
 				.get();