From 0ca4a7107a926f36f1c9e20b64304072e62708bd Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Thu, 17 Jan 2019 22:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=88=E6=9C=9F=E9=A2=84=E8=AD=A6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bireport/controller/RpPeriodInOutController.java   | 10 ++++++----
 .../webpage/com/zzjee/bireport/rpPeriodInOutList.jsp   |  3 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zzjee/bireport/controller/RpPeriodInOutController.java b/src/main/java/com/zzjee/bireport/controller/RpPeriodInOutController.java
index 7ff0f9a5..1767edcf 100644
--- a/src/main/java/com/zzjee/bireport/controller/RpPeriodInOutController.java
+++ b/src/main/java/com/zzjee/bireport/controller/RpPeriodInOutController.java
@@ -112,12 +112,14 @@ public class RpPeriodInOutController extends BaseController {
 
 	@RequestMapping(params = "datagrid")
 	public void datagrid(RpPeriodInOutEntity rpPeriodInOut,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
+		rpPeriodInOut.setCreateDate(null);
+
 		CriteriaQuery cq = new CriteriaQuery(RpPeriodInOutEntity.class, dataGrid);
 		//查询条件组装器
 		try{
 		//自定义追加查询条件
-		String query_datePeriod_begin = request.getParameter("createDate_begin");
-		String query_datePeriod_end = request.getParameter("createDate_end");
+		String query_datePeriod_begin = request.getParameter("createDate1_begin");
+		String query_datePeriod_end = request.getParameter("createDate1_end");
 		try{
             if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
                 query_datePeriod_begin = "2018-01-01";
@@ -159,8 +161,8 @@ public class RpPeriodInOutController extends BaseController {
 	public String exportXls(RpPeriodInOutEntity rpPeriodInOut,HttpServletRequest request,HttpServletResponse response
 			, DataGrid dataGrid,ModelMap modelMap) {
 			//自定义追加查询条件
-			String query_datePeriod_begin = request.getParameter("createDate_begin");
-			String query_datePeriod_end = request.getParameter("createDate_end");
+			String query_datePeriod_begin = request.getParameter("createDate1_begin");
+			String query_datePeriod_end = request.getParameter("createDate1_end");
 			try{
                 if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
                     query_datePeriod_begin = "2018-01-01";
diff --git a/src/main/webapp/webpage/com/zzjee/bireport/rpPeriodInOutList.jsp b/src/main/webapp/webpage/com/zzjee/bireport/rpPeriodInOutList.jsp
index 8b14c5e9..a93eeef6 100644
--- a/src/main/webapp/webpage/com/zzjee/bireport/rpPeriodInOutList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/bireport/rpPeriodInOutList.jsp
@@ -7,7 +7,7 @@
     <t:dgCol title="主键"  field="id"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="创建人名称"  field="createName"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="创建人登录名称"  field="createBy"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
-    <t:dgCol title="期间选择"  field="createDate" formatter="yyyy-MM-dd"    query="true"  queryMode="group"  width="120"></t:dgCol>
+    <t:dgCol title="期间选择"  field="createDate1" formatter="yyyy-MM-dd"    query="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="更新人名称"  field="updateName"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="更新人登录名称"  field="updateBy"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="更新日期"  field="updateDate" formatter="yyyy-MM-dd" hidden="true"  queryMode="single"  width="120"></t:dgCol>
@@ -35,7 +35,6 @@
   </t:datagrid>
   </div>
  </div>
- <script src = "webpage/com/zzjee/bireport/rpPeriodInOutList.js"></script>		
  <script type="text/javascript">
  $(document).ready(function(){
  });