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 @@
-
+
@@ -35,7 +35,6 @@
-