报表调整

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

@@ -5,12 +5,14 @@ import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerR
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
 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.InspectorInfoUtil;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
@@ -18,6 +20,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * 锅炉内部检验记录
@@ -50,8 +53,7 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
-        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
-        /*
+
         //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
 
@@ -65,24 +67,15 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null){
 
+            result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
+
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("useUnitName",equipBoilerDO.getUnitName());
-                result.put("contactPhone",equipBoilerDO.getContactPhone());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-                result.put("ratedPressure",equipBoilerDO.getRatedPressure());
                 result.put("workPressure",equipBoilerDO.getWorkpressure());
-                result.put("unitInternalCode",equipBoilerDO.getUnitInternalCode());
-                if (equipBoilerDO.getMadeTime() != null){
-                    result.put("madeTime",equipBoilerDO.getMadeTime().format(dateFormat));
-                }
-                result.put("productCode",equipBoilerDO.getProductCode());
-                result.put("equipCode",equipBoilerDO.getEquipCode());
-                result.put("makeUnit",equipBoilerDO.getMakeUnit());
-                result.put("unitCode",equipBoilerDO.getUnitCode());
+
                 if (equipBoilerDO.getNextInCheckDate() != null){
                     result.put("nextInCheckDate",equipBoilerDO.getNextInCheckDate().format(dateFormat));
                 }
@@ -92,50 +85,31 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
                 if (equipBoilerDO.getNextPressureCheckDate() != null){
                     result.put("nextPressureCheckDate",equipBoilerDO.getNextPressureCheckDate().format(dateFormat));
                 }
-                result.put("installUnit",equipBoilerDO.getInstallUnit());
-                result.put("designWorkPressure",equipBoilerDO.getDesignWorkPressure());
-                result.put("unitAddress",equipBoilerDO.getUnitAddress());
-                result.put("useRegisterNo",equipBoilerDO.getUseRegisterNo());
-                result.put("lastRepairReformContent",equipBoilerDO.getLastRepairReformContent());
-                result.put("ratedExportTemperature",equipBoilerDO.getRatedExportTemperature());
-                result.put("useOutletTemperature",equipBoilerDO.getUseOutletTemperature());
-                result.put("unitName",equipBoilerDO.getUnitName());
-                result.put("zipCode",equipBoilerDO.getZipCode());
-                result.put("ratedOutput",equipBoilerDO.getRatedOutput());
-                result.put("contact",equipBoilerDO.getContact());
-                if (equipBoilerDO.getUseTime() != null){
-                    result.put("useTime",(equipBoilerDO.getUseTime()).format(dateFormat));
+                if (equipBoilerDO.getLastAllDate() != null){
+                    result.put("lastAllDate",equipBoilerDO.getLastAllDate().format(dateFormat));
+                }
+                if (equipBoilerDO.getLastYearDate() != null){
+                    result.put("lastYearDate",equipBoilerDO.getLastYearDate().format(dateFormat));
+                }
+                if (equipBoilerDO.getLastPressureDate() != null){
+                    result.put("lastPressureCheckDate",equipBoilerDO.getLastPressureDate().format(dateFormat));
                 }
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());
 
-            //检验员信息
-            String orderId = itemReportDO.getOrderId();
-            BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.selectById(orderId);
-            if (taskOrderDO != null){
-                result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
-            }
-            AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
-            if (userInfo != null){
-                result.put("checkName",userInfo.getSignUrl());
             }
 
-            //校验人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getRecheckId()).getData();
-            if (userInfo != null){
-                result.put("recheckName",userInfo.getSignUrl());
-            }else{
-                result.put("recheckName",itemReportDO.getRecheckName());
-            }
-            if (itemReportDO.getRecheckDate() != null){
-                result.put("recheckDate",itemReportDO.getRecheckDate().format(dateFormat));
+            //检验员
+            if (itemDO.getMainChecker() != null){
+                AdminUserRespDTO userInfo = adminUserApi.getUser(itemDO.getMainChecker()).getData();
+                if (userInfo != null) {
+                    result.put("checkName", userInfo.getSignUrl());
+                }
             }
 
+
         }
 
         return result;
-*/
+
 
     }
 }