修改自动考核

attendance-performance-manager-ui/admin/src/assets/utils/index.js

@@ -51,6 +51,7 @@ export const encodeURI = (data) => {
  * @returns {string} val 解析后的结果
  */
 export function formatterDate(time) {
+  console.log(time)
   if (!time) return '--';
   let date = new Date(Number(time));
   let Y = date.getFullYear() + '-';

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -35,7 +35,7 @@
               }}</el-col
             >
             <el-col :span="8"
-              >异常时间：{{ formatterDate(form.appealTime)}}</el-col
+              >异常时间：{{ formatterDate(form.errorTime)}}</el-col
             >
             <el-col :span="8"
               >上下班时间：{{
@@ -46,7 +46,7 @@
           <el-row>
             <el-col :span="10"
               >实际打卡时间：{{
-                formatterDate(form.appealTime)
+                formatterDate(form.actualAttendTime)
               }}</el-col
             >
             <el-col :span="9"
@@ -63,7 +63,7 @@
           <el-row>
             <el-col :span="8"
               >加分/扣分时间：{{
-                formatterDate(form.appealTime)
+                formatterDate(form.deductTime)
               }}</el-col
             >
             <el-col :span="8"
@@ -102,7 +102,7 @@
               }}</el-col
             >
             <el-col :span="8"
-              >核查时间：{{ formatterDate(form.appealTime) }}</el-col
+              >核查时间：{{ formatterDate(form.checkTime) }}</el-col
             >
           </el-row>
         </div>
@@ -147,10 +147,10 @@
               }}</el-col
             >
             <el-col :span="8"
-              >处理人员{{dict['updateUserId'][form.updateUserId]}}</el-col
+              >处理人员{{util_formatter('updateUserId',form.updateUserId+"")}}</el-col
             >
             <el-col :span="8"
-              >处理时间： {{ formatterDate(form.appealTime) }}</el-col
+              >处理时间： {{ formatterDate(form.updateTime) }}</el-col
             >
           </el-row>
           <el-row>
@@ -502,6 +502,13 @@ export default {
   },
 
   methods: {
+    util_formatter(key, val) {
+      try {
+        return this.dict[key][val];
+      } catch (error) {
+        return val;
+      }
+    },
     formatterDate,
     // 下载附件
     hanldeDownloadFile(val) {

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

@@ -32,7 +32,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             OapiV2UserGetbymobileResponse rsp = client.execute(req, getToken());
             log.info("OapiV2UserGetbymobileResponse:{}", rsp.getBody());
             if (rsp.getErrcode() == 0) {
-                return Rest.ok(rsp.getResult().getUserid());
+                return Rest.ok("成功",rsp.getResult().getUserid());
             } else {
                 return Rest.fail(String.format("code:%s,msg:%s", rsp.getErrcode(), rsp.getErrmsg()));
             }