|
@@ -415,6 +415,7 @@ public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, Fpg
|
|
|
|
|
|
// 先获取公共属性值,避免在循环内多次重复获取
|
|
|
String deviceTitle = modelReportFormResult.getDeviceTitle();
|
|
|
+ String deviceCode = modelReportFormResult.getDeviceCode();
|
|
|
String deviceRegionId = modelReportFormResult.getDeviceRegionId();
|
|
|
String deviceInformationId = modelReportFormResult.getDeviceInformationId();
|
|
|
String createTime = modelReportFormResult.getDates();
|
|
@@ -456,6 +457,7 @@ public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, Fpg
|
|
|
String formattedDate = date.getYear() + "年" + date.getMonthValue() + "月";
|
|
|
|
|
|
modelDataResult.setDeviceTitle(deviceTitle);
|
|
|
+ modelDataResult.setDeviceCode(deviceCode);
|
|
|
modelDataResult.setDeviceRegionId(deviceRegionId);
|
|
|
modelDataResult.setDeviceInformationId(deviceInformationId);
|
|
|
modelDataResult.setCreateTime(createTime);
|
|
@@ -1882,6 +1884,7 @@ public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, Fpg
|
|
|
String yearFormattedDate = date.getYear() + "年";
|
|
|
|
|
|
modelDataResult.setDeviceTitle(firstResult.getDeviceTitle());
|
|
|
+ modelDataResult.setDeviceCode(firstResult.getDeviceCode());
|
|
|
modelDataResult.setDeviceRegionId(firstResult.getDeviceRegionId());
|
|
|
modelDataResult.setDeviceInformationId(firstResult.getDeviceInformationId());
|
|
|
modelDataResult.setCreateTime(firstResult.getDates());
|