diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index b4792751e..d3eb6d2f3 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -104,24 +104,25 @@ class IssueMeetingLine(models.Model): meeting_type_name = str(self.meeting_booking_id.meeting_type_id.name).strip() if self.decision_results == 'agree': is_agree = 'pass' - agree_name = '通过' + agree_name = '(通过)' issue_state = 'on_meet' else: is_agree = 'reject' - agree_name = '未通过' + agree_name = '(未通过)' issue_state = 'will' self.issue_library_id.issue_state = issue_state + self.issue_library_id.library_push() if '党' in meeting_type_name: self.issue_library_id.is_party_passed = is_agree original_party_char = self.issue_library_id.party_char or "" - self.issue_library_id.party_char = original_party_char + (agree_name) + self.issue_library_id.party_char = original_party_char + agree_name if '班子' in meeting_type_name: self.issue_library_id.is_class_passed = is_agree original_class_char = self.issue_library_id.class_char or "" - self.issue_library_id.class_char = original_class_char + (agree_name) + self.issue_library_id.class_char = original_class_char + agree_name if '董事' in meeting_type_name: self.issue_library_id.is_boss_passed = is_agree original_boss_char = self.issue_library_id.boss_char or "" - self.issue_library_id.boss_char = original_boss_char + (agree_name) + self.issue_library_id.boss_char = original_boss_char + agree_name diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index c0836e79f..d653ececf 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -209,8 +209,6 @@ class YuthonWillTask(models.Model): data = data_date + data_name + data_user_ids + data_nota + data_employee_id self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee_id.wecom_userid, title="日程事项提醒", description=data, url=url, btntxt="详细信息") - self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id="18562027762", title="日程事项提醒", description=data, - url=url, btntxt="详细信息") def button_add_comment(self): self.add_comment()