Merge remote-tracking branch 'origin/master'

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

@@ -111,11 +111,11 @@
                     if(element.attendanceStaffStatEntities.length>0){
                         element.attendanceStaffStatEntities.forEach(item1 => {
                             item1.createTime = timestampToTime(item1.createTime,3)
-                        })          
+                        })
 
                     }
                 })
-                return row 
+                return row
             },
             /** 重写新增方法 */
             toAdd(row) {
@@ -195,13 +195,13 @@
                             name: "staffName",
                             type: "text",
                             label: "员工姓名",
-                            fuzzy: false
+                            fuzzy: true
                         },
                         {
                             name: "phoneNumber",
                             type: "text",
                             label: "手机号",
-                            fuzzy: false
+                            fuzzy: true
                         }
                     ],
                     columns: [
@@ -211,7 +211,12 @@
                         {label: "窗口类别", prop: "windowCategory",fixed:'left',width:100},
 
                         {label: "员工姓名", prop: "staffName",fixed:'left',width:100},
-                        {label:"部门",prop:"deptName"},
+                      {label:"部门",prop:"deptName"},
+                      {label: "出勤天数", prop: "goTimes",formatter: this.formatter},
+
+                      {label: "上午缺卡次数", prop: "morningTimes",formatter: this.formatter},
+
+                      {label: "下午缺卡次数", prop: "afternoonTimes",formatter: this.formatter},
                         {label: "回单位（天）", prop: "backToUnit"},
 
                         {label: "因公请假（天）", prop: "onDutyLeave"},
@@ -296,4 +301,4 @@
     margin: 20px 0;
     color: #999;
 }
-</style>
\ No newline at end of file
+</style>

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -188,6 +188,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getRecordId()));
+                    updateAppealResult(performInfo, entity);
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);

db/add.sql

@@ -762,3 +762,8 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='请假记录信息';
 
 
+ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `phoneNumer` varchar(64) default ''    COMMENT '手机号码' AFTER staffName;
+ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `goTimes` int(9)   default 0   COMMENT '出勤天数' AFTER phoneNumer;
+ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `morningTimes` int(9) default 0   COMMENT '上午缺卡次数' AFTER goTimes;
+ALTER TABLE mortals_xhx_attendance_stat ADD COLUMN   `afternoonTimes` int(9) default 0    COMMENT '下午缺卡次数' AFTER morningTimes;
+