截止日期

src/main/java/com/steerinfo/dil/controller/AmstruckInwardRequirementController.java

@@ -149,10 +149,11 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("orgCode",orgCode);
         }
         mapValue.put("requirementStatus",requirementStatus);
+        List<Map<String, Object>> list = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
     //展示采购内转需求

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -756,6 +756,7 @@
         AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
         RS.SHIPPER_NAME AS "shipperName",
         AIR.INSERT_TIME AS "insertTime",
+        AIR.DUE_DATE AS "dueDate",
         AIR.INSERT_USERNAME AS "insertUsername",
         AIR.REQUIREMENT_ID AS "requirementId",
         rw1.warehouse_name "unloadName",
@@ -843,6 +844,12 @@
                     "wareHouseName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertTime != null">
                 and
                 <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
@@ -878,6 +885,7 @@
         AIR.INSERT_USERNAME AS "insertUsername",
         AIR.REQUIREMENT_ID AS "requirementId",
         AIR.UPDATE_TIME AS "updateTime",
+        AIR.DUE_DATE AS "dueDate",
         AIR.UPDATE_USERNAME AS "updateUserName",
         rw1.warehouse_name "unloadName",
         rw1.WAREHOUSE_ID "unloadId",
@@ -983,6 +991,12 @@
                     "insertTime" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertUsername != null">
                 and
                 <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">