修改本月统计

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: "createUserId", formatter: this.formatter},
+                        {label: "审核状态", prop: "auditStatus",formatter: this.formatter},
+                        
                         {
                             label: "操作",
                             width: 240,

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

@@ -276,10 +276,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%");