Merge pull request #5 from nanlei/r214

R214
nanlei · Apr 26, 2015 · 6fcdf64 · 6fcdf64
2 parents 6595167 + 8642151
commit 6fcdf64
Show file tree

Hide file tree

Showing 99 changed files with 519 additions and 190 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...cn/gov/dl/ga/gxga/process/admin/informationsecurity/InformationSecurityUpdateProcess.java b/...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
@@ -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,19 +38,28 @@ 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);
 
 		model.put("status", "true");
 
 		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
@@ -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
@@ -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);