From fa869173e37ba6f11e7bf0b02ae15f36bfb45e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Tue, 23 Dec 2025 20:21:04 +0800
Subject: [PATCH] =?UTF-8?q?12-23-=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E5=90=88=E5=90=8C=E4=BA=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProjectXmjxServiceImpl.java       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectXmjxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectXmjxServiceImpl.java
index 694e4ceb..5156e184 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectXmjxServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectXmjxServiceImpl.java
@@ -442,33 +442,33 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
                 if (Objects.equals(zyszVo.getMainId(), vo.getId())){
                     //计算设计产值 合同产值 * 系数 * 专业占比 * 设计产值系数
                     zyszVo.setSjcz(
-                        vo.getHtcz().multiply(vo.getXs())
+                        (vo.getHtcz().multiply(vo.getXs())
                             .multiply(zyszVo.getZyzb())
                             .multiply(sjcz)
-                            .setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()//万元，保留6位小数，四舍五入
+                            .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()//万元，保留6位小数，四舍五入
                     );
                     zsjcz = zsjcz.add(zyszVo.getSjcz());
 
                     //计算校审产值 合同产值 * 系数 * 专业占比 * 校审产值系数
                     zyszVo.setJscz(
-                        vo.getHtcz().multiply(vo.getXs())
+                        (vo.getHtcz().multiply(vo.getXs())
                             .multiply(zyszVo.getZyzb())
                             .multiply(jscz)
-                            .setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()
+                            .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()
                     );
                     zjscz = zjscz.add(zyszVo.getJscz());
 
                     //计算审核产值 合同产值 * 系数 * 专业占比 * 审核产值系数
                     zyszVo.setShcz(
-                        vo.getHtcz().multiply(vo.getXs())
+                        (vo.getHtcz().multiply(vo.getXs())
                             .multiply(zyszVo.getZyzb())
                             .multiply(shcz)
-                            .setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()
+                            .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()
                     );
                     zshcz = zshcz.add(zyszVo.getShcz());
 
                     //计算审核绩效 审核产值 * 绩效系数
-                    zyszVo.setShjx(zyszVo.getShcz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros());
+                    zyszVo.setShjx((zyszVo.getShcz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
                     zshjx = zshjx.add(zyszVo.getShjx());
                     //通过历史记录构建人员详情
                     BusProjectXmjxRyxq shTemp = null;
@@ -510,13 +510,13 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
                             ryxqs.add(shRyxq);
                         }
                     }
-                    zyszVo.setShywccz(shywccz.stripTrailingZeros());
-                    zyszVo.setShywcjx(shywcjx.stripTrailingZeros());
+                    zyszVo.setShywccz(shywccz.stripTrailingZeros().stripTrailingZeros());
+                    zyszVo.setShywcjx(shywcjx.stripTrailingZeros().stripTrailingZeros());
                     zyszVo.setShsycz((zyszVo.getShcz().subtract(shywccz)).stripTrailingZeros());//审核剩余产值
                     zyszVo.setShsyjx((zyszVo.getShjx().subtract(shywcjx)).stripTrailingZeros());//审核剩余绩效
 
                     //计算校审绩效 校审产值 * 绩效系数
-                    zyszVo.setJsjx(zyszVo.getJscz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros());
+                    zyszVo.setJsjx((zyszVo.getJscz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
                     zjsjx = zjsjx.add(zyszVo.getJsjx());
                     //通过历史记录构建人员详情
                     BusProjectXmjxRyxq jsTemp = null;
@@ -559,14 +559,14 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
                             ryxqs.add(jsRyxq);
                         }
                     }
-                    zyszVo.setJsywccz(jsywccz.stripTrailingZeros());
-                    zyszVo.setJsywcjx(jsywcjx.stripTrailingZeros());
+                    zyszVo.setJsywccz(jsywccz.stripTrailingZeros().stripTrailingZeros());
+                    zyszVo.setJsywcjx(jsywcjx.stripTrailingZeros().stripTrailingZeros());
                     zyszVo.setJssycz((zyszVo.getJscz().subtract(jsywccz)).stripTrailingZeros());//校审剩余产值
                     zyszVo.setJssyjx((zyszVo.getJsjx().subtract(jsywcjx)).stripTrailingZeros());//校审剩余绩效
 
                     //计算设计绩效 设计产值 * 绩效系数
                     BigDecimal sjywccz = BigDecimal.ZERO;//设计已完成产值
-                    zyszVo.setSjjx(zyszVo.getSjcz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros());
+                    zyszVo.setSjjx((zyszVo.getSjcz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
                     zsjjx = zsjjx.add(zyszVo.getSjjx());
                     //通过历史记录构建人员详情
                     BusProjectXmjxRyxq sjTemp = null;
@@ -607,8 +607,8 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
                             ryxqs.add(sjRyxq);
                         }
                     }
-                    zyszVo.setSjywccz(sjywccz.stripTrailingZeros());
-                    zyszVo.setSjywcjx(sjywcjx.stripTrailingZeros());
+                    zyszVo.setSjywccz(sjywccz.stripTrailingZeros().stripTrailingZeros());
+                    zyszVo.setSjywcjx(sjywcjx.stripTrailingZeros().stripTrailingZeros());
                     zyszVo.setSjsycz((zyszVo.getSjcz().subtract(sjywccz)).stripTrailingZeros());
                     zyszVo.setSjsyjx((zyszVo.getSjjx().subtract(sjywcjx)).stripTrailingZeros());//设计剩余绩效