不得超过考勤加班时长

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-08-18
+ * @since 2024-09-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -615,6 +615,13 @@ public class TimeType extends Model<TimeType> {
     @TableField(exist = false)
     private Integer saasSyncContact;
 
+    /**
+     * 是否校验考勤数据的加班时长
+     */
+    @TableField("verify_card_overtime")
+    private Integer verifyCardOvertime;
+
+
     @Override
     protected Serializable pkVal() {
         return this.companyId;

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1933,6 +1933,7 @@
   "hao": "number",
   "haoHanQianTianBao": "Fill in before (including) the number.",
   "jiaBanShiChangXiaoYan": "Overtime duration verification",
+  "kaoqingjiabanjiaoyan": "attendance overtime verification",
   "kaiQiHouChaoGuoXiangMuJiHuaJieShuRiQiDeRiBaoJiangBuKeTianBao": "Daily reports that exceed the end date of the project plan after opening will not be able to be filled in",
   "keYong_0BiaoShiDaiShenHeTiaoShuLiRu_0JiangBeiTiHuanWei_10": "({0} can be used to represent the number of pending reviews, for example: {0} will be replaced with 10.)",
   "keYong_0BiaoShiLouTianRiQiLiRu_0JiangBeiTiHuanWei_05240525": "(You can use {0} to indicate a missing date, for example: {0} will be replaced with 05/24, 05/25.)",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1921,6 +1921,8 @@
   "liXiangShuJu": "立项数据",
   "liXiangDaoChuXlsx": "立项导出.xlsx",
   "jiaBanShiChangXiaoYan": "加班时长校验",
+  "kaoqingjiabanjiaoyan": "考勤加班时长校验",
+  "kaoqingjiabanjiaoyanTip": "每日填报工时总加班时长不得超过考勤的加班时长",
   "gongZuoRiTianXieJiaBanShiChangBuDeChaoGuoZongGongZuoShiChangZhengChangGongZuoShiChang": "工作日填写加班时长不得超过总工作时长-正常工作时长",
   "meiYue": "每月",
   "hao": "号",

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -55,6 +55,12 @@
                                         <i class="el-icon-question" style="color:#606266"></i>
                             </el-tooltip>
                             </el-form-item>
+                            <el-form-item v-if="timeType.fillOvertime && timeType.syncCorpwxTime">
+                            <el-checkbox v-model="timeType.verifyCardOvertime" :label="$t('kaoqingjiabanjiaoyan')" />
+                            <el-tooltip effect="dark" :content="$t('kaoqingjiabanjiaoyanTip')" placement="top-start">
+                                        <i class="el-icon-question" style="color:#606266"></i>
+                            </el-tooltip>
+                            </el-form-item>
                             <template v-if="timeType.fillOvertime">
                             <el-checkbox v-model="timeType.payOvertime" :label="$t('chargedtocost')" />
                             <!-- <el-checkbox v-model="timeType.doubleOvertime" label="加班双倍成本" :disabled="!timeType.payOvertime"/> -->
@@ -1635,6 +1641,7 @@
                         param.fillAhead = param.fillAhead ? 1 : 0
                         param.includeWeekends = param.includeWeekends ? 1 : 0
                         param.workOvertimeNeedCheck = param.workOvertimeNeedCheck ? 1 : 0
+                        param.verifyCardOvertime = param.verifyCardOvertime ? 1 : 0
                         param.mainProjectState = param.mainProjectState ? 1 : 0
                         param.stopReport = param.stopReport? 1: 0;
                         param.notAllowedOnNonWorkday = param.notAllowedOnNonWorkday? 1: 0;
@@ -1734,6 +1741,7 @@
                             this.timeType.fillAhead = this.timeType.fillAhead ? true : false
                             this.timeType.includeWeekends = this.timeType.includeWeekends ? true : false
                             this.timeType.workOvertimeNeedCheck = this.timeType.workOvertimeNeedCheck ? true : false
+                            this.timeType.verifyCardOvertime = this.timeType.verifyCardOvertime ? true : false
                             this.timeType.mainProjectState = this.timeType.mainProjectState ? true : false
                             this.timeType.customDataMaxStatus = this.timeType.customDataMaxStatus ? true : false 
                             this.timeType.customDataMaxValue = this.timeType.customDataMaxValue ? this.timeType.customDataMaxValue : 100