xy 2 주 전
부모
커밋
52c0f1d139

+ 2 - 3
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -108,7 +108,7 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 //只需第一次初始化的数据
-                DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId("report_" + refId);
                 if (firstInsDO == null) {
                     result.put("pressure",equipBoilerDO.getWorkpressure());
                     result.put("medium",equipBoilerDO.getTestmedium());
@@ -117,9 +117,8 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
                     //下次检验日期
                     if (taskOrderDO != null && taskOrderDO.getCheckDate() != null){
                         LocalDate nextYearCheckDate = taskOrderDO.getCheckDate().plusYears(1).minusDays(1);
-                        result.put("nextOutCheckDate1_monthYear",nextYearCheckDate.format(dateFormatMonthYear));
+                        result.put("nextOutCheckDate1_yearMonth",nextYearCheckDate.format(dateFormatMonthYear));
                     }
-
                 }
 
             }