Ver código fonte

补充飞书对接

zhouyy 7 meses atrás
pai
commit
f8607ad267

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserFvTime.java

@@ -51,8 +51,8 @@ public class UserFvTime extends Model<UserFvTime> {
     @TableField("work_hours")
     private Float workHours;
 
-    @TableField("overtime_seconds")
-    private Long overTimeSeconds;
+//    @TableField("overtime_hours")
+//    private Float overTimeHours;
 
     /**
      * 是否被标记排除异常范围

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FeishuInfoServiceImpl.java

@@ -707,7 +707,8 @@ public class FeishuInfoServiceImpl extends ServiceImpl<FeishuInfoMapper, FeishuI
                                                         sumOverTimeSeconds = endOver-startOver;
                                                 }
                                         }
-                                        userFvTime.setOverTimeSeconds(sumOverTimeSeconds);
+//                                        float overTimeHours = BigDecimal.valueOf(sumOverTimeSeconds/ (60 * 60f)).setScale(2, RoundingMode.HALF_UP).floatValue();
+//                                        userFvTime.setOverTimeHours(overTimeHours);
 
                                         float workHours = BigDecimal.valueOf((workSeconds - sumRestSecond + sumOverTimeSeconds) / (60 * 60f))
                                                 .setScale(2, RoundingMode.HALF_UP).floatValue();

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserFvTimeMapper.xml

@@ -20,10 +20,10 @@
     </sql>
 
     <insert id="batchInsert">
-        insert into user_fv_time(work_date, user_id, company_id, start_time, end_time, work_hours, overtime_seconds)
+        insert into user_fv_time(work_date, user_id, company_id, start_time, end_time, work_hours, overtime_hours)
         values
             <foreach collection="toAddList" item="toAdd" separator=",">
-            (#{toAdd.workDate},#{toAdd.userId},#{toAdd.companyId},#{toAdd.startTime},#{toAdd.endTime},#{toAdd.workHours},#{toAdd.overTimeSeconds})
+            (#{toAdd.workDate},#{toAdd.userId},#{toAdd.companyId},#{toAdd.startTime},#{toAdd.endTime},#{toAdd.workHours},#{toAdd.overTimeHours})
             </foreach>
     </insert>