service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
@@ -114,7 +114,8 @@ @JsonFormat(pattern = "yyyy-MM-dd") @TableField("create_time") private Date createTime; private String createTimeBegin; private String createTimeEnd; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -128,5 +129,12 @@ @TableField("deleted") private Integer deleted; public void setCreateTimeBegin(String createTimeBegin) { this.createTimeBegin = createTimeBegin==null? null :createTimeBegin+ " 00:00:00"; } public void setCreateTimeEnd(String createTimeEnd) { this.createTimeEnd = createTimeEnd==null?null:createTimeEnd+ " 23:59:59"; } } service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -66,6 +66,8 @@ @Excel(name = "订单下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @TableField("order_time") private Date orderTime; private String orderTimeBegin; private String orderTimeEnd; /** 订单创建时间 */ @@ -73,6 +75,8 @@ @Excel(name = "订单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @TableField("order_created_time") private Date orderCreatedTime; private String orderCreatedTimeBegin; private String orderCreatedTimeEnd; /** 调度单创建时间 */ @@ -80,6 +84,8 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("dispatch_created_time") private Date dispatchCreatedTime; private String dispatchCreatedTimeBegin; private String dispatchCreatedTimeEnd; /** 钥匙领取时间（请求查询时间） */ @@ -181,4 +187,28 @@ @Excel(name = "钥匙柜编号") @TableField("box_num") private String boxNum; public void setOrderTimeBegin(String orderTimeBegin) { this.orderTimeBegin = orderTimeBegin==null? null :orderTimeBegin+ " 00:00:00"; } public void setOrderTimeEnd(String orderTimeEnd) { this.orderTimeEnd = orderTimeEnd==null?null:orderTimeEnd+ " 23:59:59"; } public void setOrderCreatedTimeBegin(String orderCreatedTimeBegin) { this.orderCreatedTimeBegin = orderCreatedTimeBegin==null? null :orderCreatedTimeBegin+ " 00:00:00"; } public void setOrderCreatedTimeEnd(String orderCreatedTimeEnd) { this.orderCreatedTimeEnd = orderCreatedTimeEnd==null?null:orderCreatedTimeEnd+ " 23:59:59"; } public void setDispatchCreatedTimeBegin(String dispatchCreatedTimeBegin) { this.dispatchCreatedTimeBegin = dispatchCreatedTimeBegin==null? null :dispatchCreatedTimeBegin+ " 00:00:00"; } public void setDispatchCreatedTimeEnd(String dispatchCreatedTimeEnd) { this.dispatchCreatedTimeEnd = dispatchCreatedTimeEnd==null?null:dispatchCreatedTimeEnd+ " 23:59:59"; } } service/src/main/java/com/ruoyi/cwgl/domain/RequestLog.java
@@ -58,6 +58,8 @@ @Excel(name = "请求时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @TableField("req_time") private Date reqTime; private String reqTimeBegin; private String reqTimeEnd; /** 0上报取出1归还上报 */ @@ -73,5 +75,11 @@ @TableField("operation") private String operation; public void setReqTimeBegin(String reqTimeBegin) { this.reqTimeBegin = reqTimeBegin==null? null :reqTimeBegin+ " 00:00:00"; } public void setReqTimeEnd(String reqTimeEnd) { this.reqTimeEnd = reqTimeEnd==null?null:reqTimeEnd+ " 23:59:59"; } } service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -45,9 +45,10 @@ <if test="driverName != null and driverName != ''"> and thisTab.driver_name like concat('%', #{driverName}, '%')</if> <if test="driverMobile != null and driverMobile != ''"> and thisTab.driver_mobile = #{driverMobile}</if> <if test="licensePlateNumber != null and licensePlateNumber != ''"> and thisTab.license_plate_number = #{licensePlateNumber}</if> <if test="orderTime != null "> and thisTab.order_time = #{orderTime}</if> <if test="orderCreatedTime != null "> and thisTab.order_created_time = #{orderCreatedTime}</if> <if test="dispatchCreatedTime != null "> and thisTab.dispatch_created_time = #{dispatchCreatedTime}</if> <if test="orderTimeBegin != null and orderTimeBegin!='' and orderTimeEnd != null and orderTimeEnd!='' "> and thisTab.order_time between #{orderTimeBegin} and #{orderTimeEnd}</if> <if test="orderCreatedTimeBegin != null and orderCreatedTimeBegin!='' and orderCreatedTimeEnd != null and orderCreatedTimeEnd!='' "> and thisTab.order_created_time between #{orderCreatedTimeBegin} and #{orderCreatedTimeEnd}</if> <if test="dispatchCreatedTimeBegin != null and dispatchCreatedTimeBegin!='' and dispatchCreatedTimeEnd != null and dispatchCreatedTimeEnd!='' "> and thisTab.dispatch_created_time between #{dispatchCreatedTimeBegin} and #{dispatchCreatedTimeEnd}</if> <if test="keyCollectionTime != null "> and thisTab.key_collection_time = #{keyCollectionTime}</if> <if test="estimatedDepartureTime != null "> and thisTab.estimated_departure_time = #{estimatedDepartureTime}</if> <if test="requiredArrivalTime != null "> and thisTab.required_arrival_time = #{requiredArrivalTime}</if> service/src/main/resources/mapper/cwgl/RequestLogMapper.xml
@@ -27,7 +27,8 @@ <if test="driverCode != null and driverCode != ''"> and thisTab.driver_code = #{driverCode}</if> <if test="driverName != null and driverName != ''"> and thisTab.driver_name like concat('%', #{driverName}, '%')</if> <if test="boxNum != null and boxNum != ''"> and thisTab.box_num = #{boxNum}</if> <if test="reqTime != null "> and thisTab.req_time = #{reqTime}</if> <if test="reqTimeBegin != null and reqTimeBegin!='' and reqTimeEnd != null and reqTimeEnd!='' "> and thisTab.req_time between #{reqTimeBegin} and #{reqTimeEnd}</if> <if test="type != null "> and thisTab.type = #{type}</if> <if test="operation != null and operation != ''"> and thisTab.operation = #{operation}</if> </sql>
