Начало Каталог Помощ
Вход
asiainfo
/
ebc
Наблюдаван 4
Харесван 0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Ревизии 410 Версии 0 Уики
Преглед на файлове

考勤详情显示格式修改bug

wangchao преди 4 години
родител
d78b7bdffa
ревизия
12572cf5a1
променени са 1 файла, в които са добавени 50 реда и са изтрити 43 реда
Разделен изглед Покажи статистика за разликите
  1. 50 43
      security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

+ 50 - 43
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java
Целия файл 

@ -68,7 +68,9 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
68 68 
            }*/
69 69
70 70 
                dailyAttendanceList.forEach((dailyAttendance)-> {
71 
                    //转换迟到和早退的分钟为小时
71 72
73 
                    //将每一条都加上开始和结束时间
72 74 
                    dailyAttendance.put("beginDay",paramap.get("beginDay"));
73 75 
                    dailyAttendance.put("endDay",paramap.get("endDay"));
74 76 
                    mainjobpositionList.forEach((mainjobposition) -> {
 
@ -173,35 +175,37 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
173 175 
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
174 176 
                    if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
175 177 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
176 
                    }
177 
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
178 
                        dailyAttendance.put("isAbnormal",true);
179 
                    }else if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
178 180 
                        attendanceStatusList.add("早退"+dailyAttendance.get("goOffWorkTime") +"分");
179 
                    }
180 
                    if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
181 
                        attendanceStatusList.add("旷工"+dailyAttendance.get("goToWorkTime") +"天");
182 
                    }
183 
                    if("倒休".equals(dailyAttendance.get("goOffWorkStatus"))||"事假".equals(dailyAttendance.get("goOffWorkStatus"))||"年假".equals(dailyAttendance.get("goOffWorkStatus"))||"放假".equals(dailyAttendance.get("goOffWorkStatus"))||"病假".equals(dailyAttendance.get("goOffWorkStatus"))){
181 
                        dailyAttendance.put("isAbnormal",true);
182 
                    }else if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
183 
                        attendanceStatusList.add("旷工0.5天");
184 
                        dailyAttendance.put("isAbnormal",true);
185 
                    }else if("倒休".equals(dailyAttendance.get("goOffWorkStatus"))||"事假".equals(dailyAttendance.get("goOffWorkStatus"))||"年假".equals(dailyAttendance.get("goOffWorkStatus"))||"放假".equals(dailyAttendance.get("goOffWorkStatus"))||"病假".equals(dailyAttendance.get("goOffWorkStatus"))){
184 186 
                        attendanceStatusList.add(dailyAttendance.get("goOffWorkStatus"));
185 187 
                        dailyAttendance.put("isAbnormal",false);
186 188 
                    }else{
189 
                        attendanceStatusList.add(dailyAttendance.get("goOffWorkStatus"));
187 190 
                        dailyAttendance.put("isAbnormal",true);
188 191 
                    }
189 192 
                }
190 193 
                //如果上午非正常，下午正常 则显示上午的
191 194 
                if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
192 195 
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
193 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("goToWorkTime") +"分");
194 
                    }
195 
                    if("早退".equals(dailyAttendance.get("goToWorkStatus"))){
196 
                        attendanceStatusList.add("早退"+dailyAttendance.get("goToWorkTime") +"分");
197 
                    }
198 
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
199 
                        attendanceStatusList.add("旷工"+dailyAttendance.get("goToWorkTime") +"天");
200 
                    }
201 
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
196 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("lateMinutes") +"分");
197 
                        dailyAttendance.put("isAbnormal",true);
198 
                    }else if("早退".equals(dailyAttendance.get("goToWorkStatus"))){
199 
                        attendanceStatusList.add("早退"+dailyAttendance.get("earlyExitMinutes") +"分");
200 
                        dailyAttendance.put("isAbnormal",true);
201 
                    }else if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
202 
                        attendanceStatusList.add("旷工0.5天");
203 
                        dailyAttendance.put("isAbnormal",true);
