From d5358f4ec7884ce68d1221a3897fe2655fe4bce2 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Mon, 8 Jan 2024 15:23:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/WxInstrument.java      | 13 +++++++++++
 .../resources/mapper/WxInstrumentMapper.xml   | 23 +++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
index 68fb841..31f2fc0 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
@@ -66,6 +66,11 @@ public class WxInstrument extends BaseEntity {
      */
     private Long extraClockCredit;
 
+    /**
+     * 是否开启额外打卡奖励
+     */
+    private Long isExtraClock;
+
     /**
      * 额外打卡时间开始
      */
@@ -435,6 +440,14 @@ public class WxInstrument extends BaseEntity {
         return scanCodeBinding;
     }
 
+    public Long getIsExtraClock() {
+        return isExtraClock;
+    }
+
+    public void setIsExtraClock(Long isExtraClock) {
+        this.isExtraClock = isExtraClock;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
index 9815d6c..b5d3296 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serial"    column="serial"    />
         <result property="guarantee"    column="guarantee"    />
         <result property="dailyClockCredit"    column="daily_clock_credit"    />
+        <result property="isExtraClock"    column="is_extra_clock"    />
         <result property="extraClockCredit"    column="extra_clock_credit"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
@@ -26,8 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nursingTime"    column="nursing_time"    />
         <result property="iotVersion"    column="iot_version"    />
         <result property="iotUpgradeData"    column="iot_upgrade_data"    />
-        <result property="isScanCode"    column="isScanCode"    />
-        <result property="isPurchase"    column="isPurchase"    />
+        <result property="isScanCode"    column="is_scan_code"    />
+        <result property="isPurchase"    column="is_purchase"    />
         <result property="shoppingAppid"    column="shopping_appid"    />
         <result property="shoppingPath"    column="shopping_path"    />
         <result property="bluetoothConnecting"    column="bluetooth_connecting"    />
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxInstrumentVo">
-        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, scene_ids, scene_names, nursing_time, iot_version, iot_upgrade_data, isScanCode, isPurchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
+        select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, isExtraClock, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, scene_ids, scene_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
     </sql>
 
     <select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serial != null  and serial != ''"> and serial = #{serial}</if>
             <if test="guarantee != null "> and guarantee = #{guarantee}</if>
             <if test="dailyClockCredit != null "> and daily_clock_credit = #{dailyClockCredit}</if>
+            <if test="isExtraClock != null "> and is_extra_clock = #{isExtraClock}</if>
             <if test="extraClockCredit != null "> and extra_clock_credit = #{extraClockCredit}</if>
             <if test="startTime != null "> and start_time = #{startTime}</if>
             <if test="endTime != null "> and end_time = #{endTime}</if>
@@ -71,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingTime != null "> and nursing_time = #{nursingTime}</if>
             <if test="iotVersion != null  and iotVersion != ''"> and iot_version = #{iotVersion}</if>
             <if test="iotUpgradeData != null  and iotUpgradeData != ''"> and iot_upgrade_data = #{iotUpgradeData}</if>
-            <if test="isScanCode != null "> and isScanCode = #{isScanCode}</if>
-            <if test="isPurchase != null "> and isPurchase = #{isPurchase}</if>
+            <if test="isScanCode != null "> and is_scan_code = #{isScanCode}</if>
+            <if test="isPurchase != null "> and is_purchase = #{isPurchase}</if>
             <if test="shoppingAppid != null  and shoppingAppid != ''"> and shopping_appid = #{shoppingAppid}</if>
             <if test="shoppingPath != null  and shoppingPath != ''"> and shopping_path = #{shoppingPath}</if>
             <if test="bluetoothConnecting != null  and bluetoothConnecting != ''"> and bluetooth_connecting = #{bluetoothConnecting}</if>
@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serial != null and serial != ''">serial,</if>
             <if test="guarantee != null">guarantee,</if>
             <if test="dailyClockCredit != null">daily_clock_credit,</if>
+            <if test="isExtraClock != null">is_extra_clock,</if>
             <if test="extraClockCredit != null">extra_clock_credit,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
@@ -124,8 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingTime != null">nursing_time,</if>
             <if test="iotVersion != null">iot_version,</if>
             <if test="iotUpgradeData != null">iot_upgrade_data,</if>
-            <if test="isScanCode != null">isScanCode,</if>
-            <if test="isPurchase != null">isPurchase,</if>
+            <if test="isScanCode != null">is_scan_code,</if>
+            <if test="isPurchase != null">is_purchase,</if>
             <if test="shoppingAppid != null">shopping_appid,</if>
             <if test="shoppingPath != null">shopping_path,</if>
             <if test="bluetoothConnecting != null">bluetooth_connecting,</if>
@@ -150,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serial != null and serial != ''">#{serial},</if>
             <if test="guarantee != null">#{guarantee},</if>
             <if test="dailyClockCredit != null">#{dailyClockCredit},</if>
+            <if test="isExtraClock != null">#{isExtraClock},</if>
             <if test="extraClockCredit != null">#{extraClockCredit},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
@@ -192,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serial != null and serial != ''">serial = #{serial},</if>
             <if test="guarantee != null">guarantee = #{guarantee},</if>
             <if test="dailyClockCredit != null">daily_clock_credit = #{dailyClockCredit},</if>
+            <if test="isExtraClock != null">is_extra_clock = #{isExtraClock},</if>
             <if test="extraClockCredit != null">extra_clock_credit = #{extraClockCredit},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
@@ -204,8 +209,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingTime != null">nursing_time = #{nursingTime},</if>
             <if test="iotVersion != null">iot_version = #{iotVersion},</if>
             <if test="iotUpgradeData != null">iot_upgrade_data = #{iotUpgradeData},</if>
-            <if test="isScanCode != null">isScanCode = #{isScanCode},</if>
-            <if test="isPurchase != null">isPurchase = #{isPurchase},</if>
+            <if test="isScanCode != null">is_scan_code = #{isScanCode},</if>
+            <if test="isPurchase != null">is_purchase = #{isPurchase},</if>
             <if test="shoppingAppid != null">shopping_appid = #{shoppingAppid},</if>
             <if test="shoppingPath != null">shopping_path = #{shoppingPath},</if>
             <if test="bluetoothConnecting != null">bluetooth_connecting = #{bluetoothConnecting},</if>