Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/ifs/api/BaseSearchApi.java

@@ -675,7 +675,7 @@ public class BaseSearchApi {
                 tempItem.setCreateBy(tempMap.get("Admin"));
                 tempItem.setUpdateDate(null); // 从tempMap获取值
                 tempItem.setUpdateBy(tempMap.get("UPDATE_BY"));     // 从tempMap获取值
-                tempItem.setLevelCost(new BigDecimal(tempMap.get("LABOR_CLASS_RATE")));
+                tempItem.setLevelCost(new BigDecimal(tempMap.get("LABOR_CLASS_RATE")).setScale(6, BigDecimal.ROUND_HALF_UP));
                 //添加对象
                 returnlList.add(tempItem);
             }

src/main/java/com/spring/ifs/api/BaseSearchApiTest.java

@@ -633,7 +633,7 @@ public class BaseSearchApiTest {
                 tempItem.setCreateBy(tempMap.get("Admin"));
                 tempItem.setUpdateDate(null); // 从tempMap获取值
                 tempItem.setUpdateBy(tempMap.get("UPDATE_BY"));     // 从tempMap获取值
-                tempItem.setLevelCost(new BigDecimal(tempMap.get("LABOR_CLASS_RATE")));
+                tempItem.setLevelCost(new BigDecimal(tempMap.get("LABOR_CLASS_RATE")).setScale(6, BigDecimal.ROUND_HALF_UP));
                 //添加对象
                 returnlList.add(tempItem);
             }

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -1312,7 +1312,7 @@
         END,
         level_cost = CASE level_id
         <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
-            WHEN #{item.levelId} THEN #{item.levelCost}
+            WHEN #{item.levelId} THEN #{item.levelCost,jdbcType=DECIMAL}
         </foreach>
         ELSE level_cost
         END,