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

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

@@ -221,7 +221,6 @@ export default {
     /** 导出Excel */
     doExport() {
       if(this.isExport==true) {
-        console.log("isExport:",this.isExport)
         this.$message.info("考勤数据正在导出中，请勿重复点击！")
         return false;
       }

attendance-performance-manager-ui/admin/src/views/login/authentication.vue

@@ -24,15 +24,15 @@ export default {
       this.$message.error(error.message || '请登录');
 
       console.log("href:"+process.env.VUE_APP_PORTAL_URL)
-    // window.location.href=process.env.VUE_APP_PORTAL_URL=='undefined'?'http://192.168.0.98:11072':process.env.VUE_APP_PORTAL_URL
+     //window.location.href=process.env.VUE_APP_PORTAL_URL=='undefined'?'http://192.168.0.98:11072':process.env.VUE_APP_PORTAL_URL
 
-     // window.location.href=process.env.VUE_APP_PORTAL_URL
-      this.$router.replace({
+      window.location.href=process.env.VUE_APP_PORTAL_URL
+/*      this.$router.replace({
         path: '/login',
         query: {
           redirect: this.redirect,
         }
-      });
+      });*/
     }
   },
   computed: {

attendance-performance-manager-ui/admin/src/views/staff/adjust/log/list.vue

@@ -48,33 +48,28 @@
                         },
                         {
                             name: "gender",
-                            type: "text",
-                            label: "性别1男2女",
-                            fuzzy: true
+                            type: "select",
+                            label: "性别"
                         },
                         {
                             name: "politicalstatus",
                             type: "select",
-                            label: "政治面貌 ",
-                            fuzzy: true
+                            label: "政治面貌"
                         },
                         {
                             name: "staffType",
-                            type: "text",
-                            label: "员工类型1全职2兼职3实习",
-                            fuzzy: true
+                            type: "select",
+                            label: "员工类型"
                         },
                         {
                             name: "status",
-                            type: "text",
-                            label: "员工状态1正式2试用3离职",
-                            fuzzy: true
+                            type: "select",
+                            label: "员工状态"
                         },
                         {
                             name: "auditStatus",
-                            type: "text",
-                            label: "审核状态0待审核1通过2拒绝",
-                            fuzzy: true
+                            type: "select",
+                            label: "审核状态"
                         },
                     ],
                     columns: [
@@ -83,19 +78,18 @@
 
                         {label: "员工姓名", prop: "fullName"},
 
-                        {label: "性别1男2女", prop: "gender",formatter: this.formatter},
+                        {label: "性别", prop: "gender",formatter: this.formatter},
 
                         {label: "政治面貌 ", prop: "politicalstatus",formatter: this.formatter},
 
-                        {label: "员工类型1全职2兼职3实习", prop: "staffType",formatter: this.formatter},
+                        {label: "员工类型", prop: "staffType",formatter: this.formatter},
 
-                        {label: "员工状态1正式2试用3离职", prop: "status",formatter: this.formatter},
+                        {label: "员工状态", prop: "status",formatter: this.formatter},
 
                         {label: "入职时间", prop: "entryDate", formatter: this.formatterDate},
 
-                        {label: "审核状态0待审核1通过2拒绝", prop: "auditStatus",formatter: this.formatter},
+                        {label: "审核状态", prop: "auditStatus",formatter: this.formatter},
 
-                        {label: "创建用户", prop: "createUserId", formatter: this.formatter},
                         {
                             label: "操作",
                             width: 240,

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -260,8 +260,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         int levealPersonNum = vacationRecordService.count(vacationRecordQuery, getContext());*/
 
         AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
-        leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
-        leaveRecordQuery.setCreateTimeEnd(DateUtil.today());
+/*        leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
+        leaveRecordQuery.setCreateTimeEnd(DateUtil.today());*/
+        leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
+        leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
         leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
         int levealPersonNum = leaveRecordService.count(leaveRecordQuery, getContext());
 
@@ -276,10 +278,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         //异常考勤记录
         //未考勤
         // long noAtt=lackOfCards;
-       // long att = totalAttend - lackOfCardsAttend - levealPersonNum;
-        long att = totalAttend - lackOfCardsAttend;
+        long att = totalCache - lackOfCardsAttend - levealPersonNum;
+       // long att = totalAttend - lackOfCardsAttend;
         if (att != 0L) {
-            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalAttend), 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
+            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalCache), 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
             homeStatInfo.setAttendRadio(bigDecimal.toString() + "%");
         } else {
             homeStatInfo.setAttendRadio("0%");