From 59b8fc2e4e587bb9c74254aa23e6348e3f2f9e08 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 13 Nov 2023 22:17:01 +0800
Subject: [PATCH] bugfix

---
 .../coalParameterDef/service/CoalParameterDefService.java     | 4 ++++
 .../coal/organization/service/OrganizationService.java        | 2 ++
 src/main/resources/config/CoalParameterDef.json               | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java
index a7e90d8f..1d38d850 100644
--- a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java
+++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java
@@ -196,6 +196,10 @@ public class CoalParameterDefService
 
                 this.repository.saveAll(coalParameterDefs);
             }
+
+            this.repository.findAll().stream()
+                    .filter(x -> StringUtils.equals(x.getInputType(), "1"))
+                    .forEach(this::updateFormula);
         }
     }
 }
diff --git a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
index 63178c02..0e937f9b 100644
--- a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
+++ b/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() {}
 
diff --git a/src/main/resources/config/CoalParameterDef.json b/src/main/resources/config/CoalParameterDef.json
index 6d78260b..7d89fc63 100644
--- a/src/main/resources/config/CoalParameterDef.json
+++ b/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",