!11493 !11492 添加功能

Merge pull request !11493 from 李鹏宇/dev

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -637,10 +637,11 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 'document_ids': [(6, 0, self.document_ids.ids)],
                 "lase_click_date": fields.Datetime.now()
             })
-            title = record_id._description
+            description = "标题: {}\n".format(record_id.name) + self.env.user.name + '  ' + str(
+                fields.Datetime.now() + timedelta(hours=8))
             action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
             for employee_id  in self.add_employee_ids:
-                self.sudo().env["soong.workflow.log"].create({
+                next_node_log_records = self.sudo().env["soong.workflow.log"].create({
                     'name': '加签',
                     "code": self.code,
                     "model": self.res_model,
@@ -652,11 +653,17 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                     "approval_state": "0",
                 })
                 url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={record_id.id}&action={action_id.id}&model={self.res_model}&view_type=form'
-                self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
+                result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
                                                                          user_id=employee_id.wecom_userid,
                                                                          title=record_id._description + "加签",
-                                                                         description=title, url=url,
+                                                                         description=description, url=url,
                                                                          btntxt="查看详情")
+                if result_data and 'msgid' in result_data[-1]:
+                    msg_id = result_data[-1]['msgid']
+                    target_logs = next_node_log_records.filtered(lambda l: l.done_by.id == employee.user_id.id)
+                    if target_logs:
+                        target_logs.msg_id = msg_id
+
             workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
                                                                                   ('res_model', '=', record_id._name)
                                                                                   ])

soong_workflow/wizard/soong_workflow_comment_wizard_view.xml

@@ -70,8 +70,6 @@
                     <group>
                           <label for="scope_type" string="范围"/>
                         <field name="scope_type" nolabel="1"/>
-                        <label for="is_selection" string="是否自动选择"/>
-                        <field name="is_selection" nolabel="1"/>
                         <field name="company_id" invisible="1"/>
                         <field name="add_employee_ids" invisible="node_btn_name == '退回'"
                                widget="many2many_tags" options="{'no_create': True}"