Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -1151,7 +1151,7 @@ public class TaskListServiceImpl implements TaskListService {
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
                     //工位类型总数减去废证数
-                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
+                    typeSum -= Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT").toString()+"")?"0":countyMap.get("FAILECOUNT").toString())));
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");