From 6330d2660e68a7bfd612b337d5e416aabd71f861 Mon Sep 17 00:00:00 2001 From: nanlei Date: Sun, 26 Apr 2015 00:47:12 +0800 Subject: [PATCH 1/2] Add custom date for front pages --- .../branchfile/BranchFileUpdateProcess.java | 15 ++++++++++++- .../discipline/DisciplineUpdateProcess.java | 15 ++++++++++++- .../evaluation/EvaluationUpdateProcess.java | 15 ++++++++++++- .../experience/ExperienceUpdateProcess.java | 15 ++++++++++++- .../imagenews/ImageNewsUpdateProcess.java | 15 ++++++++++++- .../InformationSecurityUpdateProcess.java | 15 ++++++++++++- .../process/admin/law/LawUpdateProcess.java | 16 ++++++++++++-- .../admin/legal/LegalUpdateProcess.java | 15 ++++++++++++- .../admin/notice/NoticeUpdateProcess.java | 15 ++++++++++++- .../policecase/PoliceCaseUpdateProcess.java | 15 ++++++++++++- .../PoliceCultureUpdateProcess.java | 15 ++++++++++++- .../PoliticalReportUpdateProcess.java | 15 ++++++++++++- .../SuperiorFileUpdateProcess.java | 15 ++++++++++++- .../admin/talent/TalentUpdateProcess.java | 15 ++++++++++++- .../workreport/WorkReportUpdateProcess.java | 15 ++++++++++++- .../ga/gxga/service/admin/ArticleService.java | 21 +++++++++++++------ .../ga/gxga/service/front/IndexService.java | 8 +++---- .../admin/branchfile/branchfile_create.ftl | 6 +++++- .../admin/branchfile/branchfile_list.ftl | 7 ++++--- .../admin/branchfile/branchfile_update.ftl | 6 +++++- .../admin/discipline/discipline_create.ftl | 6 +++++- .../admin/discipline/discipline_list.ftl | 7 ++++--- .../admin/discipline/discipline_update.ftl | 6 +++++- .../admin/evaluation/evaluation_create.ftl | 4 ++++ .../admin/evaluation/evaluation_list.ftl | 7 ++++--- .../admin/evaluation/evaluation_update.ftl | 4 ++++ .../admin/experience/experience_create.ftl | 6 +++++- .../admin/experience/experience_list.ftl | 7 ++++--- .../admin/experience/experience_update.ftl | 6 +++++- .../admin/imagenews/imagenews_create.ftl | 6 +++++- .../admin/imagenews/imagenews_list.ftl | 9 ++++---- .../admin/imagenews/imagenews_update.ftl | 6 +++++- .../informationsecurity_create.ftl | 6 +++++- .../informationsecurity_list.ftl | 9 ++++---- .../informationsecurity_update.ftl | 6 +++++- .../Freemarker/admin/law/law_create.ftl | 6 +++++- .../webapp/Freemarker/admin/law/law_list.ftl | 9 ++++---- .../Freemarker/admin/law/law_update.ftl | 6 +++++- .../Freemarker/admin/legal/legal_create.ftl | 6 +++++- .../Freemarker/admin/legal/legal_list.ftl | 7 ++++--- .../Freemarker/admin/legal/legal_update.ftl | 6 +++++- .../Freemarker/admin/notice/notice_create.ftl | 4 ++++ .../Freemarker/admin/notice/notice_list.ftl | 11 +++++----- .../Freemarker/admin/notice/notice_update.ftl | 4 ++++ .../policeculture/policeculture_create.ftl | 6 +++++- .../policeculture/policeculture_list.ftl | 7 ++++--- .../policeculture/policeculture_update.ftl | 6 +++++- .../politicalreport_create.ftl | 6 +++++- .../politicalreport/politicalreport_list.ftl | 9 ++++---- .../politicalreport_update.ftl | 6 +++++- .../superiorfile/superiorfile_create.ftl | 6 +++++- .../admin/superiorfile/superiorfile_list.ftl | 3 ++- .../superiorfile/superiorfile_update.ftl | 6 +++++- .../admin/workreport/workreport_create.ftl | 4 ++++ .../admin/workreport/workreport_list.ftl | 9 ++++---- .../admin/workreport/workreport_update.ftl | 4 ++++ .../Freemarker/common/front/page_macro.ftl | 10 ++++----- src/main/webapp/Freemarker/front/index.ftl | 2 +- src/main/webapp/Freemarker/front/latest.ftl | 6 +++--- 59 files changed, 419 insertions(+), 99 deletions(-) diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/branchfile/BranchFileUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/branchfile/BranchFileUpdateProcess.java index 2d3373a..8b5897a 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/branchfile/BranchFileUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/branchfile/BranchFileUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.branchfile; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/discipline/DisciplineUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/discipline/DisciplineUpdateProcess.java index 1e1f329..90fe5ff 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/discipline/DisciplineUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/discipline/DisciplineUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.discipline; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/evaluation/EvaluationUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/evaluation/EvaluationUpdateProcess.java index 88d3135..cb97d32 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/evaluation/EvaluationUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/evaluation/EvaluationUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.evaluation; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/experience/ExperienceUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/experience/ExperienceUpdateProcess.java index 90fa173..74c6ec2 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/experience/ExperienceUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/experience/ExperienceUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.experience; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -36,13 +39,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/imagenews/ImageNewsUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/imagenews/ImageNewsUpdateProcess.java index af0d601..97ea456 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/imagenews/ImageNewsUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/imagenews/ImageNewsUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.imagenews; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/informationsecurity/InformationSecurityUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/informationsecurity/InformationSecurityUpdateProcess.java index e9ffeb1..0504e53 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/informationsecurity/InformationSecurityUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/informationsecurity/InformationSecurityUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.informationsecurity; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/law/LawUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/law/LawUpdateProcess.java index a75b5d4..bd816b6 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/law/LawUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/law/LawUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.law; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); @@ -49,5 +62,4 @@ public Result process(HttpServletRequest request, return new Result(this.getSuccessView(), model); } - } diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/legal/LegalUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/legal/LegalUpdateProcess.java index 5b8e38c..592a839 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/legal/LegalUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/legal/LegalUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.legal; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/notice/NoticeUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/notice/NoticeUpdateProcess.java index d75adc3..55556c4 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/notice/NoticeUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/notice/NoticeUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.notice; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policecase/PoliceCaseUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policecase/PoliceCaseUpdateProcess.java index ded031a..d7c5d39 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policecase/PoliceCaseUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policecase/PoliceCaseUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.policecase; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policeculture/PoliceCultureUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policeculture/PoliceCultureUpdateProcess.java index dc5d250..1812bb6 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policeculture/PoliceCultureUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/policeculture/PoliceCultureUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.policeculture; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -36,13 +39,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/politicalreport/PoliticalReportUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/politicalreport/PoliticalReportUpdateProcess.java index db20ea8..16ccf83 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/politicalreport/PoliticalReportUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/politicalreport/PoliticalReportUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.politicalreport; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/superiorfile/SuperiorFileUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/superiorfile/SuperiorFileUpdateProcess.java index 4bcb06d..a8598b3 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/superiorfile/SuperiorFileUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/superiorfile/SuperiorFileUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.superiorfile; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -36,13 +39,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/talent/TalentUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/talent/TalentUpdateProcess.java index c7f307b..533cf6d 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/talent/TalentUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/talent/TalentUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.talent; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/workreport/WorkReportUpdateProcess.java b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/workreport/WorkReportUpdateProcess.java index 157bd4e..ad5f970 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/workreport/WorkReportUpdateProcess.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/process/admin/workreport/WorkReportUpdateProcess.java @@ -1,11 +1,14 @@ package cn.gov.dl.ga.gxga.process.admin.workreport; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; + import cn.gov.dl.ga.gxga.core.Constant; import cn.gov.dl.ga.gxga.core.controller.Process; import cn.gov.dl.ga.gxga.core.controller.Result; @@ -35,13 +38,23 @@ public Result process(HttpServletRequest request, String articleTitle = params.get("articleTitle"); String articleContent = (String) request.getAttribute("articleContent"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); int createBy = (Integer) loginUser.get("userId"); String createByName = (String) loginUser.get("realName"); String createByIP = CoreUtil.getIPAddr(request); String articleId = params.get("articleId"); + if (StringUtils.isNotEmpty(articleDate)) { + articleDate = new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate)); + } else { + articleDate = null; + } + Object[] parameters = new Object[] { articleTitle, articleContent, - articleOrder, createBy, createByName, createByIP, articleId }; + articleOrder, articleDate, createBy, createByName, createByIP, + articleId }; articleService.updateArtileById(parameters); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/ArticleService.java b/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/ArticleService.java index 121eb0c..cb7849b 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/ArticleService.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/ArticleService.java @@ -3,6 +3,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -32,7 +33,7 @@ public HashMap getArticleByTypeAndCode(String articleType, SQL_GET_ARTICLE_BY_TYPE_AND_CODE, articleType, articleCode); } - private static final String SQL_SEARCH_ARTICLES_BY_TYPE_PREFIX = "select a.articleId, a.articleType, a.articleTitle, a.articleOrder, c.constantName as articleStatus, a.createBy, a.createByName, date_format(a.createByTime,'%Y-%m-%d %H:%i:%s') as createByTime, a.createByIP, a.pageView, d.departmentName from doc_article a, hr_department d, sys_constant c "; + private static final String SQL_SEARCH_ARTICLES_BY_TYPE_PREFIX = "select a.articleId, a.articleType, a.articleTitle, a.articleOrder, c.constantName as articleStatus, a.articleDate, a.createBy, a.createByName, date_format(a.createByTime,'%Y-%m-%d %H:%i:%s') as createByTime, a.createByIP, a.pageView, d.departmentName from doc_article a, hr_department d, sys_constant c "; private static final String SQL_SEARCH_ARTICLES_BY_TYPE_SUFFIX = "order by "; // Search by type @@ -120,7 +121,8 @@ private QueryHelper buildQueryConditionByArticleTypeAndCode( return helper; } - public int createArticle(HttpServletRequest request, String articleType) { + public int createArticle(HttpServletRequest request, String articleType) + throws Exception { HashMap parameters = buildInsertCondition(request, articleType, null, null, null); @@ -135,7 +137,7 @@ public int createArticle(HttpServletRequest request, String articleType) { } public int createArticle(HttpServletRequest request, String articleType, - String articleCode) { + String articleCode) throws Exception { HashMap parameters = buildInsertCondition(request, articleType, articleCode, null, null); @@ -152,7 +154,7 @@ public int createArticle(HttpServletRequest request, String articleType, @SuppressWarnings("unchecked") private HashMap buildInsertCondition( HttpServletRequest request, String articleType, String articleCode, - String dcId, String videoId) { + String dcId, String videoId) throws Exception { Map loginUser = (Map) request .getSession().getAttribute(Constant.LOGIN_USER); int createBy = (Integer) loginUser.get("userId"); @@ -171,6 +173,8 @@ private HashMap buildInsertCondition( String articleTitle = params.get("articleTitle"); String articleOrder = params.get("articleOrder"); + String articleDate = params.get("articleDate"); + String articleContent = (String) request.getAttribute("articleContent"); HashMap parameters = new HashMap(); @@ -195,6 +199,11 @@ private HashMap buildInsertCondition( } else { parameters.put("videoId", "0"); } + if (StringUtils.isNotEmpty(articleDate)) { + parameters.put("articleDate", new SimpleDateFormat("yyyy-MM-dd") + .format(new SimpleDateFormat("yyyy-MM-dd") + .parse(articleDate))); + } parameters.put("articleTitle", articleTitle); parameters.put("articleOrder", articleOrder); @@ -216,7 +225,7 @@ public HashMap getArticleById(String articleId) { articleId); } - private static final String SQL_UPDATE_ARTICLE_BY_ID = "update doc_article set articleTitle=?, articleContent=?, articleOrder=?, createBy=?, createByName=?, createByTime=now(), createByIP=? where articleId=?"; + private static final String SQL_UPDATE_ARTICLE_BY_ID = "update doc_article set articleTitle=?, articleContent=?, articleOrder=?, articleDate=?, createBy=?, createByName=?, createByTime=now(), createByIP=? where articleId=?"; public int updateArtileById(Object[] parameters) { return jt.update(SQL_UPDATE_ARTICLE_BY_ID, parameters); @@ -583,7 +592,7 @@ private QueryHelper buildQueryConditionByDcId(HttpServletRequest request) { } public int createArticleForDepartment(HttpServletRequest request, - String dcId, String videoId) { + String dcId, String videoId) throws Exception { HashMap parameters = buildInsertCondition(request, null, null, dcId, videoId); diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java b/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java index fdbcf4c..8dc7a00 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java @@ -19,7 +19,7 @@ public List> getArticleByType(String articleType) { return jt.queryForList(SQL_GET_ARTICLE_BY_TYPE, articleType); } - private static final String SQL_GET_ARTICLE_LIST_BY_TYPE = "select articleId, articleType, articleTitle, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where articleType=? order by createByTime desc"; + private static final String SQL_GET_ARTICLE_LIST_BY_TYPE = "select articleId, articleType, articleTitle, date_format(articleDate,'%Y-%m-%d') as articleDate, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where articleType=? order by articleDate desc, createByTime desc"; public PagingList getArticleListByType(HttpServletRequest request, String articleType) { @@ -63,7 +63,7 @@ public List> getArticleListByDcId(String dcId) { return jt.queryForList(SQL_GET_ARTICLE_BY_DCID_FOR_LIST, dcId); } - private static final String SQL_GET_ARTICLE_BY_ID = "select articleId, articleType, articleCode, articleTitle, articleContent, videoId, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where articleId=?"; + private static final String SQL_GET_ARTICLE_BY_ID = "select articleId, articleType, articleCode, articleTitle, articleContent, videoId, date_format(articleDate,'%Y-%m-%d') as articleDate, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where articleId=?"; public Map getArticleById(String articleId) { return jt @@ -82,8 +82,8 @@ public List> getLinkByType(String linkType) { return jt.queryForList(SQL_GET_LINK_BY_TYPE, linkType); } - private static final String SQL_GET_LATEST_ARTICLES = "select articleId, articleTitle, articleType, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where length(articleCode)=0 order by createByTime desc limit 0,20"; - private static final String SQL_GET_LATEST = "select articleId, articleTitle, articleType, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where length(articleCode)=0 order by createByTime desc"; + private static final String SQL_GET_LATEST_ARTICLES = "select articleId, articleTitle, articleType, date_format(articleDate,'%Y-%m-%d') as articleDate, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where length(articleCode)=0 order by articleDate desc, createByTime desc limit 0,20"; + private static final String SQL_GET_LATEST = "select articleId, articleTitle, articleType, date_format(articleDate,'%Y-%m-%d') as articleDate, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where length(articleCode)=0 order by articleDate desc, createByTime desc"; public List> getLatestArticles() { return jt.queryForList(SQL_GET_LATEST_ARTICLES); diff --git a/src/main/webapp/Freemarker/admin/branchfile/branchfile_create.ftl b/src/main/webapp/Freemarker/admin/branchfile/branchfile_create.ftl index 0bc1834..9d32cb1 100644 --- a/src/main/webapp/Freemarker/admin/branchfile/branchfile_create.ftl +++ b/src/main/webapp/Freemarker/admin/branchfile/branchfile_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（分局文件）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/branchfile.do?command=create", + url: "${base}/admin/branchfile.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/branchfile/branchfile_list.ftl b/src/main/webapp/Freemarker/admin/branchfile/branchfile_list.ftl index a57d9ef..5d172fd 100644 --- a/src/main/webapp/Freemarker/admin/branchfile/branchfile_list.ftl +++ b/src/main/webapp/Freemarker/admin/branchfile/branchfile_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/branchfile.do?command=createpre", + url: "${base}/admin/branchfile.do?command=createpre", title: "新建分局文件", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/branchfile.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/branchfile.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改分局文件："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/branchfile.do?command=delete", + url: "${base}/admin/branchfile.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/branchfile/branchfile_update.ftl b/src/main/webapp/Freemarker/admin/branchfile/branchfile_update.ftl index de594c2..3419569 100644 --- a/src/main/webapp/Freemarker/admin/branchfile/branchfile_update.ftl +++ b/src/main/webapp/Freemarker/admin/branchfile/branchfile_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（分局文件）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/branchfile.do?command=update", + url: "${base}/admin/branchfile.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/discipline/discipline_create.ftl b/src/main/webapp/Freemarker/admin/discipline/discipline_create.ftl index c69e30f..30d2f19 100644 --- a/src/main/webapp/Freemarker/admin/discipline/discipline_create.ftl +++ b/src/main/webapp/Freemarker/admin/discipline/discipline_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（纪检监察）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/discipline.do?command=create", + url: "${base}/admin/discipline.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/discipline/discipline_list.ftl b/src/main/webapp/Freemarker/admin/discipline/discipline_list.ftl index b79b4c2..bd88e58 100644 --- a/src/main/webapp/Freemarker/admin/discipline/discipline_list.ftl +++ b/src/main/webapp/Freemarker/admin/discipline/discipline_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/discipline.do?command=createpre", + url: "${base}/admin/discipline.do?command=createpre", title: "新建纪检监察", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/discipline.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/discipline.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改纪检监察："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/discipline.do?command=delete", + url: "${base}/admin/discipline.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/discipline/discipline_update.ftl b/src/main/webapp/Freemarker/admin/discipline/discipline_update.ftl index 670e846..2d5b4a5 100644 --- a/src/main/webapp/Freemarker/admin/discipline/discipline_update.ftl +++ b/src/main/webapp/Freemarker/admin/discipline/discipline_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（纪检监察）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/discipline.do?command=update", + url: "${base}/admin/discipline.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl index 16b17d6..6dda7a5 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（综合考评）" /> diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_list.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_list.ftl index dc41984..edff56a 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_list.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/evaluation.do?command=createpre", + url: "${base}/admin/evaluation.do?command=createpre", title: "新建综合考评", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/evaluation.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/evaluation.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改综合考评："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/evaluation.do?command=delete", + url: "${base}/admin/evaluation.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl index 9052080..674ca0d 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（综合考评）')}" /> diff --git a/src/main/webapp/Freemarker/admin/experience/experience_create.ftl b/src/main/webapp/Freemarker/admin/experience/experience_create.ftl index 4855068..f4bb2ed 100644 --- a/src/main/webapp/Freemarker/admin/experience/experience_create.ftl +++ b/src/main/webapp/Freemarker/admin/experience/experience_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（经验交流）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/experience.do?command=create", + url: "${base}/admin/experience.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/experience/experience_list.ftl b/src/main/webapp/Freemarker/admin/experience/experience_list.ftl index 18e9549..94d4cb5 100644 --- a/src/main/webapp/Freemarker/admin/experience/experience_list.ftl +++ b/src/main/webapp/Freemarker/admin/experience/experience_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/experience.do?command=createpre", + url: "${base}/admin/experience.do?command=createpre", title: "新建经验交流", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/experience.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/experience.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改经验交流："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/experience.do?command=delete", + url: "${base}/admin/experience.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/experience/experience_update.ftl b/src/main/webapp/Freemarker/admin/experience/experience_update.ftl index ab45b82..fc3e6a5 100644 --- a/src/main/webapp/Freemarker/admin/experience/experience_update.ftl +++ b/src/main/webapp/Freemarker/admin/experience/experience_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（经验交流）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/experience.do?command=update", + url: "${base}/admin/experience.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/imagenews/imagenews_create.ftl b/src/main/webapp/Freemarker/admin/imagenews/imagenews_create.ftl index 9815765..d79cbc1 100644 --- a/src/main/webapp/Freemarker/admin/imagenews/imagenews_create.ftl +++ b/src/main/webapp/Freemarker/admin/imagenews/imagenews_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（图片新闻）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/imagenews.do?command=create", + url: "${base}/admin/imagenews.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/imagenews/imagenews_list.ftl b/src/main/webapp/Freemarker/admin/imagenews/imagenews_list.ftl index 9c2b96a..0915ff7 100644 --- a/src/main/webapp/Freemarker/admin/imagenews/imagenews_list.ftl +++ b/src/main/webapp/Freemarker/admin/imagenews/imagenews_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,8 +68,8 @@ function Add() { mini.open({ - url: "/admin/imagenews.do?command=createpre", - title: "新建图片新闻", width: 900, height: 580, + url: "${base}/admin/imagenews.do?command=createpre", + title: "新建图片新闻", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/imagenews.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/imagenews.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改法律："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/imagenews.do?command=delete", + url: "${base}/admin/imagenews.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/imagenews/imagenews_update.ftl b/src/main/webapp/Freemarker/admin/imagenews/imagenews_update.ftl index fa73b8a..edc2bf1 100644 --- a/src/main/webapp/Freemarker/admin/imagenews/imagenews_update.ftl +++ b/src/main/webapp/Freemarker/admin/imagenews/imagenews_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（图片新闻）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/imagenews.do?command=update", + url: "${base}/admin/imagenews.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_create.ftl b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_create.ftl index e92e805..5f76927 100644 --- a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_create.ftl +++ b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（信息安全）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/informationsecurity.do?command=create", + url: "${base}/admin/informationsecurity.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_list.ftl b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_list.ftl index bc53ebc..f24c781 100644 --- a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_list.ftl +++ b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,8 +68,8 @@ function Add() { mini.open({ - url: "/admin/informationsecurity.do?command=createpre", - title: "新建信息安全", width: 900, height: 580, + url: "${base}/admin/informationsecurity.do?command=createpre", + title: "新建信息安全", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/informationsecurity.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/informationsecurity.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改信息安全："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/informationsecurity.do?command=delete", + url: "${base}/admin/informationsecurity.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_update.ftl b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_update.ftl index 3794758..370b055 100644 --- a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_update.ftl +++ b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（信息安全）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/informationsecurity.do?command=update", + url: "${base}/admin/informationsecurity.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/law/law_create.ftl b/src/main/webapp/Freemarker/admin/law/law_create.ftl index 1e1b24f..845e454 100644 --- a/src/main/webapp/Freemarker/admin/law/law_create.ftl +++ b/src/main/webapp/Freemarker/admin/law/law_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（法律纵览）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/law.do?command=create", + url: "${base}/admin/law.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/law/law_list.ftl b/src/main/webapp/Freemarker/admin/law/law_list.ftl index 9dfc4c4..e4ff1c5 100644 --- a/src/main/webapp/Freemarker/admin/law/law_list.ftl +++ b/src/main/webapp/Freemarker/admin/law/law_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -69,8 +70,8 @@ function Add() { mini.open({ - url: "/admin/law.do?command=createpre", - title: "新建法律", width: 900, height: 580, + url: "${base}/admin/law.do?command=createpre", + title: "新建法律", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -82,7 +83,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/law.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/law.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改法律："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -137,7 +138,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/law.do?command=delete", + url: "${base}/admin/law.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/law/law_update.ftl b/src/main/webapp/Freemarker/admin/law/law_update.ftl index 149e0ca..d7bb3ad 100644 --- a/src/main/webapp/Freemarker/admin/law/law_update.ftl +++ b/src/main/webapp/Freemarker/admin/law/law_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（法律纵览）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/law.do?command=update", + url: "${base}/admin/law.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/legal/legal_create.ftl b/src/main/webapp/Freemarker/admin/legal/legal_create.ftl index a95dcd3..958c1cb 100644 --- a/src/main/webapp/Freemarker/admin/legal/legal_create.ftl +++ b/src/main/webapp/Freemarker/admin/legal/legal_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（公安法制）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/legal.do?command=create", + url: "${base}/admin/legal.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/legal/legal_list.ftl b/src/main/webapp/Freemarker/admin/legal/legal_list.ftl index e71cf37..d96d523 100644 --- a/src/main/webapp/Freemarker/admin/legal/legal_list.ftl +++ b/src/main/webapp/Freemarker/admin/legal/legal_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/legal.do?command=createpre", + url: "${base}/admin/legal.do?command=createpre", title: "新建公安法制", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/legal.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/legal.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改公安法制："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/legal.do?command=delete", + url: "${base}/admin/legal.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/legal/legal_update.ftl b/src/main/webapp/Freemarker/admin/legal/legal_update.ftl index 527ef6e..9c75760 100644 --- a/src/main/webapp/Freemarker/admin/legal/legal_update.ftl +++ b/src/main/webapp/Freemarker/admin/legal/legal_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（公安法制）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/legal.do?command=update", + url: "${base}/admin/legal.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/notice/notice_create.ftl b/src/main/webapp/Freemarker/admin/notice/notice_create.ftl index cb107db..181c862 100644 --- a/src/main/webapp/Freemarker/admin/notice/notice_create.ftl +++ b/src/main/webapp/Freemarker/admin/notice/notice_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（通知通报）" /> diff --git a/src/main/webapp/Freemarker/admin/notice/notice_list.ftl b/src/main/webapp/Freemarker/admin/notice/notice_list.ftl index 5cb9667..85144d6 100644 --- a/src/main/webapp/Freemarker/admin/notice/notice_list.ftl +++ b/src/main/webapp/Freemarker/admin/notice/notice_list.ftl @@ -37,6 +37,7 @@
标题
排序
状态
+
文章日期
更新人
更新时间
IP
@@ -65,8 +66,8 @@ function Add() { mini.open({ - url: "/admin/notice.do?command=createpre", - title: "新建通知通报", width: 900, height: 580, + url: "${base}/admin/notice.do?command=createpre", + title: "新建通知通报", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -78,8 +79,8 @@ if (rows.length==1) { mini.open({ - url: "/admin/notice.do?command=updatedispatcher&articleId="+rows[0].articleId, - title: "修改法律："+rows[0].articleTitle, width: 900, height: 610, + url: "${base}/admin/notice.do?command=updatedispatcher&articleId="+rows[0].articleId, + title: "修改通知通报："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); } @@ -133,7 +134,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/notice.do?command=delete", + url: "${base}/admin/notice.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/notice/notice_update.ftl b/src/main/webapp/Freemarker/admin/notice/notice_update.ftl index c24641c..4f622b8 100644 --- a/src/main/webapp/Freemarker/admin/notice/notice_update.ftl +++ b/src/main/webapp/Freemarker/admin/notice/notice_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（通知通报）')}" /> diff --git a/src/main/webapp/Freemarker/admin/policeculture/policeculture_create.ftl b/src/main/webapp/Freemarker/admin/policeculture/policeculture_create.ftl index bec4539..862ea75 100644 --- a/src/main/webapp/Freemarker/admin/policeculture/policeculture_create.ftl +++ b/src/main/webapp/Freemarker/admin/policeculture/policeculture_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（警营文化）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/policeculture.do?command=create", + url: "${base}/admin/policeculture.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/policeculture/policeculture_list.ftl b/src/main/webapp/Freemarker/admin/policeculture/policeculture_list.ftl index 778706b..2cdf7ca 100644 --- a/src/main/webapp/Freemarker/admin/policeculture/policeculture_list.ftl +++ b/src/main/webapp/Freemarker/admin/policeculture/policeculture_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,7 +68,7 @@ function Add() { mini.open({ - url: "/admin/policeculture.do?command=createpre", + url: "${base}/admin/policeculture.do?command=createpre", title: "新建警营文化", width: 900, height: 580, ondestroy: function (action) { Search(); @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/policeculture.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/policeculture.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改警营文化："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/policeculture.do?command=delete", + url: "${base}/admin/policeculture.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/policeculture/policeculture_update.ftl b/src/main/webapp/Freemarker/admin/policeculture/policeculture_update.ftl index d2d6ddb..d1933ba 100644 --- a/src/main/webapp/Freemarker/admin/policeculture/policeculture_update.ftl +++ b/src/main/webapp/Freemarker/admin/policeculture/policeculture_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（警营文化）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/policeculture.do?command=update", + url: "${base}/admin/policeculture.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_create.ftl b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_create.ftl index f0f9ce2..9667883 100644 --- a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_create.ftl +++ b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（政工简报）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/politicalreport.do?command=create", + url: "${base}/admin/politicalreport.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_list.ftl b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_list.ftl index dc817ff..66ce5dd 100644 --- a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_list.ftl +++ b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,8 +68,8 @@ function Add() { mini.open({ - url: "/admin/politicalreport.do?command=createpre", - title: "新建政工简报", width: 900, height: 580, + url: "${base}/admin/politicalreport.do?command=createpre", + title: "新建政工简报", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/politicalreport.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/politicalreport.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改政工简报："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/politicalreport.do?command=delete", + url: "${base}/admin/politicalreport.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_update.ftl b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_update.ftl index 0d03de6..cf21b60 100644 --- a/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_update.ftl +++ b/src/main/webapp/Freemarker/admin/politicalreport/politicalreport_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（政工简报）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/politicalreport.do?command=update", + url: "${base}/admin/politicalreport.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_create.ftl b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_create.ftl index 9a7ae39..648e0b2 100644 --- a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_create.ftl +++ b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（上级文件）" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/superiorfile.do?command=create", + url: "${base}/admin/superiorfile.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_list.ftl b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_list.ftl index 6495f02..1af09b7 100644 --- a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_list.ftl +++ b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_list.ftl @@ -37,6 +37,7 @@
标题
排序
状态
+
文章日期
更新人
更新时间
IP
@@ -66,7 +67,7 @@ function Add() { mini.open({ url: "${base}/admin/superiorfile.do?command=createpre", - title: "新建上级文件", width: 900, height: 580, + title: "新建上级文件", width: 900, height: 600, ondestroy: function (action) { Search(); } diff --git a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_update.ftl b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_update.ftl index d3150a0..05567e2 100644 --- a/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_update.ftl +++ b/src/main/webapp/Freemarker/admin/superiorfile/superiorfile_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（上级文件）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/superiorfile.do?command=update", + url: "${base}/admin/superiorfile.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/workreport/workreport_create.ftl b/src/main/webapp/Freemarker/admin/workreport/workreport_create.ftl index 089e38d..097bcce 100644 --- a/src/main/webapp/Freemarker/admin/workreport/workreport_create.ftl +++ b/src/main/webapp/Freemarker/admin/workreport/workreport_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（工作简报）" /> diff --git a/src/main/webapp/Freemarker/admin/workreport/workreport_list.ftl b/src/main/webapp/Freemarker/admin/workreport/workreport_list.ftl index 97741b4..6f7e81f 100644 --- a/src/main/webapp/Freemarker/admin/workreport/workreport_list.ftl +++ b/src/main/webapp/Freemarker/admin/workreport/workreport_list.ftl @@ -39,6 +39,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -67,8 +68,8 @@ function Add() { mini.open({ - url: "/admin/workreport.do?command=createpre", - title: "新建工作简报", width: 900, height: 580, + url: "${base}/admin/workreport.do?command=createpre", + title: "新建工作简报", width: 900, height: 600, ondestroy: function (action) { Search(); } @@ -80,7 +81,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/workreport.do?command=updatedispatcher&articleId="+rows[0].articleId, + url: "${base}/admin/workreport.do?command=updatedispatcher&articleId="+rows[0].articleId, title: "修改工作简报："+rows[0].articleTitle, width: 900, height: 610, ondestroy: function (action) { Search(); @@ -135,7 +136,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/workreport.do?command=delete", + url: "${base}/admin/workreport.do?command=delete", data: { articleIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/workreport/workreport_update.ftl b/src/main/webapp/Freemarker/admin/workreport/workreport_update.ftl index 3631890..71ec054 100644 --- a/src/main/webapp/Freemarker/admin/workreport/workreport_update.ftl +++ b/src/main/webapp/Freemarker/admin/workreport/workreport_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（工作简报）')}" /> diff --git a/src/main/webapp/Freemarker/common/front/page_macro.ftl b/src/main/webapp/Freemarker/common/front/page_macro.ftl index 3af86ab..3ea27ff 100644 --- a/src/main/webapp/Freemarker/common/front/page_macro.ftl +++ b/src/main/webapp/Freemarker/common/front/page_macro.ftl @@ -157,9 +157,9 @@ @@ -290,7 +290,7 @@ <#assign imageList=ftlUtil.getImageByArticleId('${article.articleId}')/>

${article.articleTitle}

-

发布时间：${article.createByTime}

+

发布时间：<#if article.articleDate??>${article.articleDate}<#else>${article.createByTime}

<#if imageList?size!=0>
<#list imageList as image> @@ -304,7 +304,7 @@ <#else><#-- ATTACHMENT -->

${article.articleTitle}

-

发布时间：${article.createByTime}

+

发布时间：<#if article.articleDate??>${article.articleDate}<#else>${article.createByTime}

${article.articleContent}
diff --git a/src/main/webapp/Freemarker/front/index.ftl b/src/main/webapp/Freemarker/front/index.ftl index 8561680..0a9c8ac 100644 --- a/src/main/webapp/Freemarker/front/index.ftl +++ b/src/main/webapp/Freemarker/front/index.ftl @@ -222,7 +222,7 @@ diff --git a/src/main/webapp/Freemarker/front/latest.ftl b/src/main/webapp/Freemarker/front/latest.ftl index 4be0b3d..c3a4631 100644 --- a/src/main/webapp/Freemarker/front/latest.ftl +++ b/src/main/webapp/Freemarker/front/latest.ftl @@ -21,11 +21,11 @@ From 864215137788fe453f92c6caf69b16dd0e12e7be Mon Sep 17 00:00:00 2001 From: nanlei Date: Sun, 26 Apr 2015 21:19:08 +0800 Subject: [PATCH 2/2] Some tech end improvement --- .../gov/dl/ga/gxga/service/admin/DocWordService.java | 2 +- .../cn/gov/dl/ga/gxga/service/front/IndexService.java | 6 +++--- .../branchdepartment_updatedetailsearch.ftl | 4 ++-- .../admin/branchfile/branchfile_updatedetailsearch.ftl | 4 ++-- .../webapp/Freemarker/admin/branchoverview/agency.ftl | 10 +++++----- .../webapp/Freemarker/admin/branchoverview/honor.ftl | 10 +++++----- .../webapp/Freemarker/admin/branchoverview/leader.ftl | 10 +++++----- .../Freemarker/admin/branchoverview/memorabilia.ftl | 10 +++++----- .../Freemarker/admin/category/category_create.ftl | 2 +- .../webapp/Freemarker/admin/category/category_list.ftl | 6 +++--- .../Freemarker/admin/category/category_update.ftl | 2 +- .../Freemarker/admin/constant/constant_create.ftl | 2 +- .../webapp/Freemarker/admin/constant/constant_list.ftl | 6 +++--- .../Freemarker/admin/constant/constant_update.ftl | 2 +- .../Freemarker/admin/department/department_create.ftl | 2 +- .../Freemarker/admin/department/department_list.ftl | 6 +++--- .../admin/discipline/discipline_updatedetailsearch.ftl | 4 ++-- .../webapp/Freemarker/admin/employee/employee_list.ftl | 4 ++-- .../Freemarker/admin/employee/employee_update.ftl | 2 +- .../Freemarker/admin/evaluation/evaluation_create.ftl | 2 +- .../Freemarker/admin/evaluation/evaluation_update.ftl | 2 +- .../admin/evaluation/evaluation_updatedetailsearch.ftl | 4 ++-- .../admin/experience/experience_updatedetailsearch.ftl | 4 ++-- .../Freemarker/admin/externalip/externalip_create.ftl | 2 +- .../Freemarker/admin/externalip/externalip_list.ftl | 6 +++--- .../Freemarker/admin/externalip/externalip_update.ftl | 2 +- src/main/webapp/Freemarker/admin/image/image_list.ftl | 6 +++--- .../admin/imagenews/imagenews_updatedetailsearch.ftl | 4 ++-- .../informationsecurity_updatedetailsearch.ftl | 4 ++-- .../webapp/Freemarker/admin/issue/issue_create.ftl | 2 +- src/main/webapp/Freemarker/admin/issue/issue_list.ftl | 10 +++++----- .../webapp/Freemarker/admin/issue/issue_update.ftl | 2 +- .../Freemarker/admin/issueword/issueword_list.ftl | 4 ++-- .../admin/jobline/jobline_updatedetailsearch.ftl | 4 ++-- .../Freemarker/admin/law/law_updatedetailsearch.ftl | 4 ++-- .../admin/legal/legal_updatedetailsearch.ftl | 4 ++-- src/main/webapp/Freemarker/admin/link/link_create.ftl | 2 +- src/main/webapp/Freemarker/admin/link/link_list.ftl | 6 +++--- src/main/webapp/Freemarker/admin/link/link_update.ftl | 2 +- .../admin/memorabiliaindex/memorabiliaindex_create.ftl | 2 +- .../Freemarker/admin/policecase/policecase_create.ftl | 6 +++++- .../Freemarker/admin/policecase/policecase_list.ftl | 3 ++- .../Freemarker/admin/policecase/policecase_update.ftl | 6 +++++- src/main/webapp/Freemarker/common/front/page_macro.ftl | 4 ++-- 44 files changed, 100 insertions(+), 91 deletions(-) diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/DocWordService.java b/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/DocWordService.java index bb3346a..25813e7 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/DocWordService.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/service/admin/DocWordService.java @@ -24,7 +24,7 @@ import cn.gov.dl.ga.gxga.util.SqlHelper; public class DocWordService extends BaseService { - private static final String SQL_SEARCH_DOC_WORD_BY_TYPE_PREFIX = "select w.wordId, w.wordTitle, w.wordDate, w.filePath, w.wordOrder, w.createByName, w.createByTime, w.createByIP from doc_word w "; + private static final String SQL_SEARCH_DOC_WORD_BY_TYPE_PREFIX = "select w.wordId, w.wordTitle, w.wordDate, w.filePath, w.wordOrder, w.createByName, date_format(w.createByTime,'%Y-%m-%d %H:%i:%s') as createByTime, w.createByIP from doc_word w "; private static final String SQL_SEARCH_DOC_WORD_BY_TYPE_SUFFIX = "order by "; // Search by type diff --git a/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java b/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java index 8dc7a00..f5b33af 100644 --- a/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java +++ b/src/main/java/src/cn/gov/dl/ga/gxga/service/front/IndexService.java @@ -369,10 +369,10 @@ public PagingList searchArticlesForIndex(HttpServletRequest request) { // PoliceCase private static final String SQL_GET_POLICE_CASE = "select * from (" - + "select articleId as articleId, articleTitle as articleTitle, '' as filePath, 'POLICECASE' as articleType, 'ARTICLE' as type, createByTime from doc_article where articleType=?" + + "select articleId as articleId, articleTitle as articleTitle, '' as filePath, 'POLICECASE' as articleType, 'ARTICLE' as type, articleDate, date_format(createByTime,'%Y-%m-%d') as createByTime from doc_article where articleType=?" + " union " - + "select wordId as articleId, wordTitle as articleTitle, filePath, 'POLICECASE' as articleType, 'WORD' as type, wordDate as createByTime from doc_word where wordType=?) result " - + "order by createByTime desc"; + + "select wordId as articleId, wordTitle as articleTitle, filePath, 'POLICECASE' as articleType, 'WORD' as type, wordDate as articleDate, wordDate as createByTime from doc_word where wordType=?) result " + + "order by articleDate desc, createByTime desc"; public List> getPoliceCase() { return jt.queryForList(SQL_GET_POLICE_CASE + INDEX_LIST_LIMT, diff --git a/src/main/webapp/Freemarker/admin/branchdepartment/branchdepartment_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/branchdepartment/branchdepartment_updatedetailsearch.ftl index 16f3471..62acc13 100644 --- a/src/main/webapp/Freemarker/admin/branchdepartment/branchdepartment_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/branchdepartment/branchdepartment_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/branchfile/branchfile_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/branchfile/branchfile_updatedetailsearch.ftl index 8abaad7..9f7830b 100644 --- a/src/main/webapp/Freemarker/admin/branchfile/branchfile_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/branchfile/branchfile_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/branchoverview/agency.ftl b/src/main/webapp/Freemarker/admin/branchoverview/agency.ftl index 310ab89..edafc22 100644 --- a/src/main/webapp/Freemarker/admin/branchoverview/agency.ftl +++ b/src/main/webapp/Freemarker/admin/branchoverview/agency.ftl @@ -204,7 +204,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addimage", + url: "${base}/admin/article.do?command=addimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -250,7 +250,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteimage", + url: "${base}/admin/article.do?command=deleteimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -315,7 +315,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -361,7 +361,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -390,7 +390,7 @@ function Save(){ $.ajax({ - url: "/admin/branchoverview.do?command=updateagency", + url: "${base}/admin/branchoverview.do?command=updateagency", data: { articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/branchoverview/honor.ftl b/src/main/webapp/Freemarker/admin/branchoverview/honor.ftl index ef802d9..1539aa2 100644 --- a/src/main/webapp/Freemarker/admin/branchoverview/honor.ftl +++ b/src/main/webapp/Freemarker/admin/branchoverview/honor.ftl @@ -202,7 +202,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addimage", + url: "${base}/admin/article.do?command=addimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -248,7 +248,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteimage", + url: "${base}/admin/article.do?command=deleteimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -313,7 +313,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -359,7 +359,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -388,7 +388,7 @@ function Save(){ $.ajax({ - url: "/admin/branchoverview.do?command=updatehonor", + url: "${base}/admin/branchoverview.do?command=updatehonor", data: { articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/branchoverview/leader.ftl b/src/main/webapp/Freemarker/admin/branchoverview/leader.ftl index 125a45b..523fb33 100644 --- a/src/main/webapp/Freemarker/admin/branchoverview/leader.ftl +++ b/src/main/webapp/Freemarker/admin/branchoverview/leader.ftl @@ -202,7 +202,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addimage", + url: "${base}/admin/article.do?command=addimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -248,7 +248,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteimage", + url: "${base}/admin/article.do?command=deleteimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -313,7 +313,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -359,7 +359,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -388,7 +388,7 @@ function Save(){ $.ajax({ - url: "/admin/branchoverview.do?command=updateleader", + url: "${base}/admin/branchoverview.do?command=updateleader", data: { articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/branchoverview/memorabilia.ftl b/src/main/webapp/Freemarker/admin/branchoverview/memorabilia.ftl index 3d2a6ba..6e0a1cb 100644 --- a/src/main/webapp/Freemarker/admin/branchoverview/memorabilia.ftl +++ b/src/main/webapp/Freemarker/admin/branchoverview/memorabilia.ftl @@ -202,7 +202,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addimage", + url: "${base}/admin/article.do?command=addimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -248,7 +248,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteimage", + url: "${base}/admin/article.do?command=deleteimage", data: { imageIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -313,7 +313,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -359,7 +359,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids , articleType: articleType.getValue(), articleCode: articleCode.getValue()}, cache:false, success: function (data) { @@ -388,7 +388,7 @@ function Save(){ $.ajax({ - url: "/admin/branchoverview.do?command=updatememorabilia", + url: "${base}/admin/branchoverview.do?command=updatememorabilia", data: { articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/category/category_create.ftl b/src/main/webapp/Freemarker/admin/category/category_create.ftl index e70deec..1ef363c 100644 --- a/src/main/webapp/Freemarker/admin/category/category_create.ftl +++ b/src/main/webapp/Freemarker/admin/category/category_create.ftl @@ -38,7 +38,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/category.do?command=create", + url: "${base}/admin/category.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/category/category_list.ftl b/src/main/webapp/Freemarker/admin/category/category_list.ftl index 72928dd..a1871b4 100644 --- a/src/main/webapp/Freemarker/admin/category/category_list.ftl +++ b/src/main/webapp/Freemarker/admin/category/category_list.ftl @@ -50,7 +50,7 @@ function Add() { mini.open({ - url: "/admin/category.do?command=createpre", + url: "${base}/admin/category.do?command=createpre", title: "目录新建", width: 400, height: 260, ondestroy: function (action) { Search(); @@ -63,7 +63,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/category.do?command=updatepre&categoryId="+rows[0].categoryId, + url: "${base}/admin/category.do?command=updatepre&categoryId="+rows[0].categoryId, title: "编辑目录", width: 400, height: 260, ondestroy: function (action) { Search(); @@ -119,7 +119,7 @@ grid.loading("操作中，请稍后......");; $.ajax({ - url: "/admin/category.do?command=delete", + url: "${base}/admin/category.do?command=delete", data: { categoryIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/category/category_update.ftl b/src/main/webapp/Freemarker/admin/category/category_update.ftl index 660bbca..11a216f 100644 --- a/src/main/webapp/Freemarker/admin/category/category_update.ftl +++ b/src/main/webapp/Freemarker/admin/category/category_update.ftl @@ -39,7 +39,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/category.do?command=update", + url: "${base}/admin/category.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/constant/constant_create.ftl b/src/main/webapp/Freemarker/admin/constant/constant_create.ftl index 655dfbf..20a47f2 100644 --- a/src/main/webapp/Freemarker/admin/constant/constant_create.ftl +++ b/src/main/webapp/Freemarker/admin/constant/constant_create.ftl @@ -55,7 +55,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/constant.do?command=create", + url: "${base}/admin/constant.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/constant/constant_list.ftl b/src/main/webapp/Freemarker/admin/constant/constant_list.ftl index eeb165e..6a3a395 100644 --- a/src/main/webapp/Freemarker/admin/constant/constant_list.ftl +++ b/src/main/webapp/Freemarker/admin/constant/constant_list.ftl @@ -59,7 +59,7 @@ function Add() { mini.open({ - url: "/admin/constant.do?command=createpre", + url: "${base}/admin/constant.do?command=createpre", title: "新建常量", width: 420, height: 400, ondestroy: function (action) { Search(); @@ -72,7 +72,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/constant.do?command=updatepre&constantId="+rows[0].constantId, + url: "${base}/admin/constant.do?command=updatepre&constantId="+rows[0].constantId, title: "修改常量", width: 420, height: 400, ondestroy: function (action) { Search(); @@ -126,7 +126,7 @@ grid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/constant.do?command=delete", + url: "${base}/admin/constant.do?command=delete", data: { constantIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/constant/constant_update.ftl b/src/main/webapp/Freemarker/admin/constant/constant_update.ftl index f1b2a62..578f7d7 100644 --- a/src/main/webapp/Freemarker/admin/constant/constant_update.ftl +++ b/src/main/webapp/Freemarker/admin/constant/constant_update.ftl @@ -56,7 +56,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/constant.do?command=update", + url: "${base}/admin/constant.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/department/department_create.ftl b/src/main/webapp/Freemarker/admin/department/department_create.ftl index cbb9f11..03c1dab 100644 --- a/src/main/webapp/Freemarker/admin/department/department_create.ftl +++ b/src/main/webapp/Freemarker/admin/department/department_create.ftl @@ -57,7 +57,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/department.do?command=create", + url: "${base}/admin/department.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/department/department_list.ftl b/src/main/webapp/Freemarker/admin/department/department_list.ftl index 4cc3785..5dc943c 100644 --- a/src/main/webapp/Freemarker/admin/department/department_list.ftl +++ b/src/main/webapp/Freemarker/admin/department/department_list.ftl @@ -66,7 +66,7 @@ function Add() { mini.open({ - url: "/admin/department.do?command=createpre", + url: "${base}/admin/department.do?command=createpre", title: "部门新建", width: 430, height: 400, ondestroy: function (action) { Search(); @@ -79,7 +79,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/department.do?command=updatepre&departmentId="+rows[0].departmentId, + url: "${base}/admin/department.do?command=updatepre&departmentId="+rows[0].departmentId, title: "部门修改", width: 430, height: 400, ondestroy: function (action) { Search(); @@ -141,7 +141,7 @@ grid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/department.do?command=delete", + url: "${base}/admin/department.do?command=delete", data: { departmentIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/discipline/discipline_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/discipline/discipline_updatedetailsearch.ftl index 6ff3ff0..28683d4 100644 --- a/src/main/webapp/Freemarker/admin/discipline/discipline_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/discipline/discipline_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/employee/employee_list.ftl b/src/main/webapp/Freemarker/admin/employee/employee_list.ftl index ea12267..e2b0a93 100644 --- a/src/main/webapp/Freemarker/admin/employee/employee_list.ftl +++ b/src/main/webapp/Freemarker/admin/employee/employee_list.ftl @@ -61,7 +61,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/employee.do?command=updatepre&employeeId="+rows[0].employeeId, + url: "${base}/admin/employee.do?command=updatepre&employeeId="+rows[0].employeeId, title: "人员修改", width: 940, height: 500, ondestroy: function (action) { Search(); @@ -115,7 +115,7 @@ grid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/employee.do?command=delete", + url: "${base}/admin/employee.do?command=delete", data: { employeeIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/employee/employee_update.ftl b/src/main/webapp/Freemarker/admin/employee/employee_update.ftl index 5c47f1f..b5f4326 100644 --- a/src/main/webapp/Freemarker/admin/employee/employee_update.ftl +++ b/src/main/webapp/Freemarker/admin/employee/employee_update.ftl @@ -146,7 +146,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/employee.do?command=update", + url: "${base}/admin/employee.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl index 6dda7a5..b16f6c4 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_create.ftl @@ -46,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/evaluation.do?command=create", + url: "${base}/admin/evaluation.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl index 674ca0d..6536026 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_update.ftl @@ -47,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/evaluation.do?command=update", + url: "${base}/admin/evaluation.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/evaluation/evaluation_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/evaluation/evaluation_updatedetailsearch.ftl index 89d1746..6978fad 100644 --- a/src/main/webapp/Freemarker/admin/evaluation/evaluation_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/evaluation/evaluation_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/experience/experience_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/experience/experience_updatedetailsearch.ftl index 7600da7..cdeb298 100644 --- a/src/main/webapp/Freemarker/admin/experience/experience_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/experience/experience_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/externalip/externalip_create.ftl b/src/main/webapp/Freemarker/admin/externalip/externalip_create.ftl index 4b2771b..f78351b 100644 --- a/src/main/webapp/Freemarker/admin/externalip/externalip_create.ftl +++ b/src/main/webapp/Freemarker/admin/externalip/externalip_create.ftl @@ -55,7 +55,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/externalip.do?command=create", + url: "${base}/admin/externalip.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/externalip/externalip_list.ftl b/src/main/webapp/Freemarker/admin/externalip/externalip_list.ftl index c1065ee..c497653 100644 --- a/src/main/webapp/Freemarker/admin/externalip/externalip_list.ftl +++ b/src/main/webapp/Freemarker/admin/externalip/externalip_list.ftl @@ -61,7 +61,7 @@ function Add() { mini.open({ - url: "/admin/externalip.do?command=createpre", + url: "${base}/admin/externalip.do?command=createpre", title: "新建外部IP", width: 420, height: 400, ondestroy: function (action) { Search(); @@ -74,7 +74,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/externalip.do?command=updatepre&externalIPId="+rows[0].externalIPId, + url: "${base}/admin/externalip.do?command=updatepre&externalIPId="+rows[0].externalIPId, title: "修改外部IP", width: 420, height: 400, ondestroy: function (action) { Search(); @@ -128,7 +128,7 @@ grid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/externalip.do?command=delete", + url: "${base}/admin/externalip.do?command=delete", data: { externalIPIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/externalip/externalip_update.ftl b/src/main/webapp/Freemarker/admin/externalip/externalip_update.ftl index 9c22066..4a99282 100644 --- a/src/main/webapp/Freemarker/admin/externalip/externalip_update.ftl +++ b/src/main/webapp/Freemarker/admin/externalip/externalip_update.ftl @@ -56,7 +56,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/externalip.do?command=update", + url: "${base}/admin/externalip.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/image/image_list.ftl b/src/main/webapp/Freemarker/admin/image/image_list.ftl index 3698aa1..95c5896 100644 --- a/src/main/webapp/Freemarker/admin/image/image_list.ftl +++ b/src/main/webapp/Freemarker/admin/image/image_list.ftl @@ -71,7 +71,7 @@ function Add() { mini.open({ - url: "/admin/image.do?command=uploadpre", + url: "${base}/admin/image.do?command=uploadpre", title: "新建图片", width: 400, height: 350, ondestroy: function (action) { Search(); @@ -84,7 +84,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/image.do?command=updatepre&imageId="+rows[0].imageId, + url: "${base}/admin/image.do?command=updatepre&imageId="+rows[0].imageId, title: "修改图片", width: 400, height: 520, ondestroy: function (action) { Search(); @@ -139,7 +139,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/image.do?command=delete", + url: "${base}/admin/image.do?command=delete", data: { imageIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/imagenews/imagenews_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/imagenews/imagenews_updatedetailsearch.ftl index 4474fbb..a5ab24f 100644 --- a/src/main/webapp/Freemarker/admin/imagenews/imagenews_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/imagenews/imagenews_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addimage", + url: "${base}/admin/article.do?command=addimage", data: {imageIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteimage", + url: "${base}/admin/article.do?command=deleteimage", data: { imageIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_updatedetailsearch.ftl index 0ddf61f..12bab47 100644 --- a/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/informationsecurity/informationsecurity_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/issue/issue_create.ftl b/src/main/webapp/Freemarker/admin/issue/issue_create.ftl index 228e88f..d61e6c7 100644 --- a/src/main/webapp/Freemarker/admin/issue/issue_create.ftl +++ b/src/main/webapp/Freemarker/admin/issue/issue_create.ftl @@ -45,7 +45,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/issue.do?command=create", + url: "${base}/admin/issue.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/issue/issue_list.ftl b/src/main/webapp/Freemarker/admin/issue/issue_list.ftl index 53f92d8..a8e53ca 100644 --- a/src/main/webapp/Freemarker/admin/issue/issue_list.ftl +++ b/src/main/webapp/Freemarker/admin/issue/issue_list.ftl @@ -57,7 +57,7 @@ function Add() { mini.open({ - url: "/admin/issue.do?command=createpre", + url: "${base}/admin/issue.do?command=createpre", title: "新建昨日要情", width: 400, height: 300, ondestroy: function (action) { Search(); @@ -70,7 +70,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/issue.do?command=updatepre&issueId="+rows[0].issueId, + url: "${base}/admin/issue.do?command=updatepre&issueId="+rows[0].issueId, title: "修改昨日要情", width: 400, height: 300, ondestroy: function (action) { Search(); @@ -125,7 +125,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/issue.do?command=delete", + url: "${base}/admin/issue.do?command=delete", data: { issueIds: ids }, success: function (data) { try{ @@ -148,7 +148,7 @@ function Word(){ mini.open({ - url: "/admin/issueword.do", + url: "${base}/admin/issueword.do", title: "昨日要情Word", width: 800, height: 600, ondestroy: function (action) { Search(); @@ -195,7 +195,7 @@ grid.loading("生成中，请稍后......"); $.ajax({ - url: "/admin/issueword.do?command=generate", + url: "${base}/admin/issueword.do?command=generate", data: { issueIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/issue/issue_update.ftl b/src/main/webapp/Freemarker/admin/issue/issue_update.ftl index 1f159e8..315dd24 100644 --- a/src/main/webapp/Freemarker/admin/issue/issue_update.ftl +++ b/src/main/webapp/Freemarker/admin/issue/issue_update.ftl @@ -46,7 +46,7 @@ form.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/issue.do?command=update", + url: "${base}/admin/issue.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/issueword/issueword_list.ftl b/src/main/webapp/Freemarker/admin/issueword/issueword_list.ftl index 16cff6a..ef16b4e 100644 --- a/src/main/webapp/Freemarker/admin/issueword/issueword_list.ftl +++ b/src/main/webapp/Freemarker/admin/issueword/issueword_list.ftl @@ -42,7 +42,7 @@ function Add() { mini.open({ - url: "/admin/issueword.do?command=uploadpre", + url: "${base}/admin/issueword.do?command=uploadpre", title: "上传昨日要情Word", width: 400, height: 350, ondestroy: function (action) { Search(); @@ -100,7 +100,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/issueword.do?command=delete", + url: "${base}/admin/issueword.do?command=delete", data: { iwIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/jobline/jobline_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/jobline/jobline_updatedetailsearch.ftl index 8f75072..2921923 100644 --- a/src/main/webapp/Freemarker/admin/jobline/jobline_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/jobline/jobline_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/law/law_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/law/law_updatedetailsearch.ftl index 25c9efe..d92a0ab 100644 --- a/src/main/webapp/Freemarker/admin/law/law_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/law/law_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/legal/legal_updatedetailsearch.ftl b/src/main/webapp/Freemarker/admin/legal/legal_updatedetailsearch.ftl index 6b090bc..c0a82eb 100644 --- a/src/main/webapp/Freemarker/admin/legal/legal_updatedetailsearch.ftl +++ b/src/main/webapp/Freemarker/admin/legal/legal_updatedetailsearch.ftl @@ -101,7 +101,7 @@ serachGrid.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=addattachment", + url: "${base}/admin/article.do?command=addattachment", data: {attachmentIds: ids, articleId: articleId.getValue()}, cache:false, success: function (data) { @@ -144,7 +144,7 @@ selectedList.loading("操作中，请稍后......"); $.ajax({ - url: "/admin/article.do?command=deleteattachment", + url: "${base}/admin/article.do?command=deleteattachment", data: { attachmentIds: ids, articleId: articleId.getValue() }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/link/link_create.ftl b/src/main/webapp/Freemarker/admin/link/link_create.ftl index 88802e7..5ae4f06 100644 --- a/src/main/webapp/Freemarker/admin/link/link_create.ftl +++ b/src/main/webapp/Freemarker/admin/link/link_create.ftl @@ -45,7 +45,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/link.do?command=create", + url: "${base}/admin/link.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/link/link_list.ftl b/src/main/webapp/Freemarker/admin/link/link_list.ftl index 9dd0e99..e6bbb3c 100644 --- a/src/main/webapp/Freemarker/admin/link/link_list.ftl +++ b/src/main/webapp/Freemarker/admin/link/link_list.ftl @@ -58,7 +58,7 @@ function Add() { mini.open({ - url: "/admin/link.do?command=createpre", + url: "${base}/admin/link.do?command=createpre", title: "新建链接", width: 400, height: 300, ondestroy: function (action) { Search(); @@ -71,7 +71,7 @@ if (rows.length==1) { mini.open({ - url: "/admin/link.do?command=updatepre&linkId="+rows[0].linkId, + url: "${base}/admin/link.do?command=updatepre&linkId="+rows[0].linkId, title: "修改链接", width: 400, height: 300, ondestroy: function (action) { Search(); @@ -126,7 +126,7 @@ grid.loading("删除中，请稍后......"); $.ajax({ - url: "/admin/link.do?command=delete", + url: "${base}/admin/link.do?command=delete", data: { linkIds: ids }, success: function (data) { try{ diff --git a/src/main/webapp/Freemarker/admin/link/link_update.ftl b/src/main/webapp/Freemarker/admin/link/link_update.ftl index 9837eec..07f073f 100644 --- a/src/main/webapp/Freemarker/admin/link/link_update.ftl +++ b/src/main/webapp/Freemarker/admin/link/link_update.ftl @@ -46,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/link.do?command=update", + url: "${base}/admin/link.do?command=update", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/memorabiliaindex/memorabiliaindex_create.ftl b/src/main/webapp/Freemarker/admin/memorabiliaindex/memorabiliaindex_create.ftl index 3eefb78..c1f5c75 100644 --- a/src/main/webapp/Freemarker/admin/memorabiliaindex/memorabiliaindex_create.ftl +++ b/src/main/webapp/Freemarker/admin/memorabiliaindex/memorabiliaindex_create.ftl @@ -37,7 +37,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/memorabiliaindex.do?command=create", + url: "${base}/admin/memorabiliaindex.do?command=create", data: { object: json }, cache: false, success: function (data) { diff --git a/src/main/webapp/Freemarker/admin/policecase/policecase_create.ftl b/src/main/webapp/Freemarker/admin/policecase/policecase_create.ftl index 7549988..967cc33 100644 --- a/src/main/webapp/Freemarker/admin/policecase/policecase_create.ftl +++ b/src/main/webapp/Freemarker/admin/policecase/policecase_create.ftl @@ -9,6 +9,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="请输入内容（警情研判）" /> @@ -42,7 +46,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/policecase.do?command=create", + url: "${base}/admin/policecase.do?command=create", data: { object: json, articleContent : editor.getData()}, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/admin/policecase/policecase_list.ftl b/src/main/webapp/Freemarker/admin/policecase/policecase_list.ftl index 8a5c08b..e9f960e 100644 --- a/src/main/webapp/Freemarker/admin/policecase/policecase_list.ftl +++ b/src/main/webapp/Freemarker/admin/policecase/policecase_list.ftl @@ -40,6 +40,7 @@
排序
状态
所属部门
+
文章日期
更新人
更新时间
IP
@@ -69,7 +70,7 @@ function Add() { mini.open({ url: "${base}/admin/policecase.do?command=createpre", - title: "新建警情研判", width: 900, height: 580, + title: "新建警情研判", width: 900, height: 600, ondestroy: function (action) { Search(); } diff --git a/src/main/webapp/Freemarker/admin/policecase/policecase_update.ftl b/src/main/webapp/Freemarker/admin/policecase/policecase_update.ftl index 27528b6..ddfe0cd 100644 --- a/src/main/webapp/Freemarker/admin/policecase/policecase_update.ftl +++ b/src/main/webapp/Freemarker/admin/policecase/policecase_update.ftl @@ -10,6 +10,10 @@ + + + + <@admin.ckeditor id="articleContent" name="articleContent" value="${article.articleContent?default('请输入内容（警情研判）')}" /> @@ -43,7 +47,7 @@ form.loading("保存中，请稍后......"); $.ajax({ - url: "/admin/policecase.do?command=update", + url: "${base}/admin/policecase.do?command=update", data: { object : json, articleContent : editor.getData() }, type: "POST", cache: false, diff --git a/src/main/webapp/Freemarker/common/front/page_macro.ftl b/src/main/webapp/Freemarker/common/front/page_macro.ftl index 3ea27ff..59538ea 100644 --- a/src/main/webapp/Freemarker/common/front/page_macro.ftl +++ b/src/main/webapp/Freemarker/common/front/page_macro.ftl @@ -164,9 +164,9 @@
  • 昨日要情${article.issueDate}
    • <#elseif article.articleType='POLICECASE'> <#if article.type=='ARTICLE'> -
  • 【${article.createByTime}】${article.articleTitle}
    • +
  • 【<#if article.articleDate??>${article.articleDate}<#else>${article.createByTime}】${article.articleTitle}
    • <#elseif article.type='WORD'> -
  • 【${article.createByTime}】${article.articleTitle}
    • +
  • 【<#if article.articleDate??>${article.articleDate}<#else>${article.createByTime}】${article.articleTitle}
    • <#else>
  • 【<#if article.articleDate??>${article.articleDate}<#else>${article.createByTime}】${article.articleTitle}