Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/LeaveTypeEnum.java

@@ -18,7 +18,19 @@ public enum LeaveTypeEnum {
     婚假(7, "婚假"),
     例假(8, "例假"),
     哺乳假(9, "哺乳假"),
-    丧假(10, "丧假");
+    丧假(10, "丧假"),
+    回单位(11, "回单位"),
+    因公请假(12, "因公请假"),
+    外出勘验(13, "外出勘验"),
+    值班补班(14, "值班补班"),
+    体检(15, "体检"),
+    隔离(16, "隔离"),
+    因公外出(17, "因公外出"),
+    公休(18, "公休"),
+    育儿假(19, "育儿假"),
+    调回单位(20, "调回单位"),
+    探亲假(21, "探亲假"),
+    ;
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceLeaveRecordVo.java

@@ -15,4 +15,22 @@ import java.util.List;
 public class AttendanceLeaveRecordVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
+
+    /** 开始 开始时间 */
+    private String startTimeStart;
+
+    /** 结束 开始时间 */
+    private String startTimeEnd;
+
+    /** 开始 结束时间 */
+    private String endTimeStart;
+
+    /** 结束 结束时间 */
+    private String endTimeEnd;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -265,6 +265,39 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                             case 丧假:
                                 temp.setFuneralLeave(leaveTime);
                                 break;
+                            case 回单位:
+                                temp.setBackToUnit(leaveTime);
+                                break;
+                            case 因公请假:
+                                temp.setOnDutyLeave(leaveTime);
+                                break;
+                            case 外出勘验:
+                                temp.setOutOfOffice(leaveTime);
+                                break;
+                            case 值班补班:
+                                temp.setShiftCompensation(leaveTime);
+                                break;
+                            case 体检:
+                                temp.setPhysicalExamination(leaveTime);
+                                break;
+                            case 隔离:
+                                temp.setQuarantine(leaveTime);
+                                break;
+                            case 因公外出:
+                                temp.setBusinessTrip(leaveTime);
+                                break;
+                            case 公休:
+                                temp.setPublicHoliday(leaveTime);
+                                break;
+                            case 育儿假:
+                                temp.setChildRearingLeave(leaveTime);
+                                break;
+                            case 调回单位:
+                                temp.setTransferBack(leaveTime);
+                                break;
+                            case 探亲假:
+                                temp.setHomeLeave(leaveTime);
+                                break;
                             default:
                                 temp.setPersonalLeave(leaveTime);
                                 break;