公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/Formula.java

@@ -29,21 +29,15 @@ public class Formula extends BaseEntity {
    private String number;
    private Integer orderNum;
    private String remark;
-//   @Size(max = 20)
-//   private Long nodeId;
-//   @Size(max = 20)
-//   private Long elementId;
    private String map;
    private Integer scale;
    private Integer batch;
-//   private Integer scope;
-   /**
-    * 输出模式，0自动 1填充
-    * */
+   /**输出模式，0自动 1填充*/
    private Integer outm;
-   /**关联的节点参数id
-    * */
+   /**关联的节点参数id*/
    private Long paramId;
+   /**偏差范围*/
+   private String dev;
 
 
    public List<String> getRelyList(){

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -1,5 +1,11 @@
 package org.springblade.manager.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.extra.tokenizer.Result;
+import cn.hutool.extra.tokenizer.TokenizerEngine;
+import cn.hutool.extra.tokenizer.TokenizerUtil;
+import cn.hutool.extra.tokenizer.Word;
+import cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -195,6 +201,10 @@ public class WbsTreeController extends BladeController {
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
     public R<List<WbsFormElementVO>> selectFormElements(@RequestParam("id") String id,Long nodeId) {
         List<WbsFormElementVO> wbsFormElements = null;
+//        TokenizerEngine engine = new HanLPEngine();
+//        String text = "这是一段分词测试代码";
+//        Result result = engine.parse(text);
+//        String resultStr = CollUtil.join((Iterator<Word>)result, " ");
         if (StringUtils.isNotEmpty(id)) {
             wbsFormElements = wbsTreeService.selectFormElements(id,nodeId);
             if (wbsFormElements.size() > 0) {

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

@@ -22,7 +22,8 @@
         <result column="outm" property="outm"/>
         <result column="scale" property="scale"/>
         <result column="batch" property="batch"/>
-        <result column="scope" property="scope"/>
+<!--        <result column="scope" property="scope"/>-->
+        <result column="dev" property="dev"/>
     </resultMap>
 
 </mapper>

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

@@ -378,7 +378,6 @@
     </select>
     <select id="selectFormElements" resultMap="wbsFormElementMap">
         select f_id,e_key,a.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.parent_id,':',b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName,
-        select   f_id as fId,e_key,a.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,
                b.parent_id as nodeId
         from m_wbs_form_element a inner join m_wbs_tree b on a.f_id=b.init_table_id
         where b.id=#{id} and a.is_deleted=0