From a97d42f8129933fcd48c5b26ffd6d41049b47451 Mon Sep 17 00:00:00 2001 From: violet Date: Thu, 5 Sep 2024 22:11:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BD=E8=B4=B8=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ITCOrderDetailsReportPlugin.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index 7939eaf7..6e819c85 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -171,16 +171,8 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.id order_plan_detail_id");//跟单任务明细子分录ID selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.yem_srcentryid order_detail_id_plan_fk"); - DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); - DataSet proReqBill = queryOrderProReqBill(param); - - dataSet = dataSet.leftJoin(proReqBill) - .on("order_plan_id", "order_req_main_detail_fk") - .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(proReqBill)) - .finish(); - - return dataSet; + return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); } private DataSet queryOrderProReqBill(ReportQueryParam param) { @@ -240,11 +232,22 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { private DataSet queryTrackTaskConsoleProcEntry(ReportQueryParam param) { List selectfields = new ArrayList<>(); + selectfields.add("yem_es_salesorder_r.id task_order_plan_id"); selectfields.add("yem_es_salesorder_r.yem_entrtyid plan_proc_detail_fk"); selectfields.add("yem_es_salesorder_r.yem_stockway yem_ifreform"); // selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间 selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldfactacdate, 'yyyy-MM-dd') yem_plancompdate");//实际完成时间 - return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null); + + DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null); + + DataSet proReqBill = queryOrderProReqBill(param); + + dataSet = dataSet.leftJoin(proReqBill) + .on("task_order_plan_id", "order_req_main_detail_fk") + .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(proReqBill)) + .finish(); + + return dataSet; } /**