算单位得分时过来指标值为NaN的指标

src/main/java/com/keymobile/indicators/service/hytobacco/ScoreRuleService.java

@@ -150,25 +150,33 @@ public class ScoreRuleService {
 						//得分类型：0 指标值直接参与计算
 						if("0".equals(scoreRule.getScoreType())) {
 							if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-									&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+//									&& !"0.0000".equals(calResult.getValue())
+									&& !"0".equals(calResult.getValue())) {
 								values.add(calResult.getValue());
 							}
 						}else if("1".equals(scoreRule.getScoreType())) {//1 指标得分分数参与计算（综合评分和改善提升分开算）
-							values.add(calResult.getScore());
-							if(!"No".equals(calResult.getImproveScore()) && 
+							if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
+//									&& !"0.0000".equals(calResult.getValue())
+									&& !"0".equals(calResult.getValue())) {
+								values.add(calResult.getScore());
+							}
+							if(!"No".equals(calResult.getImproveScore()) &&
 									StringUtils.isNotBlank(calResult.getImproveScore())) {
 								improveValues.add(calResult.getImproveScore());
 							}
 						}else {//2指标得分分数参与计算（指标分数=综合+改善）
-							if(!"No".equals(calResult.getImproveScore()) && 
-									StringUtils.isNotBlank(calResult.getImproveScore())) {
-								double indScore = Double.parseDouble(calResult.getScore());
-								double improveScore = Double.parseDouble(calResult.getImproveScore());
-								double sum = indScore+improveScore;
-								values.add(String.valueOf(sum));
-							}else {
-								values.add(calResult.getScore());
+							if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue()) && !"0".equals(calResult.getValue())){
+								if(!"No".equals(calResult.getImproveScore()) &&
+										StringUtils.isNotBlank(calResult.getImproveScore())) {
+									double indScore = Double.parseDouble(calResult.getScore());
+									double improveScore = Double.parseDouble(calResult.getImproveScore());
+									double sum = indScore+improveScore;
+									values.add(String.valueOf(sum));
+								}else {
+									values.add(calResult.getScore());
+								}
 							}
+
 						}
 					}
 				}

src/main/resources/mybatis/mapping/TaskIndicatorValueMapper.xml

@@ -104,4 +104,12 @@
             )
         </if>
     </select>
+    <delete id="batchDelete" parameterType="com.keymobile.indicators.model.entity.dataenter.TaskIndValue" >
+
+        <foreach collection="newValues" item="val" separator=";">
+            delete from data_enter_task_ind_val
+            where ind_id = #{val.indId} and obj_id = #{val.objId} and value_time=#{val.valueTime}
+        </foreach>
+
+    </delete>
 </mapper>
\ No newline at end of file