From c1f8a8d8cb2c4d7a49e37432be8160c219c049bc Mon Sep 17 00:00:00 2001 From: luojing Date: Wed, 6 Jan 2021 11:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E=E4=BC=91=E5=81=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=88=E5=AF=B9=E5=BA=94=E5=91=98=E5=B7=A5=E4=BC=91?= =?UTF-8?q?=E5=81=87=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E4=BC=91=E5=81=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attachment/ActionExportDetailWithFilter.java | 6 +++++- .../service/AttendanceDetailAnalyseService.java | 3 +++ .../com/x/attendance/entity/AttendanceDetail.java | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportDetailWithFilter.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportDetailWithFilter.java index e3195edfbd..e9164ab5a4 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportDetailWithFilter.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportDetailWithFilter.java @@ -235,7 +235,11 @@ public class ActionExportDetailWithFilter extends BaseAction { row.createCell(8).setCellValue(attendanceDetail.getOffDutyTime()); if(attendanceDetail.getIsGetSelfHolidays()){ - row.createCell(9).setCellValue("请假或外出报备"); + if(StringUtils.isNotEmpty(attendanceDetail.getLeaveType())){ + row.createCell(9).setCellValue(attendanceDetail.getLeaveType()); + }else{ + row.createCell(9).setCellValue("请假或外出报备"); + } }else if (attendanceDetail.getIsAbsent()) { row.createCell(9).setCellValue("缺勤"); } else if (attendanceDetail.getIsLackOfTime()) { diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java index 07712355dd..88a97a12e2 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java @@ -476,6 +476,7 @@ public class AttendanceDetailAnalyseService { logger.debug( debugger, detail.getEmpName()+"全天请假了"); //全天休假 detail.setIsGetSelfHolidays(true); + detail.setLeaveType(selfHoliday.getLeaveType()); detail.setSelfHolidayDayTime("全天"); detail.setGetSelfHolidayDays(1.0); }else if( selfHoliday.getEndTime().getTime() <= dayMiddle.getTime() && selfHoliday.getEndTime().getTime() > dayWorkStart.getTime() @@ -483,6 +484,7 @@ public class AttendanceDetailAnalyseService { //上午休假 logger.debug( debugger, detail.getEmpName()+"上午休假了"); detail.setIsGetSelfHolidays(true); + detail.setLeaveType(selfHoliday.getLeaveType()); detail.setSelfHolidayDayTime("上午"); detail.setGetSelfHolidayDays(0.5); }else if( selfHoliday.getStartTime().getTime() >= dayMiddle.getTime() && selfHoliday.getStartTime().getTime() <= dayWorkEnd.getTime() @@ -490,6 +492,7 @@ public class AttendanceDetailAnalyseService { //上午休假 logger.debug( debugger, detail.getEmpName()+"下午休假了"); detail.setIsGetSelfHolidays( true ); + detail.setLeaveType(selfHoliday.getLeaveType()); detail.setSelfHolidayDayTime("下午"); detail.setGetSelfHolidayDays(0.5); } diff --git a/o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java b/o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java index aa1c1bc899..a06fac891e 100644 --- a/o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java +++ b/o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail.java @@ -294,6 +294,12 @@ public class AttendanceDetail extends SliceJpaObject { @CheckPersist(allowEmpty = false) private Boolean isGetSelfHolidays = false; + public static final String leaveType_FIELDNAME = "leaveType"; + @FieldDescribe("休假类型") + @Column(length = JpaObject.length_255B, name = ColumnNamePrefix + leaveType_FIELDNAME) + @CheckPersist(allowEmpty = true) + private String leaveType; + public static final String isAbsent_FIELDNAME = "isAbsent"; @FieldDescribe("是否缺勤") @Column(name = ColumnNamePrefix + isAbsent_FIELDNAME) @@ -886,6 +892,14 @@ public class AttendanceDetail extends SliceJpaObject { this.isGetSelfHolidays = isGetSelfHolidays; } + public String getLeaveType() { + return leaveType; + } + + public void setLeaveType(String leaveType) { + this.leaveType = leaveType; + } + /** * 获取休假时段：无，上午，下午，全天（String） * -- GitLab