调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10038_202401ReportOFData.java

@@ -12,6 +12,7 @@ import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -93,6 +94,10 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
 
             }
 
+            //检验员信息
+            List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
+            InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);
+
             if (itemDO.getEndCheckDate() != null){
                 result.put("checkDate2", itemDO.getEndCheckDate().format(dateFormat));
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12123_202402RecordOFData.java

@@ -110,12 +110,12 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
                     if (allDetailDOS.size() == 1) {
                         EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailDOList.get(0);
                         //设计使用年限designLifeYears
-                        result.put("designLifeYears", equipPipeDetailDO.getDesignLifeYears());
+//                        result.put("designLifeYears", equipPipeDetailDO.getDesignLifeYears());
                         //投入使用日期commissioningDate
-                        result.put("commissioningDate", equipPipeDetailDO.getCommissioningDate());
+//                        result.put("commissioningDate", equipPipeDetailDO.getCommissioningDate());
                     }else {
-                        result.put("designLifeYears", "见一览表");
-                        result.put("commissioningDate", "见一览表");
+//                        result.put("designLifeYears", "-");
+//                        result.put("commissioningDate", "见一览表");
                     }
                 }