diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 98d0448dd..85d2ea2ca 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -66,33 +66,33 @@ class RoomBooking(models.Model): if '党' in meeting_type_name: if meet.issue_library_id.is_party and not meet.issue_library_id.is_party_passed: party_value = str(record.start_datetime.date()) + record.meeting_type_id.name - meet.issue_library_id.party_char = f'{party_value}' + meet.issue_library_id.party_char = party_value meet.issue_library_id.issue_state_party = 'meeting' meet.issue_library_id.issue_state = False if '班子' in meeting_type_name: if meet.issue_library_id.is_class and not meet.issue_library_id.is_class_passed: class_value = str(record.start_datetime.date()) + f'第{record.number_of_meetings}次' + record.meeting_type_id.name - meet.issue_library_id.class_char = f'{class_value}' + meet.issue_library_id.class_char = class_value meet.issue_library_id.issue_state_class = 'meeting' meet.issue_library_id.issue_state = False if '董事' in meeting_type_name: if meet.issue_library_id.is_boss and not meet.issue_library_id.is_boss_passed: boss_value = str(record.start_datetime.date()) + record.meeting_type_id.name - meet.issue_library_id.boss_char = f'{boss_value}' + meet.issue_library_id.boss_char = boss_value meet.issue_library_id.issue_state_boss = 'meeting' meet.issue_library_id.issue_state = False elif '套' in meeting_type_name: if meet.issue_library_id.is_party and (meet.issue_library_id.is_party_passed == 'reject' or not meet.issue_library_id.is_party_passed): party_value = str(record.start_datetime.date()) + record.meeting_type_id.name - meet.issue_library_id.party_char = f'{party_value}' + meet.issue_library_id.party_char = party_value meet.issue_library_id.issue_state_party = 'meeting' meet.issue_library_id.issue_state = False elif meet.issue_library_id.is_class and (meet.issue_library_id.is_class_passed == 'r eject' or not meet.issue_library_id.is_class_passed): class_value = str(record.start_datetime.date()) + f'第{record.number_of_meetings}次' + record.meeting_type_id.name - meet.issue_library_id.class_char = f'{class_value}' + meet.issue_library_id.class_char = class_value meet.issue_library_id.issue_state_class = 'meeting' meet.issue_library_id.issue_state = False @@ -372,7 +372,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) clean_party_char = clean_party_char.replace('', '').replace('', '') - record.issue_library_id.party_char = f'{clean_party_char + agree_name}' + record.issue_library_id.party_char = clean_party_char + agree_name record.issue_library_id.issue_state_party = 'on_meet' # 3. 班子会相关 @@ -385,7 +385,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_class_char = clean_class_char.removesuffix(suffix) clean_class_char = clean_class_char.replace('', '').replace('', '') - record.issue_library_id.class_char = f'{clean_class_char + agree_name}' + record.issue_library_id.class_char = clean_class_char + agree_name record.issue_library_id.issue_state_class = 'on_meet' # 4. 董事会相关 @@ -397,7 +397,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_boss_char = clean_boss_char.removesuffix(suffix) clean_boss_char = clean_boss_char.replace('', '').replace('', '') - record.issue_library_id.boss_char = f'{clean_boss_char + agree_name}' + record.issue_library_id.boss_char = clean_boss_char + agree_name record.issue_library_id.issue_state_boss = 'on_meet' # 套开相关 @@ -414,7 +414,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) clean_party_char = clean_party_char.replace('', '').replace('', '') - record.issue_library_id.party_char = f'{clean_party_char + agree_name}' + record.issue_library_id.party_char = clean_party_char + agree_name record.issue_library_id.issue_state_party = 'on_meet' if is_push else 'will' elif (record.issue_library_id.is_class and @@ -427,7 +427,7 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_class_char = clean_class_char.removesuffix(suffix) clean_class_char = clean_class_char.replace('', '').replace('', '') - record.issue_library_id.class_char = f'{clean_class_char + agree_name}' + record.issue_library_id.class_char = clean_class_char + agree_name record.issue_library_id.issue_state_class = 'on_meet' if is_push else 'will' def unlink(self): diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index def33a6d7..d5507f318 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -466,6 +466,7 @@