diff --git a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
index 3999e75..5c72413 100644
--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
@@ -107,5 +107,8 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
@TableField(exist = false)
private Integer calendar_status_type;//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
+
+ @TableField(exist = false)
+ private String calendar_status_name;
}
\ No newline at end of file
diff --git a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
index baff420..e9118ae 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -3029,46 +3029,54 @@ public class ClockInController {
}else if(asssum1.getApprovalType() == 2) {
//请假
KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum1.getLeaveTypeId()));
- if(rul.getRulesType() == 1) {
- dkjl.setCalendar_status_type(1);
+ if(rul.getRulesType() == null) {
+ if(rul.getRulesType() == 1) {
+ dkjl.setCalendar_status_type(1);
+
+ ash.setCalendar_status_type(1);
+ }else if(rul.getRulesType() == 2) {
+ dkjl.setCalendar_status_type(2);
+
+ ash.setCalendar_status_type(2);
+ }else if(rul.getRulesType() == 3) {
+ dkjl.setCalendar_status_type(3);
+
+ ash.setCalendar_status_type(3);
+ }else if(rul.getRulesType() == 4) {
+ dkjl.setCalendar_status_type(4);
+
+ ash.setCalendar_status_type(4);
+ }else if(rul.getRulesType() == 5) {
+ dkjl.setCalendar_status_type(5);
+
+ ash.setCalendar_status_type(5);
+ }else if(rul.getRulesType() == 6) {
+ dkjl.setCalendar_status_type(6);
+
+ ash.setCalendar_status_type(6);
+ }else if(rul.getRulesType() == 7) {
+ dkjl.setCalendar_status_type(7);
+
+ ash.setCalendar_status_type(7);
+ }else if(rul.getRulesType() == 8) {
+ dkjl.setCalendar_status_type(8);
+
+ ash.setCalendar_status_type(8);
+ }else if(rul.getRulesType() == 9) {
+ dkjl.setCalendar_status_type(9);
+
+ ash.setCalendar_status_type(9);
+ }else if(rul.getRulesType() == 10) {
+ dkjl.setCalendar_status_type(10);
+
+ ash.setCalendar_status_type(10);
+ }
+ }else {
+ dkjl.setCalendar_status_type(-1);
+ dkjl.setCalendar_status_name(rul.getName());
- ash.setCalendar_status_type(1);
- }else if(rul.getRulesType() == 2) {
- dkjl.setCalendar_status_type(2);
-
- ash.setCalendar_status_type(2);
- }else if(rul.getRulesType() == 3) {
- dkjl.setCalendar_status_type(3);
-
- ash.setCalendar_status_type(3);
- }else if(rul.getRulesType() == 4) {
- dkjl.setCalendar_status_type(4);
-
- ash.setCalendar_status_type(4);
- }else if(rul.getRulesType() == 5) {
- dkjl.setCalendar_status_type(5);
-
- ash.setCalendar_status_type(5);
- }else if(rul.getRulesType() == 6) {
- dkjl.setCalendar_status_type(6);
-
- ash.setCalendar_status_type(6);
- }else if(rul.getRulesType() == 7) {
- dkjl.setCalendar_status_type(7);
-
- ash.setCalendar_status_type(7);
- }else if(rul.getRulesType() == 8) {
- dkjl.setCalendar_status_type(8);
-
- ash.setCalendar_status_type(8);
- }else if(rul.getRulesType() == 9) {
- dkjl.setCalendar_status_type(9);
-
- ash.setCalendar_status_type(9);
- }else if(rul.getRulesType() == 10) {
- dkjl.setCalendar_status_type(10);
-
- ash.setCalendar_status_type(10);
+ ash.setCalendar_status_type(-1);
+ dkjl.setCalendar_status_name(rul.getName());
}
}else if(asssum1.getApprovalType() == 3) {
dkjl.setCalendar_status_type(12);
@@ -3396,6 +3404,9 @@ public class ClockInController {
}else if(rul.getRulesType() == 10) {
taap.setCalendar_status_type(10);
}
+ }else {
+ taap.setCalendar_status_type(-1);
+ taap.setCalendar_status_name(rul.getName());
}
}else if(spnsw.getApprovalType() == 3) {
taap.setCalendar_status_type(12);
diff --git a/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java b/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
index f7e8527..45f16c4 100644
--- a/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
@@ -28,6 +28,8 @@ public class AttSchedule implements Serializable{
private Integer calendar_status_type;//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
+ private Integer calendar_status_name;
+
private int isleave;//是否请假
private int isupdate;//是否跟新打卡
private int isdk;//0:当前打卡 1：已过打卡
diff --git a/src/main/java/cn/timer/api/dto/kqmk/TransactionApprovalDto.java b/src/main/java/cn/timer/api/dto/kqmk/TransactionApprovalDto.java
index dfda5fa..19c0bee 100644
--- a/src/main/java/cn/timer/api/dto/kqmk/TransactionApprovalDto.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/TransactionApprovalDto.java
@@ -20,4 +20,6 @@ public class TransactionApprovalDto {
private Integer approval_form;//审批单
+ private String calendar_status_name;
+
}