Skip to content

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

提交发版分支 

提交发版分支
parent 5896c0ef
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 28 deletions
OBE-COMPONENTS-MESSAGES/bin/com/gx/obe/message/messages.properties
View file @ dcb4d213
#Eclipse modern messages class
#Thu Jun 27 13:12:08 CST 2024
#Tue Nov 26 10:12:53 CST 2024
About=\u5173\u4E8E
AboutAttachment=\u76F8\u5173\u9644\u4EF6
AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
......@@ -419,6 +419,7 @@ Button_votoClause=\u5E9F\u6807\u6761\u6B3E
Button_wasteBidding=\u5E9F\u6807
Button_youAreSigning=\u60A8\u6B63\u5728\u7B7E\u540D
Byte=\u5B57\u8282
COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3
Cancel=invitation
CentralizedReview=\u96C6\u4E2D\u8BC4\u5BA1
Cert_applyCert=\u7533\u8BF7\u4F7F\u7528
......@@ -1847,4 +1848,3 @@ Yes=\u662F
You=\u60A8
ZipCode=\u90AE\u653F\u7F16\u7801
ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3
OBE-COMPONENTS-MESSAGES/src/com/gx/obe/message/messages.properties
View file @ dcb4d213
#Eclipse modern messages class
#Thu Jun 27 13:12:08 CST 2024
#Tue Nov 26 10:12:53 CST 2024
About=\u5173\u4E8E
AboutAttachment=\u76F8\u5173\u9644\u4EF6
AboveDifferenceCondition=\u9AD8\u4E8E\u5DEE\u989D\u6761\u4EF6
......@@ -419,6 +419,7 @@ Button_votoClause=\u5E9F\u6807\u6761\u6B3E
Button_wasteBidding=\u5E9F\u6807
Button_youAreSigning=\u60A8\u6B63\u5728\u7B7E\u540D
Byte=\u5B57\u8282
COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3
Cancel=invitation
CentralizedReview=\u96C6\u4E2D\u8BC4\u5BA1
Cert_applyCert=\u7533\u8BF7\u4F7F\u7528
......@@ -1847,4 +1848,3 @@ Yes=\u662F
You=\u60A8
ZipCode=\u90AE\u653F\u7F16\u7801
ips_noOpenLiveing=\u672A\u5F00\u542F\u76F4\u64AD\uFF01
COMPANY_NAME=\u4EAC\u80FD\u62DB\u6807\u96C6\u91C7\u4E2D\u5FC3
OBE-MANAGEMENT/src/com/gx/obe/management/composite/EvaluationExpertManagerComposite.java
View file @ dcb4d213
......@@ -93,7 +93,9 @@ import com.gx.obe.web.entity.evaluation.EvaluationRoom;
import com.gx.obe.web.entity.evaluation.EvaluationStep;
import com.gx.obe.web.entity.expert.Expert;
import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.gx.obe.web.entity.tender.TenderProjectRuleEntity;
import com.gx.obe.web.service.MachineService;
import com.gx.obe.web.service.ProjectRuleService;
import com.gx.obe.web.service.RoleService;
import com.gx.obe.web.service.TenderProjectService;
import com.gx.obe.web.service.TransactionServerService;
......@@ -168,6 +170,7 @@ public class EvaluationExpertManagerComposite extends Composite {
private Action projectAction;
private ExpertEvaluationStepService expertEvaluationStepService = new ExpertEvaluationStepService();
private ProjectRuleService projectRuleService = new ProjectRuleService();
// private UserRoleService userRoleService ;
private GridColumn evalRoomColumn;
......@@ -518,8 +521,6 @@ public class EvaluationExpertManagerComposite extends Composite {
configLeaderAction();
}
});
GridData gd_configLeaderBtn = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
configLeaderBtn.setLayoutData(gd_configLeaderBtn);
configLeaderBtn.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/loginTray.png"));
configLeaderBtn.setText(Messages.SetLeader);
......@@ -679,8 +680,6 @@ public class EvaluationExpertManagerComposite extends Composite {
button.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/waste.png"));
menuFunctionUtils.addFunction(button, "AVOID");
new Label(composite_7, SWT.NONE);
scrolledComposite.setContent(compositeScrolle);
scrolledComposite.setMinSize(compositeScrolle.computeSize(SWT.DEFAULT, SWT.DEFAULT));
sashForm.setWeights(new int[] {4, 6});
......@@ -1517,16 +1516,25 @@ public class EvaluationExpertManagerComposite extends Composite {
//京能要求上传开标结果才能下载专家
if(MenuFunction.HIDE.equals(menuFunctionUtils.getAuthority(MenuFunctionEnum.HAS_UPLOAD_OPEN_RESULT))){
if(!CommonEnum.COMPLETE.equals(tenderProjectEntity.getUploadOpeningResultStatus())){
TenderProjectRuleEntity tenderProjectRuleEntity = projectRuleService.getProjectRule(tenderProjectEntity.getId());
// Date nowDate = new Date();
if(null != tenderProjectRuleEntity &&null != tenderProjectRuleEntity.getBidOpeningStartTime() && tenderProjectRuleEntity.getBidOpeningStartTime().before(new Date())){
downExpertFormProject();
}else {
MessageDialog.openInformation(getShell(), Messages.Dialog_warmTips, "请上传开标结果后再下载专家！");
return;
}
// if(nowDate.after(tenderProjectEntity.getBidOpeningStartTime())){
//// if(!CommonEnum.COMPLETE.equals(tenderProjectEntity.getUploadOpeningResultStatus())){
//
// }
}
// EOp op = new EOp(getShell());
// op.addOpItem("从平台下载", ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/download.png"), null != tenderProjectEntity.getServerId() && tenderProjectEntity.getServerId().length() > 0, new EOp.ClickListener() {
// public void click() {
downExpertFormProject();
// }
// });
// op.addOpItem("从专家库下载", ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/download.png"), true, new EOp.ClickListener() {
......
OBE-REPORT/src/com/gx/obe/report/dataset/word/BaseDateSet.java
View file @ dcb4d213
......@@ -42,6 +42,7 @@ import com.gx.obe.web.entity.BidOpeningRoom;
import com.gx.obe.web.entity.Supplier;
import com.gx.obe.web.entity.SupplierEvaluationResult;
import com.gx.obe.web.entity.SupplierOpeningResult;
import com.gx.obe.web.entity.auth.AuthUser;
import com.gx.obe.web.entity.evaluation.EvaluationFactor;
import com.gx.obe.web.entity.evaluation.EvaluationRoom;
import com.gx.obe.web.entity.evaluation.EvaluationStep;
......@@ -58,6 +59,7 @@ import com.gx.obe.web.service.SupplierEvaluationStepService;
import com.gx.obe.web.service.SupplierOpeningResultService;
import com.gx.obe.web.service.SupplierService;
import com.gx.obe.web.service.TenderProjectService;
import com.gx.obe.web.service.UserService;
import com.gx.obe.web.service.WorkerService;
import com.gx.obe.web.service.evaluation.EvaluationFactorResultService;
import com.gx.obe.web.service.evaluation.EvaluationFactorService;
......@@ -85,6 +87,7 @@ public abstract class BaseDateSet implements IWordDataSet{
public EvaluationFactorService evaluationFactorService = new EvaluationFactorService();
public WorkerService workerService = new WorkerService();
public SupplierService supplierService = new SupplierService();
public UserService userService = new UserService();
public SupplierEvaluationResultService supplierEvaluationResultService = new SupplierEvaluationResultService();
public SupplierOpeningResultService supplierOpeningResultService = new SupplierOpeningResultService();
public EvaluationFactorResultService evaluationFactorResultService = new EvaluationFactorResultService();
......@@ -161,7 +164,7 @@ public abstract class BaseDateSet implements IWordDataSet{
reportDataSet = getBaseDataSet();
//获得专家信息
getExpertList();
getExpertList(reportDataSet);
}
public WordDataSet getBaseDataSet(){
......@@ -199,7 +202,7 @@ public abstract class BaseDateSet implements IWordDataSet{
reportDataSet.putParam("tenderContent", ObjectUtils.getObjString(tenderProject.getTenderContent()));// 招标内容
reportDataSet.putParam("budgetMoney", tenderProject.getBudgetMoneyByUnit(tenderProjectRuleEntity.getPriceUnitUseDefault()));// 预算金额
reportDataSet.putParam("bidPriceLimit", tenderProject.getBidPriceLimitByUnit(tenderProjectRuleEntity.getPriceUnitUseDefault()));// 报标限价
AuthUser manager = userService.findById(tenderProject.getUserId());
// 项目规则
reportDataSet.putParam("bidOpeningTime", tenderProjectRuleEntity.getBidOpeningStartTime());// 开标开始时间
reportDataSet.putParam("bidOpeningPriceTime", tenderProjectRuleEntity.getPriceBidOpeningTime());// 价格开标开始时间
......@@ -258,13 +261,21 @@ public abstract class BaseDateSet implements IWordDataSet{
reportDataSet.putParam("docSaleEndTime", tenderProjectRuleEntity.getDocSaleEndTime());//文件售卖结束时间
reportDataSet.putParam("docSaleStartTime", tenderProjectRuleEntity.getDocSaleStartTime());//文件售卖开始时间
reportDataSet.putParam("signupStartTime", tenderProjectRuleEntity.getSignupStartTime());//公告发布时间时间
if(null != manager ) {
reportDataSet.putParam("managerName", ObjectUtils.getObjString(manager.getUserName()));//公告发布时间时间
reportDataSet.putParam("managerPhone", ObjectUtils.getObjString(manager.getPhone()));//公告发布时间时间
}else {
}
// reportDataSet.putParam("docSaleEndTime", new Date());//文件售卖结束时间
// reportDataSet.putParam("docSaleStartTime", new Date());//文件售卖开始时间
// reportDataSet.putParam("signupStartTime", new Date());//公告发布时间时间
//推荐家数
reportDataSet.putParam("recommendCount", tenderProjectRuleEntity.getRecommendCountNotNull());
getExpertList(reportDataSet);
return reportDataSet;
}
......@@ -328,7 +339,7 @@ public abstract class BaseDateSet implements IWordDataSet{
getEvaluationAccessmentSupplierList();
}else if("expertList".equals(listName)){
// 获得专家列表
getExpertList();
getExpertList(reportDataSet);
}else if("workList".equals(listName)){
// 获得评标工作人员列表
getEvaluationWorkerList();
......@@ -411,7 +422,7 @@ public abstract class BaseDateSet implements IWordDataSet{
* @author guoyr
* @return
*/
public List<Expert> getExpertList(){
public List<Expert> getExpertList(WordDataSet reportDataSet){
List<Expert> allExpertList = expertService.findExpertByTenderIdBatch(tenderProject.getId(), null);
StringBuilder expertNames = new StringBuilder();
StringBuilder biddingExpertNames = new StringBuilder();
......
com.gx.obe.answer/src/com/gx/obe/answer/dialog/InquireEnvelopListDialog.java
View file @ dcb4d213
......@@ -31,6 +31,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
......@@ -40,12 +41,16 @@ import com.gx.obe.answer.composite.InquireEnvelopContentComposite;
import com.gx.obe.answer.dataset.ClarifyDataSet;
import com.gx.obe.business.entity.InquireEnvelop;
import com.gx.obe.common.file.enumeration.FileConstants;
import com.gx.obe.common.file.upload.UploadFileUtil;
import com.gx.obe.common.file.upload.infer.UploadFileAdapter;
import com.gx.obe.common.icons.IconsActivator;
import com.gx.obe.components.core.Constants;
import com.gx.obe.components.core.I18NEnum;
import com.gx.obe.message.Messages;
import com.gx.obe.report.dataset.word.IWordDataSet;
import com.gx.obe.util.utils.FileUtils;
import com.gx.obe.util.utils.LogUtils;
import com.gx.obe.util.utils.StringUtil;
import com.gx.obe.web.entity.Supplier;
import com.gx.obe.web.entity.tender.TenderProjectEntity;
import com.gx.obe.web.service.InquireEnvelopService;
......@@ -89,6 +94,8 @@ public class InquireEnvelopListDialog extends EDialog{
private Label label_4;
private Text titleText;
private Map<String, Object> reportDataSet;
private Label lblNewLabel;
private Text text;
{
LogUtils.logClass(InquireEnvelopListDialog.class);
}
......@@ -151,6 +158,7 @@ public class InquireEnvelopListDialog extends EDialog{
}
});
addButton.setText(MessageFormat.format(Messages.Button_add, Messages.Clarification));
new Label(composite_1, SWT.NONE);
scrolledComposite = new ScrolledComposite(top, SWT.H_SCROLL | SWT.V_SCROLL);
......@@ -180,15 +188,22 @@ public class InquireEnvelopListDialog extends EDialog{
label_4 = new Label(createbtn_composite, SWT.NONE);
label_4.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
label_4.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.NORMAL));
label_4.setText(Messages.ClarifyTitle +"：");
label_4.setText(Messages.ClarifyTitle +":");
titleText = new Text(createbtn_composite, SWT.BORDER);
titleText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
lblNewLabel = new Label(createbtn_composite, SWT.NONE);
lblNewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
lblNewLabel.setText("联系电话:");
text = new Text(createbtn_composite, SWT.BORDER);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
lastAnswerTimeLabel = new Label(createbtn_composite, SWT.NONE | EButton.CSS_BLUE);
lastAnswerTimeLabel.setFont(SWTResourceManager.getFont("微软雅黑", 10, SWT.NORMAL));
lastAnswerTimeLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
lastAnswerTimeLabel.setText(Messages.LatestClarifyTime + "：");
lastAnswerTimeLabel.setText(Messages.LatestClarifyTime + ":");
lastAnswerTimeText = new Text(createbtn_composite, SWT.BORDER | SWT.READ_ONLY);
GridData gd_lastAnswerTimeText = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
......@@ -354,6 +369,11 @@ public class InquireEnvelopListDialog extends EDialog{
MessageDialog.openInformation(getShell(), Messages.Tips_SelcetMinOneClarification);
return;
}
String phone = text.getText();
if(StringUtil.empty(phone)) {
MessageDialog.openInformation(getShell(), "请输入联系电话！");
return;
}
Date lastAnswerDate = null != (Date)lastAnswerTimeText.getData("date")?(Date)lastAnswerTimeText.getData("date"):null;
if(null == lastAnswerDate){
MessageDialog.openShortMessage(MessageFormat.format(Messages.Tips_pleaseSelect, Messages.LatestClarifyTime));
......@@ -374,6 +394,7 @@ public class InquireEnvelopListDialog extends EDialog{
questionContent.append(inquireEnvelop.getContent());
questionContent.append("\r\n");
}
clarifyDataSet.put("managerPhone", text.getText());
clarifyDataSet.putParam("supplierName", selectSupplier.getSupplierName());
clarifyDataSet.putParam("questionContent", questionContent);
clarifyDataSet.putParam("questionList", selectInquireEnvelopList);
......@@ -387,29 +408,57 @@ public class InquireEnvelopListDialog extends EDialog{
final String title = titleText.getText().trim();
clarifyDataSet.putParam("title", title );
File templateFile = FileConstants.getResourceFile(FileConstants.ANSWER_FILE);
File templateFile_sign = FileConstants.getResourceFile(FileConstants.ANSWER_FILE_SIGN);
String reportPath = FileConstants.TEMP_FOLDER + templateFile.getName();
String reportsignPath = FileConstants.REPORT_FILE_FOLDER + File.separator +selectSupplier.getSupplierName() + "_" + titleText.getText()+".docx";
File hasFile = new File(reportPath);
File signFile = new File(reportsignPath);
if (hasFile.exists()) {
hasFile.delete();
}
WordTemplateReportUtil.generate(templateFile.getAbsolutePath(), reportPath, new WordGenerateAdapter() {
if(signFile.exists()) {
signFile.delete();
}
WordTemplateReportUtil.generate(templateFile_sign.getAbsolutePath(), reportsignPath, new WordGenerateAdapter() {
public WordDataSet initDataSet(WordTemplate wordTemplate) {
return clarifyDataSet;
}
public void onGenerate(String reportPath) {
}
public void onGenerate(String reportPath) {}
public void afterGenerate(boolean generate, final String reportPath) {
if (null != clarifyDataSet) {
getShell().close();
openWordFileAction(reportPath, dateString, title);
if(signFile.exists()) {
UploadFileUtil uploadFileUtil = new UploadFileUtil(signFile.getAbsolutePath(), tenderProject.getId(), null, FileConstants.REPORT_FILE_FOLDER, new UploadFileAdapter() {
public void Completed(boolean isCompleted) {
if (isCompleted) {
FileUtils.copy(signFile.getAbsolutePath(), signFile.getAbsolutePath());
Display.getDefault().syncExec(new Runnable() {
public void run() {
WordTemplateReportUtil.generate(templateFile.getAbsolutePath(), reportPath, new WordGenerateAdapter() {
public WordDataSet initDataSet(WordTemplate wordTemplate) {
return clarifyDataSet;
}
public void onGenerate(String reportPath) {}
public void afterGenerate(boolean generate, final String reportPath) {
if (null != clarifyDataSet) {
getShell().close();
openWordFileAction(reportPath, dateString, title);
}
}
});
isCreateReport = true;
}
});
}
}
});
uploadFileUtil.startUploadFileFile();
}else {
MessageDialog.openError(getShell(), "生成失败!");
}
}
});
isCreateReport = true;
}
public void addCallBack(CallBack importBidQueryAnswerFileCallBack){
......
com.gx.obe.common.file/src/com/gx/obe/common/file/enumeration/FileConstants.java
View file @ dcb4d213
......@@ -339,7 +339,7 @@ public class FileConstants {
public static String BILLZB_XML = "billzb.xml";// 清单文件
public static String ANSWER_FILE = "询标函（澄清）.docx";
public static String ANSWER_FILE_PDF = "询标函（澄清）.pdf";
public static String ANSWER_FILE_SIGN = "询标函.docx";
public static String[] SUPPLIER_BID_FILES = {BID_PRICE_XML,PSZB_XML,BID_FILE_INDEX_XML};// 评审点文件不是必须的
public static String getBidFileName(String bidName){
......
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