Merge remote-tracking branch 'origin/master'

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

@@ -12,7 +12,8 @@ public enum AppealResultEnum {
     审核中(0, "审核中"),
     通过(1, "通过"),
     不通过(2, "不通过"),
-    撤销审批中(3, "撤销审批中");
+    撤销审批中(3, "撤销审批中"),
+    撤销审批通过(4, "撤销审批通过");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -291,14 +291,14 @@ public class DingMessageController {
 
 
                                     if(result.getResult().compareToIgnoreCase("AGREE") == 0){
-//                                    if(result.getTasks().size() > 1){
-//                                        if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
-//                                            leaveRecordEntity.setAuditResult(4);  //撤销审批完成
-//                                        }else {
-//                                            leaveRecordEntity.setAuditResult(1);
-//                                        }
-//                                    }
                                         leaveRecordEntity.setAuditResult(AppealResultEnum.通过.getValue());
+                                        if(result.getTasks().size() > 1){
+                                            if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
+                                                leaveRecordEntity.setAuditResult(4);  //撤销审批完成
+                                                leaveRecordEntity.setAuditResult(AppealResultEnum.撤销审批通过.getValue());
+                                            }
+                                        }
+
                                     }
                                     else if(result.equals("")){  //撤销假期审批中result会为空  撤销审批通过后result为AGREE
                                         if(result.getTasks().size() > 1){

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

@@ -102,7 +102,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 审核结果(1.申请通过,2.申请不通过)
      */
-    @Excel(name = "审核结果", readConverterExp = "1=申请通过,2=申请不通过")
+    @Excel(name = "审核结果", readConverterExp = "1=申请通过,2=申请不通过,3=撤销审批中,4=撤销审批通过")
     private Integer auditResult;
     /**
      * 审核说明