公式相关

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -378,7 +378,10 @@
         union   select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName from m_table_info a INNER JOIN (SELECT j.* from m_table_info k INNER JOIN m_wbs_tree_private j on k.tab_en_name=j.init_table_name
         where k.id=#{id} limit 1) b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id  where a.id =#{id} and c.is_deleted=0
     </select>
-
+    <select id="selectFormElements4Formula" resultMap="wbsFormElementMap">
+        select  * from m_wbs_form_element a
+        where a.f_id=#{id} and a.is_deleted=0
+    </select>
     <select id="selectPrivateFormElements" resultMap="wbsFormElementMap">
         select  * from m_wbs_form_element a
         where a.f_id=#{id} and a.is_deleted=0

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -335,6 +335,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             }
                             if(local.size()>0){
                                 List<Object> values = slice(local,this.constantMap,f);
+                                if(StringUtils.isNotEmpty(formula.getScale())){
+                                    values= values.stream().map(e->StringUtils.number2String(e,formula.getScale())).collect(Collectors.toList());
+                                }
                                 if(values.size()>fd.getValues().size()){
                                     /*当生成的数据超过实际容量的时候，会自动合并到第一个单元格*/
                                     fd.getValues().get(0).setValue(values.stream().filter(Func::isNotEmpty).map(StringUtils::handleNull).collect(Collectors.joining("、")));