From b396c7b79c0a560be19559a92d68ecbdb62935c9 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 5 Mar 2024 15:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/WxMemberClockLog.java   | 10 ++++++++++
 .../common/core/domain/export/WxClockLogExport.java   | 11 +++++++++++
 .../src/main/resources/mapper/WxClockLogMapper.xml    |  4 +++-
 flossom-ui/src/views/system/clockLog/index.vue        |  7 +++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMemberClockLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMemberClockLog.java
index 586edb4..f7e92f0 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMemberClockLog.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMemberClockLog.java
@@ -43,6 +43,8 @@ public class WxMemberClockLog {
 
     private String instrumentName;
 
+    private String clockTime;
+
 
     public Integer getClockNum() {
         return clockNum;
@@ -123,4 +125,12 @@ public class WxMemberClockLog {
     public void setInstrumentName(String instrumentName) {
         this.instrumentName = instrumentName;
     }
+
+    public String getClockTime() {
+        return clockTime;
+    }
+
+    public void setClockTime(String clockTime) {
+        this.clockTime = clockTime;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxClockLogExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxClockLogExport.java
index 4f2db51..60846ae 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxClockLogExport.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxClockLogExport.java
@@ -28,6 +28,9 @@ public class WxClockLogExport {
     @Excel(name = "最新打卡时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date lastClockTime;
 
+    @Excel(name = "累计打卡时间")
+    private String clockTime;
+
     @Excel(name = "小程序标签")
     private String miniProgramTagListStr;
 
@@ -115,4 +118,12 @@ public class WxClockLogExport {
     public void setMemberRegisterDate(Date memberRegisterDate) {
         this.memberRegisterDate = memberRegisterDate;
     }
+
+    public String getClockTime() {
+        return clockTime;
+    }
+
+    public void setClockTime(String clockTime) {
+        this.clockTime = clockTime;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml
index e00466d..d2f8be3 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxClockLogMapper.xml
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lastClockTime" column="last_clock_time"/>
         <result property="clockNum" column="clock_num" />
         <result property="instrumentName" column="instrument_name" />
+        <result property="clockTime" column="clock_time" />
     </resultMap>
 
     <resultMap type="WxClockLog" id="WxClockImgLogResult">
@@ -133,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_id,
             MAX( update_time ) AS last_clock_time,
             GROUP_CONCAT(instrument_name) AS instrument_name,
-            count( 1 ) AS clock_num
+            count( 1 ) AS clock_num,
+            GROUP_CONCAT( update_time ) AS clock_time
         FROM
             wx_clock_log
         <where>
diff --git a/flossom-ui/src/views/system/clockLog/index.vue b/flossom-ui/src/views/system/clockLog/index.vue
index 35563e3..e340b29 100644
--- a/flossom-ui/src/views/system/clockLog/index.vue
+++ b/flossom-ui/src/views/system/clockLog/index.vue
@@ -307,6 +307,9 @@
         <el-form-item label="最新打卡时间 " prop="lastClockTime">
           <el-switch v-model="exportFieldList.lastClockTime" active-value="lastClockTime" :inactive-value="null"/>
         </el-form-item>
+        <el-form-item label="累计打卡时间 " prop="clockTime">
+          <el-switch v-model="exportFieldList.clockTime" active-value="clockTime" :inactive-value="null"/>
+        </el-form-item>
         <el-form-item label="小程序标签 " prop="miniProgramTagListStr">
           <el-switch v-model="exportFieldList.miniProgramTagListStr" active-value="miniProgramTagListStr"
                      :inactive-value="null"/>
@@ -448,6 +451,7 @@ export default {
         wecomTagListStr: null,
         memberRegisterDate: null,
         instrumentName: null,
+        clockTime: null,
       },
       // 打卡记录详情列表
       userClockLogVisible: false,
@@ -796,6 +800,7 @@ export default {
         wecomTagListStr: null,
         memberRegisterDate: null,
         instrumentName: null,
+        clockTime: null,
       }
     },
     isExportAllFields() {
@@ -809,6 +814,7 @@ export default {
         this.exportFieldList.wecomTagListStr = "wecomTagListStr";
         this.exportFieldList.memberRegisterDate = "memberRegisterDate";
         this.exportFieldList.instrumentName = "instrumentName";
+        this.exportFieldList.clockTime = "clockTime";
       } else {
         this.exportFieldList.nickname = null;
         this.exportFieldList.userId = null;
@@ -819,6 +825,7 @@ export default {
         this.exportFieldList.wecomTagListStr = null;
         this.exportFieldList.memberRegisterDate = null;
         this.exportFieldList.instrumentName = null;
+        this.exportFieldList.clockTime = null;
       }
     },
     cancelUserClockLogDialog() {