Merge pull request !1035 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-01-01 10:57:31 +00:00
committed by Gitee
+4 -4
View File
@@ -27,11 +27,11 @@ class YuthonWillTask(models.Model):
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string='所属公司')
start_time = fields.Datetime(string='开始时间', default=fields.Date.today())
end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(datetime.now().date(), time(11, 0, 0)))
state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态')
state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True)
employee_id = fields.Many2one('hr.employee', string='司机')
def read_number(self):
return self.search_count([('state', '=', 'will'), ('user_ids', 'in', self.env.user.id)])
return self.search_count([('state', '=', 'will'), ('users_ids', 'in', self.env.user.id)])
@api.onchange('employee_ids')
def onchange_employee_ids(self):
@@ -84,8 +84,8 @@ class YuthonWillTask(models.Model):
data_name = "事项名称: " + self.task_content + '\n'
data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'
data_employee_id = ('司机:' + self.employee_id.name)if self.employee_id.name else '' + '\n'
data_nota = ('备注:' + self.remarks)if self.remarks else '' + '\n'
data_employee_id = ('司机:' + self.employee_id.name) if self.employee_id.name else ('') + '\n'
data_nota = ('备注:' + self.remarks) if self.remarks else ('') + '\n'
data = data_name + data_start_time + data_user_ids + data_nota + data_employee_id
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid,
title="日程事项提醒", description=data,