报表调整

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

@@ -78,31 +78,17 @@ public class QC10021_202400ReportOFData implements IDynamicOFData {
 
             //根据记录字段动态生成报告字段
             result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(),ruleVO.getTemplateId(),refId);
-//            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
 
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-//                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());
 
-            //审核人员信息
-            AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getApprovalId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("approvalName",userInfo.getSignUrl());
-                }else{
-                    result.put("approvalName",itemReportDO.getApprovalName());
-                }
-            }
-            if (itemReportDO.getApprovalTime() != null){
-                result.put("approvalTime",itemReportDO.getApprovalTime().format(dateFormat));
             }
 
+
         }
 
         return result;

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

@@ -49,51 +49,26 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
-//        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
+
         //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
 
         //设备报表ID
         String refId = ruleVO.getRefId();
-        //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
 
         JSONObject result = new JSONObject();
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
 
         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("productCode",equipBoilerDO.getProductCode());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-            }
-
-            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));
             }
 
         }