调整

tz-module-pressure2/tz-module-pressure2-biz/pom.xml

@@ -195,7 +195,7 @@
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
             <!--            <version>3.0.5</version>-->
-            <version>2.0.28</version>
+            <version>2.0.30</version>
         </dependency>
 
         <!-- OpenPDF for PDF generation -->

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

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.pipetaskorderitem.PipeTaskOrderItemService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -102,20 +103,21 @@ public class QC01001_202400OFData implements IDynamicOFData {
                         EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
                         if (equipBoilerDO != null){
                             //设备信息
-                            makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + equipBoilerDO.getMakeUnit();
-                            uintName = (uintName.isEmpty()?uintName:uintName+",") + equipBoilerDO.getUnitName();
-                            equipName = (equipName.isEmpty()?equipName:equipName+",") + equipBoilerDO.getEquipName();
-                            productCode = (productCode.isEmpty()?productCode:productCode+",") + equipBoilerDO.getProductCode();
-                            unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + equipBoilerDO.getUnitAddress();
-                            zipCode = (zipCode.isEmpty()?zipCode:zipCode+",") + equipBoilerDO.getZipCode();
+                            makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + (StringUtils.isEmpty(equipBoilerDO.getMakeUnit())?"-":equipBoilerDO.getMakeUnit());
+                            uintName = (uintName.isEmpty()?uintName:uintName+",") + (StringUtils.isEmpty(equipBoilerDO.getUnitName())?"-":equipBoilerDO.getUnitName());
+                            equipName = (equipName.isEmpty()?equipName:equipName+",") + (StringUtils.isEmpty(equipBoilerDO.getEquipName())?"-":equipBoilerDO.getEquipName());
+                            productCode = (productCode.isEmpty()?productCode:productCode+",") + (StringUtils.isEmpty(equipBoilerDO.getProductCode())?"-":equipBoilerDO.getProductCode());
+                            unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + (StringUtils.isEmpty(equipBoilerDO.getUnitAddress())?"-":equipBoilerDO.getUnitAddress());
+                            zipCode = (zipCode.isEmpty()?zipCode:zipCode+",") + (StringUtils.isEmpty(equipBoilerDO.getZipCode())?"-":equipBoilerDO.getZipCode());
                         }
                     }
-                    result.put("makeUint",makeUint);
-                    result.put("uintName",uintName);
-                    result.put("equipName",equipName);
-                    result.put("productCode",productCode);
-                    result.put("unitAddress",unitAddress);
-                    result.put("zipCode",zipCode);
+                    result.put("projectName",projectName.isEmpty()?"-":projectName);
+                    result.put("makeUint",makeUint.isEmpty()?"-":makeUint);
+                    result.put("uintName",uintName.isEmpty()?"-":uintName);
+                    result.put("equipName",equipName.isEmpty()?"-":equipName);
+                    result.put("productCode",productCode.isEmpty()?"-":productCode);
+                    result.put("unitAddress",unitAddress.isEmpty()?"-":unitAddress);
+                    result.put("zipCode",zipCode.isEmpty()?"-":zipCode);
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());
@@ -173,18 +175,22 @@ public class QC01001_202400OFData implements IDynamicOFData {
                         EquipPipeDO equipPipeDO = equipPipeMapper.selectById(equipId);
                         if (equipPipeDO != null){
                             //设备信息
-                            makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + equipPipeDO.getUnitCode();
-                            uintName = (uintName.isEmpty()?uintName:uintName+",") + equipPipeDO.getUnitName();
-                            projectName = (projectName.isEmpty()?projectName:projectName+",") + equipPipeDO.getProjectName();
-                            unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + equipPipeDO.getUnitAddress();
-                            zipCode = (zipCode.isEmpty()?zipCode:zipCode+",") + equipPipeDO.getPostalCode();
+                            makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + (StringUtils.isEmpty(equipPipeDO.getUnitCode())?"-":equipPipeDO.getUnitCode());
+                            uintName = (uintName.isEmpty()?uintName:uintName+",") + (StringUtils.isEmpty(equipPipeDO.getUnitName())?"-":equipPipeDO.getUnitName());
+                            projectName = (projectName.isEmpty()?projectName:projectName+",") + (StringUtils.isEmpty(equipPipeDO.getProjectName())?"-":equipPipeDO.getProjectName());
+                            productCode = (productCode.isEmpty()?productCode:productCode+",") + (StringUtils.isEmpty(equipPipeDO.getProjectNo())?"-":equipPipeDO.getProjectNo());
+                            unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + (StringUtils.isEmpty(equipPipeDO.getUnitAddress())?"-":equipPipeDO.getUnitAddress());
+                            zipCode = (zipCode.isEmpty()?zipCode:zipCode+",") + (StringUtils.isEmpty(equipPipeDO.getPostalCode())?"-":equipPipeDO.getPostalCode());
                         }
                     }
