diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyHeaderData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyHeaderData.java index eabc1d8..97b781b 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyHeaderData.java +++ b/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyHeaderData.java @@ -21,6 +21,7 @@ public class SOIssueNotifyHeaderData extends SOIssueNotifyHeader { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; private List workShopList; + private List workCenterNoList; private String workShopId; private String buDesc; private String userDisplay; diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 3ecf124..0ec6a74 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -255,7 +255,7 @@ a.work_center_no, w.WorkCenterDesc as workCenterDesc from SOIssueNotifyHeader a - left join workcenter w on a.site = w.site and a.bu = a.bu_no and a.work_center_no = w.WorkCenterNo + left join workcenter w on a.site = w.site and a.bu = w.bu_no and a.work_center_no = w.WorkCenterNo a.site in (select site from AccessSite where userID = #{query.loginUserName}) and bu in (select bu_no from AccessBu where username = #{query.loginUserName}) @@ -274,6 +274,12 @@ AND a.issueResult LIKE '%' + #{query.issueResult} + '%' + + AND a.work_center_no IN + + #{item} + + AND a.NotifyDate >= #{query.startDate}