diff --git a/src/main/java/com/gaotao/modules/customer/entity/dto/ShipmentIssueDto.java b/src/main/java/com/gaotao/modules/customer/entity/dto/ShipmentIssueDto.java index e6fee996..90d3cf2b 100644 --- a/src/main/java/com/gaotao/modules/customer/entity/dto/ShipmentIssueDto.java +++ b/src/main/java/com/gaotao/modules/customer/entity/dto/ShipmentIssueDto.java @@ -23,6 +23,8 @@ public class ShipmentIssueDto { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; + private String createdBy; + private int page; private int limit; private List orderStatusList; diff --git a/src/main/resources/mapper/notify/IssureNotifyMapper.xml b/src/main/resources/mapper/notify/IssureNotifyMapper.xml index 08ef2460..be3e1ba1 100644 --- a/src/main/resources/mapper/notify/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/notify/IssureNotifyMapper.xml @@ -489,6 +489,9 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu) AND a.push_wcs_flag = #{data.pushWcsFlag} + + AND LOWER(a.username) LIKE CONCAT('%', LOWER(#{data.createdBy}), '%') + and a.status!='UNISSUE' order by a.notify_no desc