diff --git a/main/java/shkd/repc/resp/formplugin/CardSummaryFormPlugin.java b/main/java/shkd/repc/resp/formplugin/CardSummaryFormPlugin.java index 1153e0b..39d8807 100644 --- a/main/java/shkd/repc/resp/formplugin/CardSummaryFormPlugin.java +++ b/main/java/shkd/repc/resp/formplugin/CardSummaryFormPlugin.java @@ -41,7 +41,7 @@ public class CardSummaryFormPlugin extends AbstractBillPlugIn implements HyperLi String searchKey = search.getSearchKey(); /** * 招募公告(resm_annorecruit) t_resm_annorecruit - * 招标公告(rebm_project_announcement) t_bid_announcement + * 询比价公告(rebm_project_announcement) t_bid_announcement * '中标'公告(rebm_announcement) t_bid_announcement */ QFilter Q1 = new QFilter("annorecruittitle", QCP.like, "%"+searchKey+"%"); @@ -73,14 +73,15 @@ public class CardSummaryFormPlugin extends AbstractBillPlugIn implements HyperLi } QFilter qfilter1 = (new QFilter("annotype", "=", "bidproject")).and("billstatus", "=", BillStatusEnum.AUDITED.getVal()).and("entitytypeid", "=", "rebm_announcement"). - and("signendtime", ">=", new Date()).and("publishstatus", "=", "L"); + and("signendtime", ">=", new Date()).and("publishstatus", "=", "L") + .and("annotitle",QCP.not_like,"%招标公告%"); DynamicObject[] rebm_project_announcements = BusinessDataServiceHelper.load("rebm_project_announcement", "id,annotitle,publishdate", new QFilter[]{Q2,qfilter1}); // "id,annotitle,publishdate", null); for (DynamicObject rebmProjectAnnouncement : rebm_project_announcements) { DynamicObject add = qeugEntryentity.addNew(); add.set("qeug_name", rebmProjectAnnouncement.getString("annotitle")); - add.set("qeug_type", "招标公告"); + add.set("qeug_type", "询比价公告"); add.set("qeug_sourceid", String.valueOf(rebmProjectAnnouncement.getLong("id"))); Date publishdate = rebmProjectAnnouncement.getDate("publishdate"); if (null != publishdate) { @@ -89,21 +90,42 @@ public class CardSummaryFormPlugin extends AbstractBillPlugIn implements HyperLi add.set("qeug_date", formattedDate); } } - QFilter qfilter = (new QFilter("annotype", "=", "decision")). - and("billstatus", "=", BillStatusEnum.AUDITED.getVal()).and("publishstatus", "=", - BillStatusEnum.RELEASED.getVal()).and("entitytypeid", "=", "rebm_announcement"); - DynamicObject[] rebm_announcements = BusinessDataServiceHelper.load("rebm_announcement", - "id,annotitle,publishdate", new QFilter[]{Q2,qfilter}); -// "id,annotitle,publishdate",null); +// QFilter qfilter = (new QFilter("annotype", "=", "decision")). +// and("billstatus", "=", BillStatusEnum.AUDITED.getVal()).and("publishstatus", "=", +// BillStatusEnum.RELEASED.getVal()).and("entitytypeid", "=", "rebm_announcement"); +// DynamicObject[] rebm_announcements = BusinessDataServiceHelper.load("rebm_announcement", +// "id,annotitle,publishdate", new QFilter[]{Q2,qfilter}); +//// "id,annotitle,publishdate",null); +// for (DynamicObject rebmAnnouncement : rebm_announcements) { +// DynamicObject add = qeugEntryentity.addNew(); +// add.set("qeug_name", rebmAnnouncement.getString("annotitle")); +// add.set("qeug_type", "中标公告"); +// add.set("qeug_sourceid", String.valueOf(rebmAnnouncement.getLong("id"))); +// Date publishdate = rebmAnnouncement.getDate("publishdate"); +// if (null != publishdate) { +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// String formattedDate = sdf.format(publishdate); +// add.set("qeug_date", formattedDate); +// } +// } + QFilter Q3 = new QFilter("notification_title", QCP.like, "%"+searchKey+"%"); + if (StringUtils.isEmpty(searchKey)) { + Q3 = null; + } + QFilter qfilter = (new QFilter("billstatus", "=", "RELEASED")); +// .and("billstatus", "=", BillStatusEnum.AUDITED.getVal()).and("publishstatus", "=", +// BillStatusEnum.RELEASED.getVal()).and("entitytypeid", "=", "rebm_announcement"); + DynamicObject[] rebm_announcements = BusinessDataServiceHelper.load("resm_notification", + "id,notification_title,auditdate", new QFilter[]{Q3,qfilter}); for (DynamicObject rebmAnnouncement : rebm_announcements) { DynamicObject add = qeugEntryentity.addNew(); - add.set("qeug_name", rebmAnnouncement.getString("annotitle")); - add.set("qeug_type", "中标公告"); + add.set("qeug_name", rebmAnnouncement.getString("notification_title")); + add.set("qeug_type", "通知公告"); add.set("qeug_sourceid", String.valueOf(rebmAnnouncement.getLong("id"))); - Date publishdate = rebmAnnouncement.getDate("publishdate"); - if (null != publishdate) { + Date auditdate = rebmAnnouncement.getDate("auditdate"); + if (null != auditdate) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String formattedDate = sdf.format(publishdate); + String formattedDate = sdf.format(auditdate); add.set("qeug_date", formattedDate); } } @@ -144,20 +166,25 @@ public class CardSummaryFormPlugin extends AbstractBillPlugIn implements HyperLi showParameter.setFormId("resm_annorecruit_preview"); showParameter.setStatus(OperationStatus.VIEW); showParameter.setCustomParam("annoId", Long.valueOf(annoId)); - showParameter.getOpenStyle().setShowType(ShowType.Modal); + showParameter.getOpenStyle().setShowType(ShowType.NewWindow); showParameter.setCustomParam("browsertabname", browsertabname); showParameter.setCloseCallBack(new CloseCallBack(this, "browsertabname")); } - if ("中标公告".equals(qeugType) || "招标公告".equals(qeugType)) { + if ("中标公告".equals(qeugType) || "询比价公告".equals(qeugType)) { TemplateManageHelper detailInformationHelper = new TemplateManageHelper(); showParameter = detailInformationHelper.getAnnoShowParameter("rebm", detailInformationHelper.getAnnoInvititle(), Long.valueOf(annoId)); showParameter.setCustomParam("browsertabname", browsertabname); - showParameter.getOpenStyle().setShowType(ShowType.Modal); + showParameter.getOpenStyle().setShowType(ShowType.NewWindow); + showParameter.setCloseCallBack(new CloseCallBack(this, "browsertabname")); + } + if ("通知公告".equals(qeugType)) { + showParameter.setFormId("resm_notification_view"); + showParameter.getOpenStyle().setShowType(ShowType.NewWindow); + showParameter.setHasRight(true); + showParameter.setStatus(OperationStatus.VIEW); + showParameter.setCustomParam("notificationId", annoId); showParameter.setCloseCallBack(new CloseCallBack(this, "browsertabname")); } - - - this.getView().showForm(showParameter); } } diff --git a/main/java/shkd/repc/resp/formplugin/PortalFormPlugin.java b/main/java/shkd/repc/resp/formplugin/PortalFormPlugin.java index 50c12dc..f2ba1c1 100644 --- a/main/java/shkd/repc/resp/formplugin/PortalFormPlugin.java +++ b/main/java/shkd/repc/resp/formplugin/PortalFormPlugin.java @@ -44,8 +44,8 @@ public class PortalFormPlugin extends AbstractFormPlugin implements SearchEnterL this.addClickListeners(new String[]{"qeug_buttonap"}); // 注册监听 - Search search = this.getControl("qeug_searchap"); - search.addEnterListener(this); +// Search search = this.getControl("qeug_searchap"); +// search.addEnterListener(this); } @Override diff --git a/main/java/shkd/repc/resp/portal/IndexEditNewPlugin.java b/main/java/shkd/repc/resp/portal/IndexEditNewPlugin.java index b575b05..8f8a477 100644 --- a/main/java/shkd/repc/resp/portal/IndexEditNewPlugin.java +++ b/main/java/shkd/repc/resp/portal/IndexEditNewPlugin.java @@ -267,15 +267,10 @@ public class IndexEditNewPlugin extends IndexEditNew implements SearchEnterListe @Override public void registerListener(EventObject e) { super.registerListener(e); - Search search = this.getView().getControl("qeug_searchap"); - //插件类实现SearchEnterListener接口，才能注册 - search.addEnterListener(this); - - - for(int i = 0; i < this.lablekeys.length; ++i) { - this.addClickListeners(new String[]{this.lablekeys[i]}); - } - +// Search search = this.getView().getControl("qeug_searchap"); +// //插件类实现SearchEnterListener接口，才能注册 +// search.addEnterListener(this); + this.addClickListeners(new String[]{"qeug_label_notification"}); // Container qeug_label_notification = (Container)this.getView().getControl("qeug_label_notification"); // qeug_label_notification.addClickListener(this); }