diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java index e8912311..f3334a13 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java @@ -36,6 +36,15 @@ public class ReportOrderEnergyDTO extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endWorkTime; private String workorderCodeSap; + private String workTime; + + public String getWorkTime() { + return workTime; + } + + public void setWorkTime(String workTime) { + this.workTime = workTime; + } @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 937d6ca0..cdda26d6 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -54,6 +54,7 @@ + @@ -275,13 +276,14 @@ bpa.category, mrw_summary.total_quantity_feedback, mrw_summary.create_by as line_leader, + mrw_summary.work_time, pow.start_work_time, pow.end_work_time, be.attr2 AS electricity_no FROM pro_order_workorder pow LEFT JOIN base_equipment be ON pow.workorder_name = be.equipment_code - LEFT JOIN ( SELECT workorder_code, create_by, SUM ( quantity_feedback ) AS total_quantity_feedback FROM mes_report_work GROUP BY workorder_code, create_by ) mrw_summary ON pow.workorder_code = mrw_summary.workorder_code + LEFT JOIN ( SELECT workorder_code, create_by, SUM ( quantity_feedback ) AS total_quantity_feedback,SUM ( work_time ) as work_time FROM mes_report_work GROUP BY workorder_code, create_by ) mrw_summary ON pow.workorder_code = mrw_summary.workorder_code LEFT JOIN base_product_attached bpa ON bpa.product_code = RIGHT ( pow.product_code, 11 ) LEFT JOIN base_product bp ON bp.product_code = pow.product_code