Selaa lähdekoodia

修改日报bug以及详情病假转码添加

wangchao 4 vuotta sitten
vanhempi
commit
54c52bc351

+ 14 - 11
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

@ -151,11 +151,10 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
151 151
                        attendanceStatusArray[1]=null;
152 152
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
153 153
                    }
154
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
154
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
155 155
                        attendanceStatusArray[1]=null;
156 156
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
157 157
                    }
158
159 158
                    dailyAttendance.put("descr",attendanceStatusArray);
160 159
                }else{
161 160
                    //上下班一个正常一个不正常
@ -170,10 +169,12 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
170 169
            List<Map<String, Object>> dataList = attendanceReportResponse.getData();
171 170
            dataList.forEach((data)->{
172 171
                String[] attendanceStatus = (String[]) data.get("descr");
173
                String[] attendanceStatusArray = new String[1];
174
                if(null==attendanceStatus[1]){
175
                    attendanceStatusArray[0]=attendanceStatus[0];
176
                    data.put("descr",attendanceStatusArray);
172
                if(null!=attendanceStatus&&attendanceStatus.length>0){
173
                    String[] attendanceStatusArray = new String[1];
174
                    if(null==attendanceStatus[1]){
175
                        attendanceStatusArray[0]=attendanceStatus[0];
176
                        data.put("descr",attendanceStatusArray);
177
                    }
177 178
                }
178 179
            });
179 180
@ -244,7 +245,7 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
244 245
                        attendanceStatusArray[1]=null;
245 246
                        attendanceStatusArray[0]="旷工"+dailyAttendance.get("goToWorkTime") +"天";
246 247
                    }
247
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))){
248
                    if("倒休".equals(dailyAttendance.get("goToWorkStatus"))||"事假".equals(dailyAttendance.get("goToWorkStatus"))||"年假".equals(dailyAttendance.get("goToWorkStatus"))||"放假".equals(dailyAttendance.get("goToWorkStatus"))||"病假".equals(dailyAttendance.get("goToWorkStatus"))){
248 249
                        attendanceStatusArray[1]=null;
249 250
                        attendanceStatusArray[0]=(String) dailyAttendance.get("goToWorkStatus");
250 251
                    }
@ -266,10 +267,12 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
266 267
        List<Map<String, Object>> dataList = attendanceReport.getData().getData();
267 268
        dataList.forEach((data)->{
268 269
            String[] attendanceStatus = (String[]) data.get("attendanceStatus");
269
            String[] attendanceStatusArray = new String[1];
270
            if(null==attendanceStatus[1]){
271
                attendanceStatusArray[0]=attendanceStatus[0];
272
                data.put("attendanceStatus",attendanceStatusArray);
270
            if(null!=attendanceStatus&&attendanceStatus.length>0){
271
                String[] attendanceStatusArray = new String[1];
272
                if(null==attendanceStatus[1]){
273
                    attendanceStatusArray[0]=attendanceStatus[0];
274
                    data.put("attendanceStatus",attendanceStatusArray);
275
                }
273 276
            }
274 277
        });
275 278
        return attendanceReport;