diff --git a/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java b/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java index 4ca58a4c..d97e8e19 100644 --- a/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java +++ b/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java @@ -32,6 +32,7 @@ public class ExportPresentWarningTask extends AbstractTask { // boolean isSendMessage = isTenDaysAfter(); QFilter qFilter = RFUtils.getBaseQFilter(); + qFilter.and(new QFilter("yem_isladingbill", "=", "A")); String selectfields = DynamicObjectUtil.getSelectfields("yem_es_exportpresent"); selectfields = DynamicObjectUtil.getEntrySelectfields(selectfields, "yem_es_exportpresent", "yem_es_exportpre_erw"); DynamicObject[] load = BusinessDataServiceHelper.load("yem_es_exportpresent", selectfields, qFilter.toArray()); @@ -45,6 +46,7 @@ public class ExportPresentWarningTask extends AbstractTask { String shipmentnum = subD.getString("yem_shipmentnum_c"); ladingDateMap.put(shipmentnum, null); String contractnum = subD.getString("yem_contractnum_c"); + isClaimFinishedMap.put(contractnum, true); } } @@ -141,10 +143,10 @@ public class ExportPresentWarningTask extends AbstractTask { Long userid = sendMsg.getKey(); List messageContent = sendMsg.getValue(); ArrayList sendUserId = Lists.newArrayList(); -// sendUserId.add(userid);//销售员 + sendUserId.add(userid);//销售员 sendUserId.addAll(devUserIds); - YEM.sendMessage(sendUserId, "预警消息", "应回款日期预警", String.join("", messageContent), "预警消息"); + YEM.sendMessage(sendUserId, "预警消息", "回款预警", String.join("", messageContent), "预警消息"); } SaveServiceHelper.save(load);