问题处理

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

@@ -39,6 +39,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
     @Override
     public List<ProductionTaskProgressVo> workshopReportStatistics(ProductionTaskProgressSelectDto dto) {
         IWrapper<ProductionTaskProgress> wrapper = getWorkshopReportWrapper(dto);
+        wrapper.eq("DATEDIFF( now(), ps.scheduling_date )", 0);
         wrapper.groupBy("ptp.processes_id");
         List<ProductionTaskProgressVo> workshopReportStatistics = baseMapper.workshopReportStatistics(wrapper);
         return workshopReportStatistics;
@@ -48,6 +49,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
     public Page<WorkshopReportBo> workshopReport(ProductionTaskProgressSelectDto dto) {
         IWrapper<ProductionTaskProgress> wrapper = getWorkshopReportWrapper(dto);
 
+        //过滤 昨天 今天 明天
         wrapper.in("DATEDIFF( now(), ps.scheduling_date )", -1, 0, 1);
         wrapper.groupBy("ptp.id");
 

hx-mes/src/main/resources/mapper/production/ProductionTaskProgressMapper.xml

@@ -53,7 +53,7 @@
                  LEFT JOIN production_processes pp ON ptp.processes_id = pp.id
                  LEFT JOIN production_order_detail pod ON ptp.task_id = pod.id
                  LEFT JOIN production_order po ON pod.produce_order_id = po.id
-                 LEFT JOIN production_scheduling ps on ps.task_id = pod.id
+                 LEFT JOIN production_scheduling ps on ps.task_id = pod.id AND ps.processes_id = ptp.processes_id
             ${ew.customSqlSegment}
     </select>
     <select id="workshopReportStatistics"
@@ -67,7 +67,6 @@
                  LEFT JOIN production_order_detail pod ON ptp.task_id = pod.id
                  LEFT JOIN production_scheduling ps ON ps.task_id = pod.id
             AND ps.processes_id = ptp.processes_id
-            AND DATEDIFF(now(), ps.scheduling_date) = 0
             ${ew.customSqlSegment}
     </select>
 </mapper>