正常状态最后判断

mjava-zhiyejineng/src/main/java/com/malk/zyjn/service/impl/ZyjnServiceImpl.java

@@ -134,9 +134,7 @@ public class ZyjnServiceImpl implements ZyjnService {
                         .collect(Collectors.toList());*/
                 for (Map attendanceMap : attendanceList) {
                     String situation = attendanceMap.get("value").toString();
-                    if (situation.contains("正常")){
-                        ReflectUtil.invoke(attendance,"setSituation"+index,"工");
-                    }else if (situation.contains("休息")){
+                    if (situation.contains("休息")){
                         ReflectUtil.invoke(attendance,"setSituation"+index,"假");
                     }else if (situation.contains("旷工")){
                         ReflectUtil.invoke(attendance,"setSituation"+index,"工");
@@ -184,7 +182,9 @@ public class ZyjnServiceImpl implements ZyjnService {
                                 }
                             }
                         }
-                    } else {
+                    }else if (situation.contains("正常")){
+                        ReflectUtil.invoke(attendance,"setSituation"+index,"工");
+                    }else {
                         ReflectUtil.invoke(attendance,"setSituation"+index,"工");
                     }
                     index++;