111

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/controller/viewClockInController.java

@@ -241,6 +241,7 @@ public class viewClockInController extends JeecgController<ViewClockIn, IviewClo
 		 bdErrorInfo.setUserId(userId);
 		 bdErrorInfo.setViewDate(viewDate);
 		 bdErrorInfo.setHandler(user.getUsername());
+		 bdErrorInfo.setHandlerName(user.getRealname());
 		 bdErrorInfo.setHandlTime(new Date());
 		 bdErrorInfo.setErrorState("0");
 		 bdErrorInfoService.save(bdErrorInfo);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/entity/BdErrorInfo.java

@@ -52,6 +52,10 @@ public class BdErrorInfo {
 	@Excel(name = "问题处理人（忽略人）", width = 15)
     @ApiModelProperty(value = "问题处理人（忽略人）")
 	private String handler;
+	/**问题处理人（忽略人姓名）*/
+	@Excel(name = "问题处理人（忽略人姓名）", width = 15)
+    @ApiModelProperty(value = "问题处理人（忽略人姓名）")
+	private String handlerName;
 	/**问题处理时间（忽略时间）*/
 	@Excel(name = "问题处理时间（忽略时间）", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/xml/viewClockInMapper.xml

@@ -63,8 +63,8 @@
         or (b.rule_type = 2 and b.attendance_count &lt; 2 and b.shift_real_time_s is not null) <!-- 班次上下班，需要打卡（固定班时休息日），打卡次数不足，当天有排班-->
         or (b.rule_type = 2 and b.shift_real_time_s is not null and b.goto_time is null) <!-- 班次上下班，需要打卡，当天有排班，没有打卡记录-->
         or (b.duration is not null and b.work_overtime > 0) <!-- 有加班信息,打卡时间早于加班申请时间-->
-        and b.set_info > 0 and b.error_state is not null
-           )
+        and b.set_info > 0 ) and b.error_state is null
+
 
         group by b.username,b.depart_names
 
@@ -98,8 +98,8 @@
         or (b.rule_type = 2 and b.attendance_count &lt; 2 and b.shift_real_time_s is not null) <!-- 班次上下班，需要打卡（固定班时休息日），打卡次数不足，当天有排班-->
         or (b.rule_type = 2 and b.shift_real_time_s is not null and b.goto_time is null) <!-- 班次上下班，需要打卡，当天有排班，没有打卡记录-->
         or (b.duration is not null and b.work_overtime > 0) <!-- 有加班信息,打卡时间早于加班申请时间-->
-        and b.set_info > 0 and b.error_state is not null
-        )
+        and b.set_info > 0 ) and b.error_state is null
+
 
         group by b.username
         ) B