报表中邮箱获取值调整

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

@@ -68,7 +68,7 @@ public class QC10067_202402RecordOFData implements IDynamicOFData {
                 result.put("useNo",equipBoilerDO.getUseRegisterNo());
                 result.put("contact",equipBoilerDO.getContact());
                 result.put("unitName",equipBoilerDO.getUnitName());
-                result.put("zipCode",equipBoilerDO.getZipCode());
+//                result.put("zipCode",equipBoilerDO.getZipCode());
                 result.put("unitAddress",equipBoilerDO.getUnitAddress());
                 result.put("unitCode",equipBoilerDO.getUnitCode());
                 result.put("contactPhone",equipBoilerDO.getContactPhone());
@@ -105,6 +105,7 @@ public class QC10067_202402RecordOFData implements IDynamicOFData {
             BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.selectById(orderId);
             if (taskOrderDO != null){
                 result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
+                result.put("zipCode",taskOrderDO.getZipCode());
             }
             AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
             if (userInfo != null){

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

@@ -111,7 +111,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("ratedExportTemperature",equipBoilerDO.getRatedExportTemperature());
                 result.put("useOutletTemperature",equipBoilerDO.getUseOutletTemperature());
                 result.put("unitName",equipBoilerDO.getUnitName());
-                result.put("zipCode",equipBoilerDO.getZipCode());
+//                result.put("zipCode",equipBoilerDO.getZipCode());
                 result.put("buringMethod",equipBoilerDO.getBuringMethod());
                 result.put("ratedOutput",equipBoilerDO.getRatedOutput());
                 //上次内检日期
@@ -143,6 +143,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
             BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.selectById(orderId);
             if (taskOrderDO != null){
                 result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
+                result.put("zipCode",taskOrderDO.getZipCode());
             }
             AdminUserRespDTO userInfo = new AdminUserRespDTO();
             if (itemDO.getMainChecker() != null){

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01006_202400OFData.java

@@ -135,6 +135,7 @@ public class QC01006_202400OFData implements IDynamicOFData {
                         result.put("unitName",equipBoilerDO.getUnitName());
                         if (taskOrderDO != null){
                             result.put("checkDate",taskOrderDO.getCheckDate());
+                            result.put("zipCode",taskOrderDO.getZipCode());
                         }
                         if (itemReportDO.getRatifyTime() != null){
                             // 计算15个工作日后的日期
@@ -145,7 +146,7 @@ public class QC01006_202400OFData implements IDynamicOFData {
                         result.put("contact",equipBoilerDO.getContact());
                         result.put("contactPhone",equipBoilerDO.getContactPhone());
                         result.put("unitAddress",equipBoilerDO.getUnitAddress());
-                        result.put("zipCode",equipBoilerDO.getZipCode());
+//                        result.put("zipCode",equipBoilerDO.getZipCode());
                     }
                 }
 
@@ -169,6 +170,7 @@ public class QC01006_202400OFData implements IDynamicOFData {
 
                 if (taskOrderDO != null){
                     result.put("checkDate",taskOrderDO.getCheckDate());
+                    result.put("zipCode",taskOrderDO.getZipCode());
                     List<PipeTaskOrderItemDO> itemDOS = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemDO>()
                             .eq(PipeTaskOrderItemDO::getOrderId, taskOrderDO.getId()));
 
@@ -192,7 +194,7 @@ public class QC01006_202400OFData implements IDynamicOFData {
                             result.put("contact",equipPipeDO.getContact());
                             result.put("contactPhone",equipPipeDO.getContactPhone());
                             result.put("unitAddress",equipPipeDO.getUnitAddress());
-                            result.put("zipCode",equipPipeDO.getPostalCode());
+//                            result.put("zipCode",equipPipeDO.getPostalCode());
                         }
                     }
                     result.put("reportNo",itemReportDO.getReportNo());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01007_202400OFData.java

@@ -120,6 +120,7 @@ public class QC01007_202400OFData implements IDynamicOFData {
                 }
                 if (taskOrderDO != null){
                     result.put("checkDate",taskOrderDO.getCheckDate());
+                    result.put("zipCode",taskOrderDO.getZipCode());
                 }
 
                 String orderItemId = itemReportDO.getOrderItemId();
@@ -147,7 +148,7 @@ public class QC01007_202400OFData implements IDynamicOFData {
                         result.put("contact",equipBoilerDO.getContact());
                         result.put("contactPhone",equipBoilerDO.getContactPhone());
                         result.put("unitAddress",equipBoilerDO.getUnitAddress());
-                        result.put("zipCode",equipBoilerDO.getZipCode());
+//                        result.put("zipCode",equipBoilerDO.getZipCode());
                     }
                 }
 
@@ -195,6 +196,7 @@ public class QC01007_202400OFData implements IDynamicOFData {
 
                 if (taskOrderDO != null){
                     result.put("checkDate",taskOrderDO.getCheckDate());
+                    result.put("zipCode",taskOrderDO.getZipCode());
                     List<PipeTaskOrderItemDO> itemDOS = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemDO>()
                             .eq(PipeTaskOrderItemDO::getOrderId, taskOrderDO.getId()));
 
@@ -218,7 +220,7 @@ public class QC01007_202400OFData implements IDynamicOFData {
                             result.put("contact",equipPipeDO.getContact());
                             result.put("contactPhone",equipPipeDO.getContactPhone());
                             result.put("unitAddress",equipPipeDO.getUnitAddress());
-                            result.put("zipCode",equipPipeDO.getPostalCode());
+//                            result.put("zipCode",equipPipeDO.getPostalCode());
                         }
                     }
 

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

@@ -145,6 +145,13 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()) {
+
+                //任务单信息
+                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
+                if (taskOrderDO != null) {
+                    result.put("zipCode",taskOrderDO.getZipCode());
+                }
+
                 //设备信息
                 List<EquipPipeDO> equipPipeDOS = equipPipeMapper.selectByIds(itemDOList.stream().map(PipeTaskOrderItemDO::getEquipId).toList());
                 if (!equipPipeDOS.isEmpty()) {
@@ -152,7 +159,7 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
                     result.put("unitName", equipPipeDO.getUnitName());
                     result.put("socialCreditCode", equipPipeDO.getUnitCode());
                     result.put("unitAddress", equipPipeDO.getUnitAddress());
-                    result.put("zipCode", equipPipeDO.getPostalCode());
+//                    result.put("zipCode", equipPipeDO.getPostalCode());
                     result.put("pipeAddress", equipPipeDO.getPipeAddress());
                     result.put("useNo", equipPipeDO.getCertificateNo());
                     List<String> pipeCategoryList = equipPipeDOS.stream().map(EquipPipeDO::getPipeCategory).distinct().toList();