Browse Source

增加完成时间过滤查询

master
赵宏斌 5 months ago
parent
commit
3774732a74
  1. 6
      src/main/java/com/heai/modules/production/entity/OrderViewData.java
  2. 6
      src/main/resources/mapper/production/SoScheduledListMapper.xml

6
src/main/java/com/heai/modules/production/entity/OrderViewData.java

@ -40,4 +40,10 @@ public class OrderViewData {
private String customerDesc; private String customerDesc;
private String customerId; private String customerId;
private int defectQty; private int defectQty;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startDate2;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endDate2;
} }

6
src/main/resources/mapper/production/SoScheduledListMapper.xml

@ -220,6 +220,12 @@
<if test="endDate != null"> <if test="endDate != null">
AND #{endDate} >= DATEADD(dd, -1, a.EnterDate) AND #{endDate} >= DATEADD(dd, -1, a.EnterDate)
</if> </if>
<if test="startDate2 != null">
AND a.NeedDate >= #{startDate2}
</if>
<if test="endDate2 != null">
AND #{endDate2} >= DATEADD(dd, 0, a.NeedDate)
</if>
<if test="customerId != null and customerId != ''"> <if test="customerId != null and customerId != ''">
AND a.CustomerID like #{customerId} AND a.CustomerID like #{customerId}
</if> </if>

Loading…
Cancel
Save