钉钉相关接口

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

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

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

@@ -14,6 +14,7 @@ import com.dingtalk.api.response.OapiGettokenResponse;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.xhx.common.code.AppealResultEnum;
 import com.mortals.xhx.common.code.LeaveRulesEnum;
 import com.mortals.xhx.common.pdu.ApiRespPdu;
 import com.mortals.xhx.module.attendance.dingmsg.DingCallbackCrypto;
@@ -290,18 +291,18 @@ public class DingMessageController {
 //                                            leaveRecordEntity.setAuditResult(1);
 //                                        }
 //                                    }
-                                    leaveRecordEntity.setAuditResult(1);
+                                    leaveRecordEntity.setAuditResult(AppealResultEnum.通过.getValue());
                                 }
                                 else if(result.equals("")){  //撤销假期审批中result会为空  撤销审批通过后result为AGREE
                                     if(result.getTasks().size() > 1){
                                         log.info("status"+result.getTasks().get(1).getStatus());
                                         if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
-                                            leaveRecordEntity.setAuditResult(3);  //撤销审批中
+                                            leaveRecordEntity.setAuditResult(AppealResultEnum.撤销审批中.getValue());  //撤销审批中
                                         }
                                     }
                                 }
                                 else {
-                                    leaveRecordEntity.setAuditResult(2);  //请假审批中
+                                    leaveRecordEntity.setAuditResult(AppealResultEnum.审核中.getValue());  //请假审批中
                                 }