Merge remote-tracking branch 'origin/qianshan_data_bureau' into qianshan_data_bureau

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -332,15 +332,18 @@ public class AttendanceServiceImpl implements AttendanceService {
         List<JSONObject> jsonObjects = standardlyMapper.findDate(date, userId);
         //获取某月的所有日期
         List<String> monthEveryDays = getMonthEveryDays(date);
+        String workDaKa = " 上班打卡";
+        String offDaKa = " 下班打卡";
+        String onDaKa = " 未打卡";
         //给返回值中添加所有日期数据
         if (monthEveryDays != null && monthEveryDays.size() > 0) {
             for (String monthEveryDay : monthEveryDays) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("date", monthEveryDay);
-                jsonObject.put("attendanceTableWork", "未打卡");
-                jsonObject.put("attendanceTableOffWork", "未打卡");
-                jsonObject.put("attendanceTableWorkPm", "未打卡");
-                jsonObject.put("attendanceTableOffWorkPm", "未打卡");
+                jsonObject.put("attendanceTableWork", onDaKa);
+                jsonObject.put("attendanceTableOffWork", onDaKa);
+                jsonObject.put("attendanceTableWorkPm", onDaKa);
+                jsonObject.put("attendanceTableOffWorkPm", onDaKa);
                 jsonObjectList.add(jsonObject);
             }
             if (jsonObjects.size() > 0) {
@@ -351,36 +354,28 @@ public class AttendanceServiceImpl implements AttendanceService {
                         if (ObjectUtils.isNotEmpty(attendanceTableWork)) {
                             String[] s = String.valueOf(attendanceTableWork).split(" ");
                             if (s[0].equals(dateDay)) {
-                                jsonObjectDay.put("attendanceTableWork", s[1] + " 上班打卡 已打卡");
-                            } else {
-                                break;
+                                jsonObjectDay.put("attendanceTableWork", s[1] + workDaKa);
                             }
                         }
                         Object attendanceTableOffWork = jsonObject.get("attendanceTableOffWork");
                         if (ObjectUtils.isNotEmpty(attendanceTableOffWork)) {
                             String[] s = String.valueOf(attendanceTableOffWork).split(" ");
                             if (s[0].equals(dateDay)) {
-                                jsonObjectDay.put("attendanceTableOffWork", s[1] + " 下班打卡 已打卡");
-                            } else {
-                                break;
+                                jsonObjectDay.put("attendanceTableOffWork", s[1] + offDaKa);
                             }
                         }
                         Object attendanceTableWorkPm = jsonObject.get("attendanceTableWorkPm");
                         if (ObjectUtils.isNotEmpty(attendanceTableWorkPm)) {
                             String[] s = String.valueOf(attendanceTableWorkPm).split(" ");
                             if (s[0].equals(dateDay)) {
-                                jsonObjectDay.put("attendanceTableWorkPm", s[1] + " 上班打卡 已打卡");
-                            } else {
-                                break;
+                                jsonObjectDay.put("attendanceTableWorkPm", s[1] + workDaKa);
                             }
                         }
                         Object attendanceTableOffWorkPm = jsonObject.get("attendanceTableOffWorkPm");
                         if (ObjectUtils.isNotEmpty(attendanceTableOffWorkPm)) {
                             String[] s = String.valueOf(attendanceTableOffWorkPm).split(" ");
                             if (s[0].equals(dateDay)) {
-                                jsonObjectDay.put("attendanceTableOffWorkPm", s[1] + " 下班打卡 已打卡");
-                            } else {
-                                break;
+                                jsonObjectDay.put("attendanceTableOffWorkPm", s[1] + offDaKa);
                             }
                         }
                     }