From 66789f839ac8b01d0c000ae11d49f9de7bbf10e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 12 Dec 2024 07:54:16 +0800 Subject: [PATCH] pengyuthon wechat --- soong_workflow/models/soong_workflow_mixin.py | 20 +++--- .../wizard/soong_workflow_comment_wizard.py | 66 +++++++++---------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index ed95439ea..682635cfd 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -208,16 +208,16 @@ class SoongWorkflowMixin(models.AbstractModel): ('department_id', '=', self.department_id.id), ('department_ids', 'in', self.department_id.id)]) employee_ids = employee_user_role_ids if not next_state.is_automatic else employee_user_role_id - # url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self._name, self.id) - # for employee in employee_ids: - # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - # user_id=employee.wecom_userid, - # title=self._description, - # description="标题: {}\n".format( - # self.name) + self.env.user.name + ' ' + str( - # fields.Datetime.now() + timedelta( - # hours=8)), - # url=url, btntxt="查看详情") + url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self._name, self.id) + for employee in employee_ids: + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + user_id=employee.wecom_userid, + title=self._description, + description="标题: {}\n".format( + self.name) + self.env.user.name + ' ' + str( + fields.Datetime.now() + timedelta( + hours=8)), + url=url, btntxt="查看详情") # partner_ids = employee_ids.user_id.partner_id.ids # self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, # 'soong_workflow.message_soong_workflow_users_data') diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 1b794e1fa..345366c6a 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -121,13 +121,13 @@ class SoongWorkflowCommentWizard(models.TransientModel): if not employee.wecom_userid: raise ("请同步{}的企业微信".format(employee.name)) url = "https://oa.thtzjt.com/mail/view?model={}&res_id={}".format(self.res_model, record_id.id) - # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - # user_id=employee.wecom_userid, - # title=record_id._description, - # description="标题: {}\n".format( - # record_id.name) + self.env.user.name + ' ' + str( - # fields.Datetime.now() + timedelta(hours=8)), - # url=url, btntxt="查看详情") + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + user_id=employee.wecom_userid, + title=record_id._description, + description="标题: {}\n".format( + record_id.name) + self.env.user.name + ' ' + str( + fields.Datetime.now() + timedelta(hours=8)), + url=url, btntxt="查看详情") # partner_ids = self_node_id.employee_ids.user_id.partner_id.ids # self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_distribute') # 转交逻辑--单线 @@ -138,30 +138,30 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_link_len: record_id.write({'state': 'end' if self.trans_link_id.name == '结束' else self.trans_link_id.name}) url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self.res_model, self.res_id) - # for employee in self.employee_ids: - # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - # user_id=employee.wecom_userid, - # title=record_id._description, - # description="标题: {}\n".format( - # record_id.name) + self.env.user.name + ' ' + str( - # fields.Datetime.now() + timedelta( - # hours=8)), - # url=url, btntxt="查看详情") + for employee in self.employee_ids: + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + user_id=employee.wecom_userid, + title=record_id._description, + description="标题: {}\n".format( + record_id.name) + self.env.user.name + ' ' + str( + fields.Datetime.now() + timedelta( + hours=8)), + url=url, btntxt="查看详情") # partner_ids = self.employee_ids.user_id.partner_id.ids # self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_distribute') return self.node_btn_id.with_context(cx).run() if self.node_btn_name == '退回': record_id.write({'state': 'start' if self.return_link_id.name == '拟办' else self.return_link_id.name}) url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self.res_model, self.res_id) - # for employee in self.employee_ids: - # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - # user_id=employee.wecom_userid, - # title=record_id._description, - # description="标题: {}\n".format( - # record_id.name) + self.env.user.name + ' ' + str( - # fields.Datetime.now() + timedelta( - # hours=8)), - # url=url, btntxt="查看详情") + for employee in self.employee_ids: + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + user_id=employee.wecom_userid, + title=record_id._description, + description="标题: {}\n".format( + record_id.name) + self.env.user.name + ' ' + str( + fields.Datetime.now() + timedelta( + hours=8)), + url=url, btntxt="查看详情") # partner_ids = self.employee_ids.user_id.partner_id.ids # self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_distribute') return self.node_btn_id.with_context(cx).run() @@ -174,14 +174,14 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_btn_name == '分发': if self.circulated_employee_ids: url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self.res_model, self.res_id) - # for employee in self.circulated_employee_ids: - # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', - # user_id=employee.wecom_userid, - # title=record_id._description, - # description="标题: {}\n".format( - # record_id.name) + self.env.user.name + ' ' + str( - # fields.Datetime.now() + timedelta(hours=8)), - # url=url, btntxt="查看详情") + for employee in self.circulated_employee_ids: + self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', + user_id=employee.wecom_userid, + title=record_id._description, + description="标题: {}\n".format( + record_id.name) + self.env.user.name + ' ' + str( + fields.Datetime.now() + timedelta(hours=8)), + url=url, btntxt="查看详情") # partner_ids = self.circulated_employee_ids.user_id.partner_id.ids # self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids,'soong_workflow.message_soong_workflow_distribute') if self.employee_ids: