From d8ba960d180c0ad08b7dfb5a17e7ad351ca2eb62 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 30 十月 2024 11:00:36 +0800
Subject: [PATCH] 报告转pdf格式错误异常解决

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index a54776a..ab6fc59 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -40,6 +40,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -328,7 +330,7 @@
             insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
             insOrder.setSendTime(LocalDateTime.now());
             /*todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss*/
-            /*if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
+            if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
                 String account = userMapper.selectById(order.getIssueUser()).getAccount();
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
@@ -341,7 +343,7 @@
                 map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
                 map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
                 qywxApi.send(map);
-            }*/
+            }
         }
         return insOrderMapper.updateById(insOrder);
     }
@@ -372,8 +374,8 @@
         }
         insOrderMapper.updateById(order);
         //鏌ヨ璇ヨ鍗曟槸A绫昏繕鏄疊绫�
-        if (order.getOrderType().equals("A")) {
-            //濡傛灉鏄疉绫�,1鍜�2鍜�3閮藉鏍搁�氳繃杩欎釜鍗曞瓙灏卞鏍搁�氳繃
+        if (order.getOrderType().equals("B")) {
+            //濡傛灉鏄疊绫�,1鍜�2鍜�3閮藉鏍搁�氳繃杩欎釜鍗曞瓙灏卞鏍搁�氳繃
             if (order.getCheckState1() == 1 && order.getCheckState2() == 1 && order.getCheckState3() == 1) {
                 order.setState(1);
                 upInsOrderOfState(order);
@@ -381,8 +383,8 @@
                 order.setState(2);
                 upInsOrderOfState(order);
             }
-        } else if (order.getOrderType().equals("B")) {
-            //濡傛灉鏄疊绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
+        } else if (order.getOrderType().equals("A")) {
+            //濡傛灉鏄疉绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
             if (order.getCheckState1() == 1 && order.getCheckState2() == 1) {
                 order.setState(1);
                 upInsOrderOfState(order);
@@ -500,7 +502,9 @@
                 .filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
                 .mapToDouble(value -> value.getPrice().doubleValue() * value.getNum())
                 .sum();
-        map.put("total", totalPrice);
+        BigDecimal bd = new BigDecimal(totalPrice).setScale(2, RoundingMode.HALF_UP);
+        double roundedTotalPrice = bd.doubleValue();
+        map.put("total", roundedTotalPrice);
         return map;
     }
 

--
Gitblit v1.9.3