Parcourir la source

统一使用进出区域时间

daiyueteng il y a 6 ans
Parent
commit
93592828dd

+ 3 - 1
module_service/area_business_car_attendance.cpp

@@ -79,7 +79,9 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&ar
     {
         //考勤开始
         mine_tool_ptr->m_is_attendance = true;
-        mine_tool_ptr->m_attendance_start_time=std::chrono::system_clock::now();
+        //mine_tool_ptr->m_attendance_start_time=std::chrono::system_clock::now();
+        mine_tool_ptr->m_attendance_start_time=
+                std::chrono::system_clock::time_point(std::chrono::milliseconds(area_hover_ptr->m_last_time));
 
         //作为一条开始考勤记录保存到数据库
         db_tool::save_attendance(card_ptr, area_hover_ptr);

+ 3 - 1
module_service/area_business_person_attendance.cpp

@@ -44,7 +44,9 @@ void area_business_person_attendance::on_enter(const std::shared_ptr<area_hover>
     {
         //考勤开始
         mine_tool_ptr->m_is_attendance=true;
-        mine_tool_ptr->m_attendance_start_time=std::chrono::system_clock::now();
+        //mine_tool_ptr->m_attendance_start_time=std::chrono::system_clock::now();
+        mine_tool_ptr->m_attendance_start_time=
+                std::chrono::system_clock::time_point(std::chrono::milliseconds(area_hover_ptr->m_enter_time));
 
         //作为一条开始考勤记录保存到数据库
         db_tool::save_attendance(card_ptr, area_hover_ptr);

+ 2 - 2
module_service/area_business_work_rate.cpp

@@ -35,7 +35,7 @@ void area_business_work_rate::on_enter(const std::shared_ptr<area_hover>&area_ho
     auto area = std::make_shared<area_data>();
     area->area_id = area_hover_ptr->id();
     area->is_work_area = area_hover_ptr->m_area->m_is_work_area;
-    area->enter_time = tool_time::now_to_seconds();
+    area->enter_time = area_hover_ptr->m_enter_time/1000;
 
     three_rates::get_instance()->enter_area(card, area);
 }
@@ -63,7 +63,7 @@ void area_business_work_rate::on_leave(const std::shared_ptr<area_hover>&area_ho
     auto area = std::make_shared<area_data>();
     area->area_id = area_hover_ptr->id();
     area->is_work_area = area_hover_ptr->m_area->m_is_work_area;
-    area->leave_time = tool_time::now_to_seconds();
+    area->leave_time = area_hover_ptr->m_last_time/1000;
 
     three_rates::get_instance()->leave_area(card, area);
 }