浏览代码

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

wangchao 4 年之前
父节点
当前提交
abf4590cff

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

113
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
113
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
114
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
114
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
115
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
115
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
116
		workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
117
		workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
116
		//workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
117
		//workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
118
		workEvent.setWorkEmployeeRoleId("1001");
119
		workEvent.setWorkOrgRoleId("10087");
118
		workEvent.setEventSpecId("APPROVAL_REQUEST");
120
		workEvent.setEventSpecId("APPROVAL_REQUEST");
119
		
121
		
120
		return workOrderManagementService.addWorkOrder(workEvent,params);
122
		return workOrderManagementService.addWorkOrder(workEvent,params);

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

173
                if (dailyAttendance.get("goOffWorkExceptionStatus")!=null&&"FIE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
173
                if (dailyAttendance.get("goOffWorkExceptionStatus")!=null&&"FIE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
174
                    attendanceStatusList.add("下午外勤");
174
                    attendanceStatusList.add("下午外勤");
175
                }
175
                }
176
              /*  //判断是否是补卡
177
                if (dailyAttendance.get("goToWorkExceptionStatus")!=null&& "NOT".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
178
                    attendanceStatusList.add("正常");
179
                }
180
                if (dailyAttendance.get("goOffWorkExceptionStatus")!=null&&"NOT".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
181
                    attendanceStatusList.add("正常");
182
                }*/
176
                //判断是否是加班
183
                //判断是否是加班
177
                if (dailyAttendance.get("goToWorkExceptionStatus")!=null&& "OVE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
184
                if (dailyAttendance.get("goToWorkExceptionStatus")!=null&& "OVE".equals(dailyAttendance.get("goToWorkExceptionStatus") )) {
178
                    attendanceStatusList.add("上午加班");
185
                    attendanceStatusList.add("上午加班");
191
                //如果上午正常,下午非正常 则显示下午的
198
                //如果上午正常,下午非正常 则显示下午的
192
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
199
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
193
                    //如果包含下午外勤,则除了放假之类的和旷工都不显示
200
                    //如果包含下午外勤,则除了放假之类的和旷工都不显示
194
                    if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
201
                   // if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
202
                    if(!attendanceStatusList.contains("下午外勤")){
195
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
203
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
196
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
204
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
197
                            dailyAttendance.put("isAbnormal",true);
205
                            dailyAttendance.put("isAbnormal",true);
453
                //如果上午正常,下午非正常 则显示下午的
461
                //如果上午正常,下午非正常 则显示下午的
454
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
462
                if("正常".equals(dailyAttendance.get("goToWorkStatus"))&&!"正常".equals(dailyAttendance.get("goOffWorkStatus"))){
455
                    //如果包含下午外勤,则除了放假之类的和旷工都不显示
463
                    //如果包含下午外勤,则除了放假之类的和旷工都不显示
456
                    if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
464
                    //if(!attendanceStatusList.isEmpty()&&!attendanceStatusList.contains("下午外勤")){
465
                    if(!attendanceStatusList.contains("下午外勤")){
457
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
466
                        if("迟到".equals(dailyAttendance.get("goOffWorkStatus"))){
458
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
467
                            attendanceStatusList.add("迟到"+dailyAttendance.get("goOffWorkTime") +"分");
459
                            dailyAttendance.put("isAbnormal",true);
468
                            dailyAttendance.put("isAbnormal",true);

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

69
69
70
        try {
70
        try {
71
            HashMap<String, Object> paramsMap = new HashMap<>();
71
            HashMap<String, Object> paramsMap = new HashMap<>();
72
            paramsMap.put("root_module","0000");
72
            paramsMap.put("root_module","0001");
73
            paramsMap.put("userCode",user.getUserCode());
73
            paramsMap.put("userCode",user.getUserCode());
74
74
75
            Map<String, String> headerMap=new HashMap<>();
75
            Map<String, String> headerMap=new HashMap<>();