增加处理数据项值计算错误处理

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -465,11 +465,23 @@ public class TaskServiceImpl implements TaskService {
                         value.setObjType(groupObj.getObjType());
                         value.setTaskId(task.getId());
                         if (needLast) {
-                            String oldValue = CalculateUtils.calculateFormula(indicator.getIndFormula(), lastDataMap);
-                            value.setIndLastValue(oldValue);
+                            try {
+                                String oldValue = CalculateUtils.calculateFormula(indicator.getIndFormula(), lastDataMap);
+                                value.setIndLastValue(oldValue);
+                            } catch (Exception e) {
+                                log.error("错误的同期值计算indId={}, indName={}, formula={}, valueTime={}",
+                                        indicator.getIndId(), indicator.getIndName(), indicator.getIndFormula(), lastVt);
+                                continue;
+                            }
+                        }
+                        try {
+                            String nowValue = CalculateUtils.calculateFormula(indicator.getIndFormula(), dataMap);
+                            value.setIndValue(nowValue);
+                        } catch (Exception e) {
+                            log.error("错误的本期值计算indId={}, indName={}, formula={}, valueTime={}",
+                                    indicator.getIndId(), indicator.getIndName(), indicator.getIndFormula(), vt);
+                            continue;
                         }
-                        String nowValue = CalculateUtils.calculateFormula(indicator.getIndFormula(), dataMap);
-                        value.setIndValue(nowValue);
                         newValues.add(value);
 
                         generateIndData(task, vt, lastVt, value, needLast, datas);