|
@@ -26,6 +26,7 @@ import com.java110.po.attendance.AttendanceLogPo;
|
|
|
import com.java110.utils.exception.CmdException;
|
|
import com.java110.utils.exception.CmdException;
|
|
|
import com.java110.utils.util.Assert;
|
|
import com.java110.utils.util.Assert;
|
|
|
import com.java110.utils.util.DateUtil;
|
|
import com.java110.utils.util.DateUtil;
|
|
|
|
|
+import com.java110.utils.util.ListUtil;
|
|
|
import com.java110.utils.util.StringUtil;
|
|
import com.java110.utils.util.StringUtil;
|
|
|
import com.java110.vo.ResultVo;
|
|
import com.java110.vo.ResultVo;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -123,21 +124,26 @@ public class CheckInCmd extends Cmd {
|
|
|
attendanceClassesStaffDto.setStoreId(storeUserDtos.get(0).getStoreId());
|
|
attendanceClassesStaffDto.setStoreId(storeUserDtos.get(0).getStoreId());
|
|
|
List<AttendanceClassesStaffDto> attendanceClassesStaffs = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffs(attendanceClassesStaffDto);
|
|
List<AttendanceClassesStaffDto> attendanceClassesStaffs = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffs(attendanceClassesStaffDto);
|
|
|
|
|
|
|
|
- if (attendanceClassesStaffs == null || attendanceClassesStaffs.size() < 1) {
|
|
|
|
|
|
|
+ if (ListUtil.isNull(attendanceClassesStaffs)) {
|
|
|
throw new CmdException("员工没有考勤任务");
|
|
throw new CmdException("员工没有考勤任务");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ boolean hasCheckInAttendance = false;
|
|
|
for (AttendanceClassesStaffDto tmpAttendanceClassesStaffDto : attendanceClassesStaffs) {
|
|
for (AttendanceClassesStaffDto tmpAttendanceClassesStaffDto : attendanceClassesStaffs) {
|
|
|
// 考勤班次是否存在
|
|
// 考勤班次是否存在
|
|
|
AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
|
|
AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
|
|
|
attendanceClassesDto.setStoreId(storeUserDtos.get(0).getStoreId());
|
|
attendanceClassesDto.setStoreId(storeUserDtos.get(0).getStoreId());
|
|
|
attendanceClassesDto.setClassesId(tmpAttendanceClassesStaffDto.getClassesId());
|
|
attendanceClassesDto.setClassesId(tmpAttendanceClassesStaffDto.getClassesId());
|
|
|
List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesV1InnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
|
|
List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesV1InnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
|
|
|
- if (attendanceClassesDtos == null || attendanceClassesDtos.size() < 1) {
|
|
|
|
|
- throw new CmdException("班次不存在");
|
|
|
|
|
|
|
+ if (ListUtil.isNull(attendanceClassesDtos)) {
|
|
|
|
|
+ continue;
|
|
|
}
|
|
}
|
|
|
|
|
+ hasCheckInAttendance = true;
|
|
|
doCheckInAttendanceLog(context, reqJson, storeUserDtos, userDtos, attendanceClassesDtos.get(0));
|
|
doCheckInAttendanceLog(context, reqJson, storeUserDtos, userDtos, attendanceClassesDtos.get(0));
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!hasCheckInAttendance) {
|
|
|
|
|
+ throw new CmdException("班次不存在");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void doCheckInAttendanceLog(ICmdDataFlowContext context, JSONObject reqJson, List<StoreUserDto> storeUserDtos, List<UserDto> userDtos, AttendanceClassesDto attendanceClassesDto) {
|
|
private void doCheckInAttendanceLog(ICmdDataFlowContext context, JSONObject reqJson, List<StoreUserDto> storeUserDtos, List<UserDto> userDtos, AttendanceClassesDto attendanceClassesDto) {
|