From 502118c6fda1762d40f05772225bdbf6ed9a4ca8 Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Sun, 11 Mar 2018 16:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=AD=9B=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/domain/basics/ServiceDictInfo.java | 10 ----------
 .../java/com/nis/domain/basics/SysDictInfo.java     | 13 ++-----------
 .../basics/ServiceDictInfoController.java           |  7 ++++---
 .../controller/basics/SysDictInfoController.java    |  7 ++++---
 .../views/basics/serviceDictInfoSearchList.jsp      |  8 ++++----
 .../webapp/WEB-INF/views/basics/serviceDictList.jsp | 10 +++++-----
 .../WEB-INF/views/basics/sysDictInfoSearchList.jsp  | 10 +++++-----
 .../webapp/WEB-INF/views/basics/sysDictList.jsp     | 10 +++++-----
 8 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
index 4103b4e87..ea283d5e3 100644
--- a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
@@ -39,10 +39,6 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	private Date editBeginDate;		// 修改开始日期
 	private Date editEndDate;		// 修改结束日期
 	
-	/**
-	 * 筛选搜索框展开状态
-	 */
-	private boolean isFilterActio = false;
 	
 	public Integer getServiceDictId() {
 		return serviceDictId;
@@ -154,12 +150,6 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	public void setEditEndDate(Date editEndDate) {
 		this.editEndDate = editEndDate;
 	}
-	public boolean isFilterActio() {
-		return isFilterActio;
-	}
-	public void setFilterActio(boolean isFilterActio) {
-		this.isFilterActio = isFilterActio;
-	}
 	@JsonIgnore
 	public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
diff --git a/src/main/java/com/nis/domain/basics/SysDictInfo.java b/src/main/java/com/nis/domain/basics/SysDictInfo.java
index 62bab3fc4..832e8bf2b 100644
--- a/src/main/java/com/nis/domain/basics/SysDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/SysDictInfo.java
@@ -37,11 +37,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	private Date editBeginDate;		// 修改开始日期
 	private Date editEndDate;		// 修改结束日期
 	
-	/**
-	 * 筛选搜索框展开状态
-	 */
-	private boolean isFilterActio = false;
-	
+
 
 	public Integer getSysDictId() {
 		return sysDictId;
@@ -151,12 +147,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	public void setEditEndDate(Date editEndDate) {
 		this.editEndDate = editEndDate;
 	}
-	public boolean isFilterActio() {
-		return isFilterActio;
-	}
-	public void setFilterActio(boolean isFilterActio) {
-		this.isFilterActio = isFilterActio;
-	}
+
 	@JsonIgnore
 	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
index ce2996319..c2f3e41d4 100644
--- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
@@ -68,8 +68,9 @@ public class ServiceDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions("sys:dict:view")
 	@RequestMapping(value = {"list", ""})
-	public String list(String itType, ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model,Integer selectedType) {
+	public String list(String itType, ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model,Integer selectedType,boolean isFilterAction) {
 		//处理数据
+		serviceDictInfo.setIsFilterAction(isFilterAction);
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
 		for(int i=0;i<strArr.length;i++){
@@ -125,9 +126,9 @@ public class ServiceDictInfoController extends BaseController {
 				&&serviceDictInfo.getEditEndDate()==null){
 			if(serviceDictInfo.getItemType()!=null){
 				selectedType = serviceDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType;
+				return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType+"&isFilterAction="+serviceDictInfo.getIsFilterAction();
 			}
-			return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType;
+			return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&isFilterAction="+serviceDictInfo.getIsFilterAction();
 		}
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index 8995e29b5..80a336a82 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -67,8 +67,9 @@ public class SysDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions("sys:dict:view")
 	@RequestMapping(value = {"list", ""})
-	public String list(String itType, SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model, Integer selectedType) {
+	public String list(String itType, SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model, Integer selectedType,boolean isFilterAction) {
 		//处理数据
+		sysDictInfo.setIsFilterAction(isFilterAction);
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
 		for(int i=0;i<strArr.length;i++){
@@ -122,9 +123,9 @@ public class SysDictInfoController extends BaseController {
 				&&sysDictInfo.getEditEndDate()==null){
 			if(sysDictInfo.getItemType()!=null){
 				selectedType = sysDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType;
+				return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
 			}
-			return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType;
+			return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
 		}
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
index 373ef10b6..75d509ca5 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
@@ -195,14 +195,14 @@
 											</div>
 											<div class="pull-left">
 												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
 												<label>到</label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 									</div>
 									 <div class="col-md-6">
@@ -211,14 +211,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
 											<label>到</label>
 										</div>
 										<div class="pull-left">
 											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index 963a86e02..983603046 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -128,7 +128,7 @@
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							
 							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="" type="hidden" value=""/>
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${serviceDictInfo.isFilterAction}"/>
 							
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
@@ -197,14 +197,14 @@
 											</div>
 											<div class="pull-left">
 												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
 												<label>到</label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 									</div>
 									 <div class="col-md-6">
@@ -213,14 +213,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
 											<label>到</label>
 										</div>
 										<div class="pull-left">
 											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
index 1d7e49a20..e0b8947c5 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
@@ -126,7 +126,7 @@
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							
 							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="" type="hidden" value=""/>
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${sysDictInfo.isFilterAction}"/>
 							
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
@@ -195,14 +195,14 @@
 											</div>
 											<div class="pull-left">
 												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
 												<label>到</label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 									</div>
 									 <div class="col-md-6">
@@ -211,14 +211,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
 											<label>到</label>
 										</div>
 										<div class="pull-left">
 											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 8812ec2a7..90a16a33d 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -131,7 +131,7 @@
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							
 							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="" type="hidden" value=""/>
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${sysDictInfo.isFilterAction}"/>
 							
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
@@ -200,14 +200,14 @@
 											</div>
 											<div class="pull-left">
 												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 											<div class="pull-left">
 												<label>到</label>
 											</div>
 											<div class="pull-left">
 												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 											</div>
 									</div>
 									 <div class="col-md-6">
@@ -216,14 +216,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 										<div class="pull-left">
 											<label>到</label>
 										</div>
 										<div class="pull-left">
 											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>