feat(oms): 运输业务单列表新增预计起运时间范围查询条件(layDateStart/layDateEnd)
This commit is contained in:
+10
@@ -749,6 +749,16 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDate;
|
||||
|
||||
@ApiModelProperty(value = "预计起运时间起")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDateStart;
|
||||
|
||||
@ApiModelProperty(value = "预计起运时间止")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDateEnd;
|
||||
|
||||
@ApiModelProperty("收款账户信息")
|
||||
private String accountInformation;
|
||||
|
||||
|
||||
+10
@@ -778,6 +778,16 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDate;
|
||||
|
||||
@ApiModelProperty(value = "预计起运时间起")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDateStart;
|
||||
|
||||
@ApiModelProperty(value = "预计起运时间止")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date layDateEnd;
|
||||
|
||||
@ApiModelProperty("入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
|
||||
+6
@@ -700,6 +700,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="pushTimeEnd != null">
|
||||
and bdo.PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="layDateStart != null">
|
||||
and bdo.LAY_DATE <![CDATA[>=]]> #{layDateStart}
|
||||
</if>
|
||||
<if test="layDateEnd != null">
|
||||
and bdo.LAY_DATE <![CDATA[<=]]> #{layDateEnd} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="ieType != null ">
|
||||
and bdo.IE_TYPE = #{ieType}
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user