From 02e46ceca02a05a17dd1a4314639bf5254458d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Tue, 22 Aug 2023 15:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E6=9C=88=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/views/attendance/record/hik/list.vue | 3 ---
.../admin/src/views/attendance/stat/list.vue | 1 +
.../sqlmap/module/attendance/AttendanceStatMapperExt.xml | 2 ++
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
index ddef3889..b602c92e 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
@@ -220,13 +220,10 @@ export default {
},
/** 瀵煎嚭Excel */
doExport() {
- console.log("isExport:",this.isExport==true)
if(this.isExport==true) {
console.log("isExport:",this.isExport)
this.$message.info("鑰冨嫟鏁版嵁姝ｅ湪瀵煎嚭涓紝璇峰嬁閲嶅鐐瑰嚮锛�")
return false;
- }else{
- console.log("isExport11:",this.isExport)
}
this.isExport = true;
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
index 188c01f7..b381bacf 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
@@ -202,6 +202,7 @@ export default {
params[value.name] = this.query[value.name];
}
}
+
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml
index d2bcfcc8..3161dccf 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml
@@ -5,6 +5,7 @@
<select id="getListExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultMap="AttendanceStatEntity-Map">
SELECT * FROM (
SELECT
+ s.id,
s.staffId,
s.staffName,
s.deptId,
@@ -70,6 +71,7 @@
<select id="getListCountExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="int">
SELECT count(1) FROM (
SELECT
+ s.id,
s.staffId,
s.staffName,
s.deptId,
--
2.24.3