diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AppealResultEnum.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AppealResultEnum.java index dce8803b10909c516e2f25a1681a63010b0a15cf..6760378f86b50e80d05868d940c52b45deccb5b8 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AppealResultEnum.java +++ b/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; diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java index 13f0d6e9da7fa49b376ef9e7bab137c0ee389fcd..76161e6892431b295ea70efb00e47ae1e57c55fc 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java +++ b/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("")){ //鎾ら攢鍋囨湡瀹℃壒涓璻esult浼氫负绌� 鎾ら攢瀹℃壒閫氳繃鍚巖esult涓篈GREE 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()); //璇峰亣瀹℃壒涓� }