钢坯热送班统计返回班组信息

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/OnDutyStatistics.java

@@ -20,4 +20,10 @@ public class OnDutyStatistics {
     @ApiModelProperty(value = "明细")
     private List<DestinationStatisticsDetails> statisticsDetailsList;
 
+    @ApiModelProperty(value = "班组")
+    private String shiftGroup;
+
+    @ApiModelProperty(value = "班别")
+    private String shift;
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -667,8 +667,10 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     String ccmNoForGroup = group.isEmpty() ? null : group.get(0).getCcmNo();
                     return new DestinationStatisticsDetails(size, totalNums, finalBlankOutput, ccmNoForGroup);
                 }).collect(Collectors.toList());
-        log.info("{}{}", "合并后的列表：", JSON.toJSON(mergedList));
+        log.info("{}{}", "钢坯热送单班统计查询结果：", JSON.toJSON(mergedList));
         onDutyStatistics.setStatisticsDetailsList(mergedList);
+        onDutyStatistics.setShiftGroup(ShiftGroupEnum.fromCode(shiftGroup).name());
+        onDutyStatistics.setShift(ShiftEnum.fromCode(shift).name());
         return onDutyStatistics;
     }