Showing
4 changed files
with
28 additions
and
0 deletions
| ... | ... | @@ -65,4 +65,10 @@ public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializ |
| 65 | 65 | @ApiModelProperty("订货单类型") |
| 66 | 66 | private String type; |
| 67 | 67 | |
| 68 | + @ApiModelProperty("订货日期") | |
| 69 | + private String orderDateStart; | |
| 70 | + | |
| 71 | + @ApiModelProperty("订货日期") | |
| 72 | + private String orderDateEnd; | |
| 73 | + | |
| 68 | 74 | } | ... | ... |
| ... | ... | @@ -53,4 +53,10 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S |
| 53 | 53 | */ |
| 54 | 54 | @ApiModelProperty("导出类型") |
| 55 | 55 | private String exportType; |
| 56 | + | |
| 57 | + @ApiModelProperty("订货日期") | |
| 58 | + private String orderDateStart; | |
| 59 | + | |
| 60 | + @ApiModelProperty("订货日期") | |
| 61 | + private String orderDateEnd; | |
| 56 | 62 | } | ... | ... |
| ... | ... | @@ -223,6 +223,14 @@ |
| 223 | 223 | <if test="vo.type != null and vo.type != ''"> |
| 224 | 224 | AND tb.type = #{vo.type} |
| 225 | 225 | </if> |
| 226 | + <if test="vo.orderDateStart != null"> | |
| 227 | + AND tb.order_date >= #{vo.orderDateStart} | |
| 228 | + </if> | |
| 229 | + <if test="vo.orderDateEnd != null"> | |
| 230 | + <![CDATA[ | |
| 231 | + AND tb.order_date <= #{vo.orderDateEnd} | |
| 232 | + ]]> | |
| 233 | + </if> | |
| 226 | 234 | </where> |
| 227 | 235 | ) t |
| 228 | 236 | ORDER BY | ... | ... |
| ... | ... | @@ -110,6 +110,14 @@ |
| 110 | 110 | <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''"> |
| 111 | 111 | AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%') |
| 112 | 112 | </if> |
| 113 | + <if test="vo.orderDateStart != null"> | |
| 114 | + AND tb.order_date >= #{vo.orderDateStart} | |
| 115 | + </if> | |
| 116 | + <if test="vo.orderDateEnd != null"> | |
| 117 | + <![CDATA[ | |
| 118 | + AND tb.order_date <= #{vo.orderDateEnd} | |
| 119 | + ]]> | |
| 120 | + </if> | |
| 113 | 121 | </where> |
| 114 | 122 | ORDER BY tb.shipment_date DESC |
| 115 | 123 | </select> | ... | ... |