确认数据公式运算和对标运算保持一致

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

@@ -487,8 +487,18 @@ public class TaskServiceImpl implements TaskService {
         //本期值Map
         Map<String, String> dataMap = new HashMap<>();
         for (TaskIndValue value : values) {
-            lastDataMap.put(value.getIndId()+value.getObjId(), value.getIndLastValue());
-            dataMap.put(value.getIndId()+value.getObjId(), value.getIndValue());
+
+            String tmpLastValue =value.getIndLastValue();
+            if(StringUtils.isNotBlank(tmpLastValue)&&tmpLastValue.indexOf(".")<0) {
+                tmpLastValue += ".00";
+            }
+            lastDataMap.put(value.getIndId()+value.getObjId(), tmpLastValue);
+
+            String tmpValue =value.getIndValue();
+            if(StringUtils.isNotBlank(tmpValue)&&tmpValue.indexOf(".")<0) {
+                tmpValue += ".00";
+            }
+            dataMap.put(value.getIndId()+value.getObjId(),tmpValue);
 
             generateIndData(task, vt, lastVt, value, needLast, datas);
         }
@@ -576,11 +586,7 @@ public class TaskServiceImpl implements TaskService {
                         try {
                             Map<String,String> tmp = new HashMap<>();
                             for (String s : indIdList) {
-                                String tmpValue = dataMap.get(s + model.getId());
-                                if(StringUtils.isNotBlank(tmpValue)&&tmpValue.indexOf(".")<0) {
-                                    tmpValue += ".00";
-                                }
-                                tmp.put(s,tmpValue);
+                                tmp.put(s,dataMap.get(s + model.getId()));
                             }
                             String nowValue = CalculateUtils.calculateFormula(indicator.getIndFormula(), tmp);
                             value.setIndValue(nowValue);