-                    result.put("makeUint",makeUint);
-                    result.put("uintName",uintName);
-                    result.put("projectName",projectName);
-                    result.put("unitAddress",unitAddress);
-                    result.put("zipCode",zipCode);
+                    result.put("projectName",projectName.isEmpty()?"-":projectName);
+                    result.put("makeUint",makeUint.isEmpty()?"-":makeUint);
+                    result.put("uintName",uintName.isEmpty()?"-":uintName);
+                    result.put("equipName",projectName.isEmpty()?"-":projectName);
+                    result.put("productCode",productCode.isEmpty()?"-":productCode);
+                    result.put("unitAddress",unitAddress.isEmpty()?"-":unitAddress);
+                    result.put("zipCode",zipCode.isEmpty()?"-":zipCode);
+
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());

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

@@ -122,7 +122,7 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
                 if (itemReportDO.getItemPartId() != null){
                     DictDataRespDTO partType = dictDataApi.getDictData("pressure2_boiler_part_type",itemReportDO.getItemPartId()).getData();
                     if (partType != null){
-                        result.put("equipName",partType.getLabel());
+//                        result.put("equipName",partType.getLabel());
                     }
                 }
 
@@ -191,11 +191,11 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
                 if (itemReportDO.getPipeDetailId() != null){
                     EquipPipeDetailDO detailDO = equipPipeDetailMapper.selectById(itemReportDO.getPipeDetailId());
                     if (detailDO != null){
-                        result.put("equipName",detailDO.getPipeName());
+//                        result.put("equipName",detailDO.getPipeName());
 
-                        result.put("workPressure",detailDO.getWorkPressure());
-                        result.put("workTemperature",detailDO.getWorkTemperature());
-                        result.put("pipeMaterial",detailDO.getPipeMaterial());
+//                        result.put("workPressure",detailDO.getWorkPressure());
+//                        result.put("workTemperature",detailDO.getWorkTemperature());
+//                        result.put("pipeMaterial",detailDO.getPipeMaterial());
                     }
                 }
 

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

@@ -25,6 +25,7 @@ import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -115,7 +116,7 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
                                 result.put("nominalDiameter_"+(i+1),pipeDetail.getNominalDiameter());
                                 result.put("nominalWallThickness_"+(i+1),pipeDetail.getNominalWallThickness());
                                 if (pipeDetail.getPipeLength() != null){
-                                    result.put("pipeLength_"+(i+1),pipeDetail.getPipeLength().toString());
+                                    result.put("pipeLength_"+(i+1), formatDecimal(pipeDetail.getPipeLength()));
                                 }
                                 result.put("pipeMaterial_"+(i+1),pipeDetail.getPipeMaterial());
                                 result.put("materialStandard_"+(i+1),pipeDetail.getMaterialStandard());
@@ -151,4 +152,17 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
 
         return result;
     }
+
+    /**
+     * 格式化小数：保留实际小数位，去掉末尾的零
+     * 例如：38.000000 -> 38, 48.350000 -> 48.35
+     */
+    private String formatDecimal(BigDecimal value) {
+        if (value == null) {
+            return "";
+        }
+        // stripTrailingZeros() 去除末尾的零
+        // toPlainString() 避免科学计数法
+        return value.stripTrailingZeros().toPlainString();
+    }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pdf/PdfServiceImpl.java

@@ -191,7 +191,8 @@ public class PdfServiceImpl implements PdfService {
                 for (int y = 0; y < worksheet.getColumnCount(); y++) {
                     IRange range = worksheet.getCells().get(x, y);
                     if (range.getBindingPath() != null && range.getValue() != null) {
-                        String value = (String) range.getValue();
+                        Object valueObj = range.getValue();
+                        String value = valueObj instanceof String ? (String) valueObj : String.valueOf(valueObj);
                         // 签名
                         if (value.endsWith(".png") || value.endsWith(".jpg")) {
                             // 是非多张图片

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -2867,7 +2867,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         String reportNo = "";
         PipeTaskOrderItemReportDO mainReport = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>().
-                eq(PipeTaskOrderItemReportDO::getOrderItemId, taskOrderMajorIssuesVO.getOrderItemId()), false);
+                eq(PipeTaskOrderItemReportDO::getOrderId, taskOrderMajorIssuesVO.getOrderId()), false);
         if (mainReport != null) {
             reportNo = mainReport.getReportNo();
         }