Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -255,7 +255,7 @@
         <if test="groupId != null">
             and task.group_id = #{groupId}
         </if>
-        and task_status = 0 order by task.id desc limit 50
+        and task_status = 0 order by task.id desc limit 300
     </select>
     <select id="selectMilepost" resultType="com.management.platform.entity.Task">
         select * from task where

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -18,9 +18,9 @@
                                 <br>
                                 <span style="font-size:10px;text-align:center;color:#999;">{{item.weekDay}}</span>
                                 <span class="chooseDate" v-if="index == choseDay"></span>
-                                <!-- <el-tooltip v-if="index == choseDay" effect="dark" content="填报时长超过北森考勤时长" placement="top-start">
+                                <el-tooltip v-if="item.exceedCardTime" effect="dark" content="填报时长超过北森考勤时长" placement="top-start">
                                 <i class="el-icon-warning" style="color:red;"></i>
-                                </el-tooltip> -->
+                                </el-tooltip>
                                 </div>
                             </div>
                             </span>
@@ -2814,9 +2814,8 @@
             refreshBeiSengAttendance(workdate) {
                  if (!workdate) return;
                 this.syncTimeLoading = true;
-                this.http.post('/user-with-beisen/syncAttendanceFromBeisen',{
-                    startDate: workdate,
-                    endDate: workdate
+                this.http.post('/user-with-beisen/getAttendanceStatisticWithUser',{
+                    createDate: workdate
                 },res => {
                     this.syncTimeLoading = false;
                     if(res.code == 'ok'){