Browse Source

月报详情上午下午状态都是显示

wangchao 4 years ago
parent
commit
c6f427cd7b

+ 8 - 4
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

@ -148,11 +148,13 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
148 148
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
149 149
                    }
150 150
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
151
                        attendanceStatusArray[1]=null;
151
                        //attendanceStatusArray[1]=null;
152
                        attendanceStatusArray[1]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
152 153
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
153 154
                    }
154 155
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
155
                        attendanceStatusArray[1]=null;
156
                        //attendanceStatusArray[1]=null;
157
                        attendanceStatusArray[1]=(String) dailyAttendance.get("goOffWorkStatus");
156 158
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
157 159
                    }
158 160
                    dailyAttendance.put("descr",attendanceStatusArray);
@ -242,11 +244,13 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
242 244
                        attendanceStatusArray[1]="早退"+dailyAttendance.get("goOffWorkTime") +"分";
243 245
                    }
244 246
                    if("旷工".equals(dailyAttendance.get("goToWorkStatus"))){
245
                        attendanceStatusArray[1]=null;
247
                        //attendanceStatusArray[1]=null;
248
                        attendanceStatusArray[1]="旷工"+dailyAttendance.get("goOffWorkTime") +"天";
246 249
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
247 250
                    }
248 251
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
249
                        attendanceStatusArray[1]=null;
252
                        //attendanceStatusArray[1]=null;
253
                        attendanceStatusArray[1]=(String) dailyAttendance.get("goOffWorkStatus");
250 254
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
251 255
                    }
252 256