|
|
@@ -1850,7 +1850,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
|
|
|
queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
|
|
|
.eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
.eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
|
|
|
- .isNotNull(BilletHotsendChangeShift::getChangeShiftTime)
|
|
|
+ .isNull(BilletHotsendChangeShift::getChangeShiftTime)
|
|
|
.orderByDesc(BilletHotsendChangeShift::getCreateTime)
|
|
|
.last("limit 1");
|
|
|
BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
|
@@ -2017,8 +2017,15 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
|
|
|
)
|
|
|
));
|
|
|
|
|
|
- // 将结果转换为JSON字符串
|
|
|
- String jsonResult = JSON.toJSONString(lengthResultMap); // 使用FastJSON转换
|
|
|
+ // 将Integer键转换为String键
|
|
|
+ Map<String, Map<String, Object>> stringKeyMap = lengthResultMap.entrySet().stream()
|
|
|
+ .collect(Collectors.toMap(
|
|
|
+ e -> String.valueOf(e.getKey()),
|
|
|
+ Map.Entry::getValue
|
|
|
+ ));
|
|
|
+
|
|
|
+ // 转换为JSON字符串
|
|
|
+ String jsonResult = JSON.toJSONString(stringKeyMap);
|
|
|
heatsActualsInfo.setLength(jsonResult);
|
|
|
|
|
|
// 统计总数
|
