Merge remote-tracking branch 'origin/dev' into dev

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

@@ -152,10 +152,10 @@ public class QR0424_202404ReportOFData implements IDynamicOFData {
             result.put("recipientPhone", taskOrderDO.getRecipientPhone());
             result.put("recipientEmail", taskOrderDO.getRecipientEmail());
 
-            result.put("totalAmount", taskOrderDO.getShouldAmount().setScale(2, java.math.RoundingMode.HALF_UP));
             // 将金额转换为中文数字并按位存储
-            if (taskOrderDO.getShouldAmount() != null) {
-                convertAmountToChineseDigits(taskOrderDO.getShouldAmount(), result);
+            if (taskOrderDO.getActualAmount() != null) {
+                result.put("totalAmount", taskOrderDO.getActualAmount().setScale(2, java.math.RoundingMode.HALF_UP));
+                convertAmountToChineseDigits(taskOrderDO.getActualAmount(), result);
             }
         }