zm
2024-10-08 10d1c6ff2df880d8e182685ad17aa9475517f482
考勤看板
已修改2个文件
4 ■■■■ 文件已修改
src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java
@@ -107,7 +107,7 @@
        } catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(SystemCode.SYSTEM_GET_ADDRESS_LIST_FAIL.getValue(), SystemCode.SYSTEM_GET_ADDRESS_LIST_FAIL.getText());
            return this.error(SystemCode.WORK_ATTENDANCE_REPORT_FAIL.getValue(), SystemCode.WORK_ATTENDANCE_REPORT_FAIL.getText());
        }
    }
    
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -210,7 +210,7 @@
            if (!StringUtils.isEmpty(fs.getString("bk"))){
                bk= Arrays.asList(fs.getString("bk").split(","));
            }
            if (fs.getString("reidis").equals("全天未打卡")&&!StringUtils.isEmpty(fs.getString("bk"))){
            if (!StringUtils.isEmpty(fs.getString("reidis"))&&fs.getString("reidis").equals("全天未打卡")&&!StringUtils.isEmpty(fs.getString("bk"))){
                if (!bk.contains("1")){
                    fs.setValue("result_one", "上午上班未打卡");
                }