yzc преди 1 година
родител
ревизия
f6096df2d6
променени са 1 файла, в които са добавени 1 реда и са изтрити 0 реда
  1. 1 0
      hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskProgressServiceImpl.java

+ 1 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskProgressServiceImpl.java

@@ -49,6 +49,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
         IWrapper<ProductionTaskProgress> wrapper = getWorkshopReportWrapper(dto);
 
         wrapper.in("DATEDIFF( now(), ps.scheduling_date )", -1, 0, 1);
+        wrapper.groupBy("ptp.id");
 
         Page<WorkshopReportBo> workshopReportBoPage = baseMapper.workshopReport(dto.getPage(), wrapper);
         List<WorkshopReportBo> records = workshopReportBoPage.getRecords();