zm
2024-08-12 a8c28ad2cabbdb4fef498a3a39190445bcc5ce32
考勤看板
已修改1个文件
6 ■■■■ 文件已修改
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -149,7 +149,7 @@
        StringBuilder sb=new StringBuilder();
        List<Object> param=new ArrayList<>();
        sb.append(" SELECT a.punch_date,e.bk, ");
        sb.append(" SELECT a.punch_date,e.bk,f.morning_work,f.morning_work_off,f.afternoon_work,f.afternoon_work_off, ");
        sb.append(" CONCAT(if(d.punch_range_one is not null and d.punch_range_one>f.distance,'超出打卡范围',0) ");
        sb.append(" ,',',if(d.punch_range_two is not null and d.punch_range_two>f.distance,'超出打卡范围',0) ");
@@ -193,10 +193,10 @@
                if (!bk.contains("1")){
                    fs.setValue("result_one", "上午上班未打卡");
                }
                if (!bk.contains("2")){
                if (!bk.contains("2")&&!StringUtils.isEmpty(fs.getString("morning_work_off"))){
                    fs.setValue("result_two", "上午下班未打卡");
                }
                if (!bk.contains("3")){
                if (!bk.contains("3")&&!StringUtils.isEmpty(fs.getString("afternoon_work"))){
                    fs.setValue("result_three", "下午上班未打卡");
                }
                if (!bk.contains("4")){