diff --git a/attendance_iot/controllers/kaoqin_test.py b/attendance_iot/controllers/kaoqin_test.py index 1dfd5bebb..32ffc40ea 100644 --- a/attendance_iot/controllers/kaoqin_test.py +++ b/attendance_iot/controllers/kaoqin_test.py @@ -61,7 +61,7 @@ class BusController(Controller): request.env(user=SUPERUSER_ID)["hr.attendance.detail"].create({ 'employee_id': employee_id.id, # 员工 # 'checkin_time': fields.Datetime.now(), # 打卡时间 - 'checkin_time': recog_time, # 打卡时间 + 'checkin_time': recog_time - timedelta(hours=8), # 打卡时间 'source': 'iot', # 打卡来源 'attendance_iot_id': attendance_iot_id.id, # 打卡设备 }) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index c906fad39..944da69be 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -772,6 +772,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_btn_name != "收回": tree_id = self.env.ref("soong_workflow.soong_workflow_record_my_tree").id + self.red_reload() return { 'name': '流程待办', 'view_mode': 'tree', @@ -785,8 +786,11 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'check_employee': 1 } } - - + def red_reload(self): + return { + 'type': 'ir.actions.client', + 'tag': 'flush_badge', + } def update_self_users_ids(self): related_record = self.env[self.res_model].browse(self.res_id) if hasattr(related_record, 'self_users_ids'): diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index faa441259..1824cfd4e 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -178,7 +178,7 @@ class YuthonWillTask(models.Model): task.write({'task_state': 'done'}) will_id = task.yuthon_will_task_id for employee_id in will_id.employee_ids: - url = f'https://phone.thtzjt.com/phone/Schedule/{self.id}/{employee_id.id}' + url = f'https://phone.thtzjt.com/phone/Schedule/{task.will_task.id}/{employee_id.id}' data_date = '时间:' + (task.reminder_time + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S") + '\n' data_name = "事项名称: " + task.yuthon_will_task_id.name + '\n' data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n' diff --git a/yuthon_work_brand/static/description/stock.png b/yuthon_work_brand/static/description/stock.png new file mode 100644 index 000000000..6f4a20cd8 Binary files /dev/null and b/yuthon_work_brand/static/description/stock.png differ