|
@@ -416,8 +416,8 @@ public class CalculationFormulaRepositoryImpl implements CalculationFormulaRepos
|
|
|
ps.setInt(1, i + 1);
|
|
|
ps.setString(2, list.get(i).getType());
|
|
|
ps.setInt(3, ObjectUtil.defaultIfNull(list.get(i).getOrderNo(), 1));
|
|
|
- String formula = StrUtil.removeAll(list.get(i).getFormula(), '\r', '\n');
|
|
|
- ps.setObject(4, formula);
|
|
|
+ //String formula = StrUtil.removeAll(list.get(i).getFormula(), '\r', '\n');
|
|
|
+ ps.setObject(4, list.get(i).getFormula());
|
|
|
ps.setString(5, list.get(i).getProvince());
|
|
|
ps.setString(6, list.get(i).getElectricType());
|
|
|
ps.setString(7, list.get(i).getStationCode());
|