diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0fa14b46..d5baafb8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -96,6 +96,9 @@ public interface MesReportWorkMapper { @MapKey("nameDate") Map getLineChartsDatas(MesReportProduction mesReportProduction); + @MapKey("nameDate") + Map getLineChartsDayDatas(MesReportProduction mesReportProduction); + @MapKey("name") Map getDayOfMonthDatas(MesReportProduction mesReportProduction); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index e5637614..5035d5f3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -688,7 +688,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { //日期名称数组 List xAxisDatas = getDays(startTime,endTime); lineChartDto.setxAxisDatas(xAxisDatas); - Map productdatas = mesReportWorkMapper.getLineChartsDatas(mesReportProduction); + Map productdatas = mesReportWorkMapper.getLineChartsDayDatas(mesReportProduction); //值 List datas = new ArrayList<>(); for(String dayStr:xAxisDatas) { diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 3934a549..cf45716c 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -310,6 +310,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )mrw group by mrw.nameDate,mrw.productCode,mrw.productName,mrw.feedbackTime +