bugfix

src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java

@@ -193,9 +193,15 @@ public class CoalParameterDefService
                                 inputStream, new TypeReference<List<CoalParameterDefEntity>>() {});
 
                 coalParameterDefs.forEach(x -> x.setOrganizationId(orgId));
+                coalParameterDefs.forEach(
+                        x -> x.setInputType(StringUtils.defaultIfBlank(x.getInputType(), "0")));
 
                 this.repository.saveAll(coalParameterDefs);
             }
+
+            this.repository.findAll().stream()
+                    .filter(x -> StringUtils.equals(x.getInputType(), "1"))
+                    .forEach(this::updateFormula);
         }
     }
 }

src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java

@@ -37,6 +37,8 @@ public class OrganizationService extends BaseService<OrganizationEntity, Organiz
 
     @Autowired CoalParameterDefService coalParameterDefService;
 
+
+
     @PostConstruct
     public void init() {}
 

src/main/resources/config/CoalParameterDef.json

@@ -40,7 +40,9 @@
     "parentName": "挥发分(Y)%",
     "name": "干燥基",
     "sortKey": "6",
-    "status": "1"
+    "status": "1",
+    "inputType": "1",
+    "formula": "( param5/(100-0.5-param1) ) * 100"
   },
   {
     "code": "param7",