Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue

@@ -474,6 +474,7 @@ export default {
       console.log(val);
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue

@@ -500,6 +500,7 @@ export default {
     ruleChange(val) {
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue

@@ -472,6 +472,7 @@ export default {
     ruleChange(val) {
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue

@@ -465,6 +465,7 @@ export default {
     ruleChange(val) {
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue

@@ -467,6 +467,7 @@ export default {
     ruleChange(val) {
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue

@@ -464,6 +464,7 @@ export default {
     ruleChange(val) {
       let arr = this.kaoqinArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

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

@@ -446,6 +446,7 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     async cateChange() {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue

@@ -510,6 +510,7 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue

@@ -482,6 +482,7 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -450,8 +450,8 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
-      this.form.subAddType = arr[0].subAddType;
     },
     cateChange() {
       this.$post("/perform/rules/list", {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue

@@ -410,6 +410,7 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue

@@ -465,6 +465,7 @@ export default {
     ruleChange(val) {
       let arr = this.ruleArr.filter((v) => v.id == val);
       this.form.score = arr && arr[0].score;
+      this.form.subAddType = arr && arr[0].subAddType;
       this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
     },
     cateChange() {

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

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notDel :config="tableConfig">
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="handleImport"
         >导入</el-button
-      >
+      > -->
       <el-button
         slot="table-head-left2"
         style="margin-left: 10px"

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java

@@ -111,7 +111,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
             query.setStaffId(entity.getStaffId());
             query.setCheckTimeStart(DateUtils.getStrDate(entity.getCheckTime()));
             query.setCheckTimeEnd(query.getCheckTimeStart());
-            //summaryCheck(query);
+            summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }
@@ -183,7 +183,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
             sendCheckDingTalk(temp);
             StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
             query.setStaffId(temp.getStaffId());
-            //summaryCheck(query);
+            summaryCheck(query);
 
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java

@@ -25,10 +25,12 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 员工姓名
      */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
      * 工号
      */
+
     private String workNum;
     /**
      * 所属部门
@@ -37,6 +39,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 所属部门名称
      */
+    @Excel(name = "所属部门")
     private String deptName;
     /**
      * 所属考勤组ID
@@ -45,6 +48,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 所属考勤组名称
      */
+    @Excel(name = "考勤组")
     private String attendanceGroupName;
     /**
      * 考勤时间
@@ -57,18 +61,22 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 异常时间
      */
+    @Excel(name = "异常时间", width = 80, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date errorTime;
     /**
      * 上下班时间
      */
+    @Excel(name = "上下班时间")
     private String goOffTimeStr;
     /**
      * 实际打卡时间
      */
+    @Excel(name = "实际打卡时间", width = 80, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date actualAttendTime;
     /**
      * 异常处理结果
      */
+    @Excel(name = "异常处理结果")
     private String errorResult;
     /**
      * 扣分方式(1.系统自动,2.人工添加)
@@ -102,12 +110,11 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 附件名称，多个逗号分割
      */
-    @Excel(name = "附件名称，多个逗号分割")
+
     private String fileNames;
     /**
      * 附件下载地址，多个逗号分割
      */
-    @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
     /**
      * 绩效规则分类id
@@ -124,7 +131,6 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     /**
      * 窗口编号
      */
-    @Excel(name = "窗口编号")
     private String windowNum;
     @Override
     public int hashCode() {