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

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

@@ -47,6 +47,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import static cn.hutool.core.date.DatePattern.*;
@@ -281,7 +282,7 @@ public class DingMessageController {
 
                                 if(result.getResult().compareToIgnoreCase("AGREE") == 0){
                                     if(result.getTasks().size() > 1){
-                                        if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
+                                        if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
                                             leaveRecordEntity.setAuditResult(4);  //撤销审批完成
                                         }else {
                                             leaveRecordEntity.setAuditResult(1);
@@ -290,7 +291,7 @@ public class DingMessageController {
                                 }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){
+                                        if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
                                             leaveRecordEntity.setAuditResult(3);  //撤销审批中
                                         }
                                     }
@@ -303,7 +304,7 @@ public class DingMessageController {
 
                                 log.info("钉钉返回的result:"+result.getResult()+"---auditresult:"+leaveRecordEntity.getAuditResult());
                                 leaveRecordEntity.setAuditDesc(result.getOperationRecords().get(0).getRemark());
-
+                                leaveRecordEntity.setReason(result.getOperationRecords().get(0).getRemark());
                                 //更新请假记录表
                                 AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
                                 if(ObjectUtils.isEmpty(recordEntity)){
@@ -337,14 +338,22 @@ public class DingMessageController {
                                 if(leaveRecordsResponseBodyResultRest.getCode() == Rest.SUCCESS){
                                     OapiAttendanceVacationQuotaListResponse.OapiLeaveQuotaUserListVo result1 = leaveRecordsResponseBodyResultRest.getData();
                                     double leaveBlance = 0;
-                                    //如果钉钉有假期余额就写入钉钉返回的余额   否则用数据库表数据减去当前请假的天数
-                                    if(result1.getLeaveQuotas() != null && result1.getLeaveQuotas().size() > 0){
-                                        if(leaveRecordEntity.getAuditResult() == 4) { //撤销休假  要把已经扣除的假期加回来
-                                            leaveBlance = (result1.getLeaveQuotas().get(0).getQuotaNumPerDay() + result1.getLeaveQuotas().get(0).getUsedNumPerDay())/100;
-                                        }else {
-                                            leaveBlance = (result1.getLeaveQuotas().get(0).getQuotaNumPerDay() - result1.getLeaveQuotas().get(0).getUsedNumPerDay())/100;
-                                        }
-                                    }
+//                                    //如果钉钉有假期余额就写入钉钉返回的余额   否则用数据库表数据减去当前请假的天数
+//                                    if(result1.getLeaveQuotas() != null && result1.getLeaveQuotas().size() > 0){
+//                                        if(leaveRecordEntity.getAuditResult() == 4) { //撤销休假  要把已经扣除的假期加回来
+//                                            if(!ObjectUtils.isEmpty(balanceEntity) && balanceEntity.getCompensatedLeaveDays() != null){
+//                                                leaveBlance = balanceEntity.getCompensatedLeaveDays().floatValue() + result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;
+//                                            }else {
+//                                                leaveBlance = result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;  //秒转换为天
+//                                            }
+//                                        }else {
+//                                            if(!ObjectUtils.isEmpty(balanceEntity) && balanceEntity.getCompensatedLeaveDays() != null){
+//                                                leaveBlance = balanceEntity.getCompensatedLeaveDays().floatValue() - result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;
+//                                            }else {
+//                                                leaveBlance = - result1.getLeaveQuotas().get(0).getUsedNumPerDay()/100;  //秒转换为天
+//                                            }
+//                                        }
+//                                    }
 
                                     switch (leave_name) {
                                         case "调休":

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java

@@ -141,9 +141,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
      */
     public com.aliyun.teaopenapi.models.Config setConfig() {
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
-        config.protocol = "http";
-        config.regionId = "central";
-        config.endpoint = oaUrl;
+//        config.protocol = "http";
+//        config.regionId = "central";
+//        config.endpoint = oaUrl;
         return config;
     }
 
@@ -153,9 +153,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             com.aliyun.dingtalkworkflow_1_0.Client client = new com.aliyun.dingtalkworkflow_1_0.Client(setConfig());
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
             getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
-            HashMap<String, String> map = new HashMap<>();
-            getProcessInstanceHeaders.setCommonHeaders(map);
-            getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113:8919");
+//            HashMap<String, String> map = new HashMap<>();
+//            getProcessInstanceHeaders.setCommonHeaders(map);
+//            getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113:8919");
 
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId(processInstanceId);