推钢室界面钢坯总支数计算02

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -909,7 +909,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 
 	 @ApiOperation(value="推钢室当班炉次浇筑信息查询", notes="推钢室当班炉次浇筑信息查询")
 	 @GetMapping(value = "/queryOriginalHeatInfoByCcmNo")
-	 public Result<BilletOriginalInfo> queryHeatsActualsByCcmNo(@RequestParam(name="ccmNo", required = false) String ccmNo) {
+	 public Result<BilletOriginalInfo> queryHeatsActualsByCcmNo(@RequestParam(name="ccmNo", required = true) String ccmNo) {
 		 BilletOriginalInfo billetOriginalInfo = new BilletOriginalInfo();
 		 String classShiftGroup = String.format("class:shift:group:%s", ccmNo); // 班组
 		 String classShift = String.format("class:shift:%s",ccmNo); // 班别
@@ -975,7 +975,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 billetOriginalInfo.setShift(shift);
 		 billetOriginalInfo.setShiftGroup(shiftGroup);
 		 billetOriginalInfo.setBilletOriginalProductRecordList(billetOriginalProductRecordList);
-		 billetOriginalInfo.setTotalInfo(billetOriginalProductRecordList.size());
+		 billetOriginalInfo.setTotalInfo(billetOriginalProductRecordList.stream().filter(x -> x.getAmount() != null)
+				 .mapToInt(BilletOriginalProductRecord::getAmount)
+				 .sum());
 		 return Result.OK(billetOriginalInfo);
 	 }
 	 /**