Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/App.vue

@@ -32,6 +32,7 @@ export default {
 
 <style lang="less" scoped>
 #app { 
+  height:100vh;
   .loading {
     display: flex;
     align-items: center;

attendance-performance-manager-ui/admin/src/views/job/drawershow.vue

@@ -19,7 +19,7 @@
           label="分组"
           prop="groupId"
           v-model="form.groupId"
-          :enumData="dict.group"
+          :enumData="dict.groupId"
           type="select"
           placeholder="请选择分组"
         />
@@ -154,7 +154,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        groupId: null,
+        groupId: "",
         groupName: "",
         jobCode: "",
         jobName: "",

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

@@ -209,18 +209,20 @@ public class DingMessageController {
 
                         }
 
-                        if(result.getStatus().equals("NEW") || result.getStatus().equals("RUNNING")){
+                        if(result.getStatus().compareToIgnoreCase("NEW") == 0 || result.getStatus().compareToIgnoreCase("RUNNING") == 0){
                             leaveRecordEntity.setProcessStatus(1);
-                        }else if(result.getStatus().equals("COMPLETED") || result.getStatus().equals("CANCELED") || result.getStatus().equals("TERMINATED")){
+                        }else if(result.getStatus().compareToIgnoreCase("COMPLETED") == 0 || result.getStatus().compareToIgnoreCase("CANCELED") == 0
+                                || result.getStatus().compareToIgnoreCase("TERMINATED") == 0){
                             leaveRecordEntity.setProcessStatus(2);
                         }
 
-                        if(result.getResult().equals("AGREE")){
+                        if(result.getResult().compareToIgnoreCase("AGREE") == 0){
                             leaveRecordEntity.setAuditResult(1);
                         }else {
                             leaveRecordEntity.setAuditResult(2);
                         }
 
+                        log.info("auditresult:"+leaveRecordEntity.getAuditResult());
                         leaveRecordEntity.setAuditDesc(result.getOperationRecords().get(0).getRemark());
 
                         AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));

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

@@ -120,10 +120,8 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
      */
     public com.aliyun.dingtalkworkflow_1_0.Client createClient() throws Exception {
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
-        //config.protocol = "https";
         config.protocol = "http";
         config.regionId = "central";
-//        config.endpoint = domain.replace("http://", "");
         config.endpoint = oaUrl;
         return new com.aliyun.dingtalkworkflow_1_0.Client(config);
     }
@@ -137,8 +135,6 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             HashMap<String, String> map = new HashMap<>();
             getProcessInstanceHeaders.setCommonHeaders(map);
             getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113:8919");
-//            getProcessInstanceHeaders.getCommonHeaders().put("port", "8919");
-//            getProcessInstanceHeaders.getCommonHeaders().put("protocol", "http");
 
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId(processInstanceId);