考勤月报详情 考勤日报显示问题 加班补卡审核问题修改

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkOrderManagementController.java

@@ -113,8 +113,10 @@ public class WorkOrderManagementController {
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
		workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
		workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
		//workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
		//workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
		workEvent.setWorkEmployeeRoleId("1001");
		workEvent.setWorkOrgRoleId("10087");
		workEvent.setEventSpecId("APPROVAL_REQUEST");
		
		return workOrderManagementService.addWorkOrder(workEvent,params);

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

@@ -173,6 +173,13 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                if (dailyAttendance.get("goOffWorkExceptionStatus")!=null&&"FIE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
                    attendanceStatusList.add("下午外勤");
                }
              /*  //判断是否是补卡
                if (dailyAttendance.get("goToWorkExceptionStatus")!=null&& "NOT".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
                    attendanceStatusList.add("正常");
                }
                if (dailyAttendance.get("goOffWorkExceptionStatus")!=null&&"NOT".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
                    attendanceStatusList.add("正常");
                }*/
                //判断是否是加班
                if (dailyAttendance.get("goToWorkExceptionStatus")!=null&& "OVE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
                    attendanceStatusList.add("上午加班");
@@ -191,7 +198,8 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                //如果上午正常，下午非正常 则显示下午的
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    //如果包含下午外勤，则除了放假之类的和旷工都不显示
                    if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
                   // if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
                    if(!attendanceStatusList.contains("下午外勤")){
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
                            dailyAttendance.put("isAbnormal",true);
@@ -453,7 +461,8 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                //如果上午正常，下午非正常 则显示下午的
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
                    //如果包含下午外勤，则除了放假之类的和旷工都不显示
                    if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
                    //if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
                    if(!attendanceStatusList.contains("下午外勤")){
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
                            dailyAttendance.put("isAbnormal",true);

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/LoginServiceImpl.java

@@ -69,7 +69,7 @@ public class LoginServiceImpl implements LoginService {
        try {
            HashMap<String, Object> paramsMap = new HashMap<>();
            paramsMap.put("root_module","0000");
            paramsMap.put("root_module","0001");
            paramsMap.put("userCode",user.getUserCode());
            Map<String, String> headerMap=new HashMap<>();