204 
                    }else if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
202 205 
                        attendanceStatusList.add(dailyAttendance.get("goToWorkStatus"));
203 206 
                        dailyAttendance.put("isAbnormal",false);
204 207 
                    }else{
208 
                        attendanceStatusList.add(dailyAttendance.get("goToWorkStatus"));
205 209 
                        dailyAttendance.put("isAbnormal",true);
206 210 
                    }
207 211 
                }
 
@ -224,19 +228,19 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
224 228 
                        dailyAttendance.put("isAbnormal",false);
225 229
226 230 
                        if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
227 
                            attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
231 
                            attendanceStatusArray[0]="迟到"+dailyAttendance.get("lateMinutes") +"分";
228 232 
                            dailyAttendance.put("isAbnormal",true);
229 233 
                        }
230 234 
                        if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
231 
                            attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
235 
                            attendanceStatusArray[1]="早退"+dailyAttendance.get("earlyExitMinutes") +"分";
232 236 
                            dailyAttendance.put("isAbnormal",true);
233 237 
                        }
234 238 
                        if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
235 
                            attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
239 
                            attendanceStatusArray[0]="旷工0.5天";
236 240 
                            dailyAttendance.put("isAbnormal",true);
237 241 
                        }
238 242 
                        if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
239 
                            attendanceStatusArray[0]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
243 
                            attendanceStatusArray[0]="旷工0.5天";
240 244 
                            dailyAttendance.put("isAbnormal",true);
241 245 
                        }
242 246 
                        if("未打卡".equals(dailyAttendance.get("goToWorkStatus"))||"未打卡".equals(dailyAttendance.get("goOffWorkStatus"))){
 
@ -245,9 +249,9 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
245 249 
                        attendanceStatusList.add(attendanceStatusArray[0]);
246 250 
                        attendanceStatusList.add(attendanceStatusArray[1]);
247 251 
                    }
248 
                    dailyAttendance.put("descr",attendanceStatusList);
252 
                   // dailyAttendance.put("descr",attendanceStatusList);
249 253 
                }
250
254 
                dailyAttendance.put("descr",attendanceStatusList);
