Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/.env.development

@@ -3,3 +3,4 @@ NODE_ENV = "development"
 # VUE_APP_API_BASE_URL= http://112.19.80.237:11039
 VUE_APP_API_BASE_URL= http://192.168.0.98:11039
 VUE_APP_API_ZWFW_URL= http://112.19.80.237:11031
+VUE_APP_PORTAL_URL = /portal_home
\ No newline at end of file

attendance-performance-manager-ui/admin/src/components/Header.vue

@@ -47,6 +47,14 @@
           首页</i
         >
       </div>
+      <a class="controllBar" :href="portal" style="color: #fff;">
+        <i
+          class="el-icon-arrow-left"
+          style="font-size: 15px; margin-right: 10px"
+        >
+          返回门户</i
+        >
+      </a>
 
       <div class="layout-profile">
         <el-dropdown @command="handleCommand">
@@ -101,6 +109,9 @@ export default {
     returnHome() {
       this.$router.replace({ path: "/" });
     },
+    returnOrigin() {
+      this.$router.replace({ path: "/" });
+    },
     handleCommand(key) {
       if (key === "update") {
         this.$router.push("/login/updatePwd");
@@ -178,6 +189,7 @@ export default {
       sysLogo: localStorage.getItem("sysLogo")
         ? localStorage.getItem("sysLogo")
         : "",
+      portal: process.env.VUE_APP_PORTAL_URL + "/#/home/siteArrange",
     };
   },
   created() {},

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -160,21 +160,7 @@ export default {
           {
             label: "状态",
             prop: "auditResult",
-            formatter: (row) => {
-              return row.processStatus
-                ? row.processStatus == 1
-                  ? "审核中"
-                  : row.auditResult == 1
-                  ? "通过"
-                  : row.auditResult == 2
-                  ? "不通过"
-                  : row.auditResult == 3
-                  ? "撤销审批中"
-                  : row.auditResult == 4
-                  ? "撤销审批完成"
-                  : "--"
-                : "--";
-            },
+            formatter: this.formatter,
           },
           { label: "审批负责人", prop: "approver" },
 

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());  //请假审批中
                                 }