From e0465ecce35ba1f8f3eb57574df2ac9c2f959941 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 15 九月 2022 12:31:21 +0800
Subject: [PATCH] 优化代码
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index 7217ed5..8e22c29 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -1745,12 +1745,6 @@
value = value.replace("F", roomDto.getFloorArea());
} else if (value.contains("U")) { //澶勭悊鍗曞厓
value = value.replace("U", roomDto.getUnitArea());
- } else if (value.contains("R")) { //澶勭悊 鎴垮眿闈㈢Н
- value = value.replace("R", roomDto.getBuiltUpArea());
- } else if (value.contains("X")) {// 澶勭悊 鎴垮眿绯绘暟
- value = value.replace("X", roomDto.getFeeCoefficient());
- } else if (value.contains("L")) {//澶勭悊鎴垮眿灞傛暟
- value = value.replace("L", roomDto.getLayer());
} else if (value.contains("RL")){
List<RoomAttrDto> roomAttrDtos = roomDto.getRoomAttrDto();
if(roomAttrDtos != null && roomAttrDtos.size() > 0){
@@ -1758,6 +1752,12 @@
value = value.replace("RL"+roomAttrDto.getSpecCd(), roomAttrDto.getValue());
}
}
+ } else if (value.contains("R")) { //澶勭悊 鎴垮眿闈㈢Н
+ value = value.replace("R", roomDto.getBuiltUpArea());
+ } else if (value.contains("X")) {// 澶勭悊 鎴垮眿绯绘暟
+ value = value.replace("X", roomDto.getFeeCoefficient());
+ } else if (value.contains("L")) {//澶勭悊鎴垮眿灞傛暟
+ value = value.replace("L", roomDto.getLayer());
}
ScriptEngineManager manager = new ScriptEngineManager();
--
Gitblit v1.8.0