251 255 
              /*  String[] attendanceStatusArray = new String[2];
252 256 
                dailyAttendance.put("date",dailyAttendance.get("workDay"));
253 257 
                dailyAttendance.put("isAbnormal",true);
 
@ -381,35 +385,37 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
381 385 
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
382 386 
                    if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
383 387 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
384 
                    }
385 
                    if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
388 
                        dailyAttendance.put("isAbnormal",true);
389 
                    }else if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
386 390 
                        attendanceStatusList.add("早退"+dailyAttendance.get("goOffWorkTime") +"分");
387 
                    }
388 
                    if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
389 
                        attendanceStatusList.add("旷工"+dailyAttendance.get("goToWorkTime") +"天");
390 
                    }
391 
                    if("倒休".equals(dailyAttendance.get("goOffWorkStatus"))||"事假".equals(dailyAttendance.get("goOffWorkStatus"))||"年假".equals(dailyAttendance.get("goOffWorkStatus"))||"放假".equals(dailyAttendance.get("goOffWorkStatus"))||"病假".equals(dailyAttendance.get("goOffWorkStatus"))){
391 
                        dailyAttendance.put("isAbnormal",true);
392 
                    }else if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
393 
                        attendanceStatusList.add("旷工0.5天");
394 
                        dailyAttendance.put("isAbnormal",true);
395 
                    }else if("倒休".equals(dailyAttendance.get("goOffWorkStatus"))||"事假".equals(dailyAttendance.get("goOffWorkStatus"))||"年假".equals(dailyAttendance.get("goOffWorkStatus"))||"放假".equals(dailyAttendance.get("goOffWorkStatus"))||"病假".equals(dailyAttendance.get("goOffWorkStatus"))){
392 396 
                        attendanceStatusList.add(dailyAttendance.get("goOffWorkStatus"));
393 397 
                        dailyAttendance.put("isAbnormal",false);
394 398 
                    }else{
399 
                        attendanceStatusList.add(dailyAttendance.get("goOffWorkStatus"));
395 400 
                        dailyAttendance.put("isAbnormal",true);
396 401 
                    }
397 402 
                }
398 403 
                //如果上午非正常，下午正常 则显示上午的
399 404 
                if(!"正常".equals(dailyAttendance.get("goToWorkStatus"))&&"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
400 405 
                    if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
401 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("goToWorkTime") +"分");
402 
                    }
403 
                    if("早退".equals(dailyAttendance.get("goToWorkStatus"))){
404 
                        attendanceStatusList.add("早退"+dailyAttendance.get("goToWorkTime") +"分");
405 
                    }
406 
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
407 
                        attendanceStatusList.add("旷工"+dailyAttendance.get("goToWorkTime") +"天");
408 
                    }
409 
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
406 
                        attendanceStatusList.add("迟到"+dailyAttendance.get("lateMinutes") +"分");
407 
                        dailyAttendance.put("isAbnormal",true);
408 
                    }else if("早退".equals(dailyAttendance.get("goToWorkStatus"))){
409 
                        attendanceStatusList.add("早退"+dailyAttendance.get("earlyExitMinutes") +"分");
410 
                        dailyAttendance.put("isAbnormal",true);
411 
                    }else if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
412 
                        attendanceStatusList.add("旷工0.5天");
413 
                        dailyAttendance.put("isAbnormal",true);
414 
                    }else if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
410 415 
                        attendanceStatusList.add(dailyAttendance.get("goToWorkStatus"));
411 416 
                        dailyAttendance.put("isAbnormal",false);
412 417 
                    }else{
418 
                        attendanceStatusList.add(dailyAttendance.get("goToWorkStatus"));
413 419 
                        dailyAttendance.put("isAbnormal",true);
414 420 
                    }
415 421 
                }
 
@ -432,19 +438,19 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
432 438 
                        dailyAttendance.put("isAbnormal",false);
433 439
434 440 
                        if("迟到".equals(dailyAttendance.get("goToWorkStatus"))){
435 
                            attendanceStatusArray[0]="迟到"+dailyAttendance.get("goToWorkTime") +"分";
441 
                            attendanceStatusArray[0]="迟到"+dailyAttendance.get("lateMinutes") +"分";
436 442 
                            dailyAttendance.put("isAbnormal",true);
437 443 
                        }
438 444 
                        if("早退".equals(dailyAttendance.get("goOffWorkStatus"))){
439 
                            attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
445 
                            attendanceStatusArray[1]="早退"+dailyAttendance.get("earlyExitMinutes") +"分";
440 446 
                            dailyAttendance.put("isAbnormal",true);
441 447 
                        }
442 448 
                        if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
443 
                            attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
449 
                            attendanceStatusArray[0]="旷工0.5天";
444 450 
                            dailyAttendance.put("isAbnormal",true);
445 451 
                        }
446 452 
                        if("旷工".equals(dailyAttendance.get("goOffWorkStatus"))){
447 
                            attendanceStatusArray[0]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
453 
                            attendanceStatusArray[0]="旷工0.5天";
448 454 
                            dailyAttendance.put("isAbnormal",true);
449 455 
                        }
450 456 
                        if("未打卡".equals(dailyAttendance.get("goToWorkStatus"))||"未打卡".equals(dailyAttendance.get("goOffWorkStatus"))){
 
@ -453,8 +459,9 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
453 459 
                        attendanceStatusList.add(attendanceStatusArray[0]);
454 460 
                        attendanceStatusList.add(attendanceStatusArray[1]);
455 461 
                    }
456 
                    dailyAttendance.put("descr",attendanceStatusList);
462 
                    // dailyAttendance.put("descr",attendanceStatusList);
457 463 
                }
464 
                dailyAttendance.put("descr",attendanceStatusList);
458 465
459 466
460 467 
               /* String[] attendanceStatusArray = new String[2];