报表更新

mes/src/main/java/com/ximai/mes/report/controller/WorkOrderProgressController.java

@@ -51,7 +51,7 @@ public class WorkOrderProgressController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('mes:pro:feedback:get')")
     @Log(title = "生产进度:报工明细", businessType = BusinessType.QUERY)
     @GetMapping("/getFeedbackList")
-    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList(@RequestParam("taskId") Long taskId,@RequestParam("workorderCode") String workorderCode) {
+    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList( Long taskId,@RequestParam("workorderCode") String workorderCode) {
         List<WorkOrderProgressFeedbackListResponse> workOrderProgressFeedbackListResponses = workOrderProgressService.getFeedbackList(workorderCode,taskId);
         return getDataTable(workOrderProgressFeedbackListResponses);
     }

mes/src/main/java/com/ximai/mes/report/service/impl/WorkOrderProgressServiceImp.java

@@ -45,7 +45,7 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
 
             }
         }
-        return proWorkorderMapper.getWorkOrderProgressServiceList(workOrderProgressRequest);
+        return workOrderProgressListResponses;
     }
 
     @Override
@@ -59,8 +59,14 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
             }else{
                 workOrderProgressProcessListResponse.setStatus("未开工");
             }
-            workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().
-                    divide(workOrderProgressProcessListResponse.getQuantityProduced()).setScale(2, RoundingMode.HALF_UP));
+            if(workOrderProgressProcessListResponse.getQuantityProduced() != null && workOrderProgressProcessListResponse.getQuantityProduced().compareTo(BigDecimal.ZERO) > 0){
+
+                workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().
+                        divide(workOrderProgressProcessListResponse.getQuantityProduced(),2, RoundingMode.HALF_UP));
+            }else{
+
+                workOrderProgressProcessListResponse.setPassRate(BigDecimal.ZERO);
+            }
         }
         return workOrderProgressProcessListResponses;
     }