订单管理增加时间查询

common/src/main/java/com/jpsoft/bus/modules/base/dto/OrderInfoDTO.java

@@ -56,4 +56,9 @@ public class OrderInfoDTO {
     private String ticketType;
     @ApiModelProperty(value = "货票金额")
     private BigDecimal goodsTicket = BigDecimal.ZERO;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

common/src/main/resources/mapper/base/OrderInfo.xml

@@ -183,6 +183,29 @@
 			<if test="searchParams.payStatus != null">
 				and a.pay_status = #{searchParams.payStatus}
 			</if>
+			<if test="searchParams.shiftId != null">
+				and h.vehicle_shift_id = #{searchParams.shiftId}
+			</if>
+			<if test="searchParams.createBeginTime != null">
+				<![CDATA[
+                  and a.create_time >= #{searchParams.createBeginTime}
+            ]]>
+			</if>
+			<if test="searchParams.createEndTime != null">
+				<![CDATA[
+                  and a.create_time <= #{searchParams.createEndTime}
+            ]]>
+			</if>
+			<if test="searchParams.payBeginTime != null">
+				<![CDATA[
+                  and a.pay_time >= #{searchParams.payBeginTime}
+            ]]>
+			</if>
+			<if test="searchParams.payEndTime != null">
+				<![CDATA[
+                  and a.pay_time <= #{searchParams.payEndTime}
+            ]]>
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/bus/modules/base/controller/OrderInfoController.java

@@ -227,6 +227,7 @@ public class OrderInfoController {
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String companyId,String licensePlateNumber,String outOrderNo,String transactionId,
+            String shiftId,String createTimeRanges,String payTimeRanges,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -257,6 +258,46 @@ public class OrderInfoController {
             searchParams.put("transactionId","%"+transactionId+"%");
         }
 
+        if (StringUtils.isNotEmpty(shiftId)) {
+            searchParams.put("shiftId",shiftId);
+        }
+
+        if(StringUtils.isNotEmpty(createTimeRanges)){
+            String[] timeRangeArray = createTimeRanges.split(",");
+            String createBeginTime = "";
+            String createEndTime = "";
+            if (timeRangeArray.length == 1) {
+                createBeginTime = timeRangeArray[0];
+                createBeginTime+=" 00:00:00";
+            } else if (timeRangeArray.length == 2) {
+                createBeginTime = timeRangeArray[0];
+                createEndTime = timeRangeArray[1];
+                createBeginTime+=" 00:00:00";
+                createEndTime+=" 23:59:59";
+            }
+
+            searchParams.put("createBeginTime", createBeginTime);
+            searchParams.put("createEndTime", createEndTime);
+        }
+
+        if(StringUtils.isNotEmpty(payTimeRanges)){
+            String[] timeRangeArray = payTimeRanges.split(",");
+            String payBeginTime = "";
+            String payEndTime = "";
+            if (timeRangeArray.length == 1) {
+                payBeginTime = timeRangeArray[0];
+                payBeginTime+=" 00:00:00";
+            } else if (timeRangeArray.length == 2) {
+                payBeginTime = timeRangeArray[0];
+                payEndTime = timeRangeArray[1];
+                payBeginTime+=" 00:00:00";
+                payEndTime+=" 23:59:59";
+            }
+
+            searchParams.put("payBeginTime", payBeginTime);
+            searchParams.put("payEndTime", payEndTime);
+        }
+
 
         Page<OrderInfo> page = orderInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
@@ -271,6 +312,7 @@ public class OrderInfoController {
             dto.setPayStatus(orderInfo.getPayStatus());
             dto.setPayName(orderInfo.getPayName());
             dto.setPayTime(orderInfo.getPayTime());
+            dto.setCreateTime(orderInfo.getCreateTime());
             dto.setOutOrderNo(orderInfo.getOutOrderNo());
             dto.setTransactionId(orderInfo.getTransactionId());
             dto.setTicketType(orderInfo.getTicketType());