fix 修改考勤bug

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -111,7 +111,7 @@ public class TableContext {
             String[] maskArray = requireNonNull(column.getMask(), "mask is empty, columnName = " + column.getColumnName()).split("");
             assert maskArray.length == 6;
             // 新增可见 修改可见
-            String insertVisible = maskArray[0], updateVisible = maskArray[2];
+            //String insertVisible = maskArray[0], updateVisible = maskArray[2];
             // 新增可修改 修改可修改
             String insertCanEdit = maskArray[1], updateCanEdit = maskArray[3];
             for (Map.Entry<String, Object> entry : fixedData.entrySet()) {
@@ -119,7 +119,7 @@ public class TableContext {
                     // 新增
                     if (ActionType.INSERT.equals(context.getActionType())) {
                         // 新增可可见, 并且新增修改，把新增的字段单独拿出来
-                        if (INSERT_CAN_EDIT.equals(insertCanEdit) && INSERT_VISIBLE.equals(insertVisible)) {
+                        if (INSERT_CAN_EDIT.equals(insertCanEdit)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果新增不可见，新增也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改
@@ -129,7 +129,7 @@ public class TableContext {
                         }
                     } else {
                         // 编辑可见, 并且编辑可修改
-                        if (UPDATE_CAN_EDIT.equals(updateCanEdit) && UPDATE_VISIBLE.equals(updateVisible)) {
+                        if (UPDATE_CAN_EDIT.equals(updateCanEdit)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果编辑不可见，编辑也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改

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

@@ -171,13 +171,21 @@ public class AttendanceServiceImpl implements AttendanceService {
             Map<String, Object> map = new HashMap<>(5);
             Object attendanceTableWork = jsonObject.get("attendance_table_work");
             Object attendanceTableOffWork = jsonObject.get("attendance_table_offwork");
+            Object attendanceTableWorkPm = jsonObject.get("attendance_table_work_pm");
+            Object attendanceTableOffWorkPm = jsonObject.get("attendance_table_offwork_pm");
             map.put("attendanceTableWork", "未打卡");
             map.put("attendanceTableOffWork", "未打卡");
             if (isNotEmpty(attendanceTableWork)) {
-                map.put("attendanceTableWork", attendanceTableWork + "已打卡");
+                map.put("attendanceTableWork", attendanceTableWork + " 已打卡");
             }
             if (isNotEmpty(attendanceTableOffWork)) {
-                map.put("attendanceTableWork", attendanceTableOffWork + "已打卡");
+                map.put("attendanceTableWork", attendanceTableOffWork + " 已打卡");
+            }
+            if (isNotEmpty(attendanceTableWorkPm)) {
+                map.put("attendanceTableWorkPm", attendanceTableWorkPm + " 已打卡");
+            }
+            if (isNotEmpty(attendanceTableOffWorkPm)) {
+                map.put("attendanceTableOffWorkPm", attendanceTableOffWorkPm + " 已打卡");
             }
 
             map.put("dateTime", jsonObject.get("attendance_table_week") + " " + jsonObject.get("attendance_table_todaytime"));