yuzijian 2 rokov pred
rodič
commit
3b3a7338ee

+ 1 - 1
src/main/java/com/syjy/calculate/entity/tCalculationFormula.java

@@ -42,7 +42,7 @@ public class tCalculationFormula implements Serializable  {
      * 公式执行顺序
      */
 
-    private Integer order2;
+    private Integer orderNo;
 
     /**
      * 公式内容

+ 2 - 2
src/main/java/com/syjy/calculate/service/AccuracyPassRateCalculateService.java

@@ -116,8 +116,8 @@ public class AccuracyPassRateCalculateService {
                 }
             }
             // 记录本次公式的计算结果
-            resultMap.put("result" + calculationFormula.getOrder2(), formulaResult);
-            log.info("result" + calculationFormula.getOrder2() + ":" + formulaResult);
+            resultMap.put("result" + calculationFormula.getOrderNo(), formulaResult);
+            log.info("result" + calculationFormula.getOrderNo() + ":" + formulaResult);
         }
         // 获取最后一个公式计算的结果
         String lastResult = String.valueOf(resultMap.get("result" + calculationFormulaList.size()));

+ 1 - 1
src/main/resources/sql/t_calculation_formula.sql

@@ -24,7 +24,7 @@ DROP TABLE IF EXISTS `t_calculation_formula`;
 CREATE TABLE `t_calculation_formula`  (
   `ID` int(0) NOT NULL AUTO_INCREMENT,
   `TYPE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '公式类型',
-  `ORDER2` int(0) NULL DEFAULT NULL COMMENT '公式执行顺讯',
+  `ORDERNo` int(0) NULL DEFAULT NULL COMMENT '公式执行顺讯',
   `FORMULA` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '公式内容',
   `PROVINCE_ENUM` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省调',
   `RULE_FORMULA` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '细则对应的公式',