diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 9b20e8c5c..e565e7285 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -15,7 +15,6 @@ class RoomBooking(models.Model): @api.constrains('name') def _check_name(self): - self.name = '会议' for record in self: if record.issue_meeting_line_ids: for meet in record.issue_meeting_line_ids: @@ -65,10 +64,6 @@ class RoomBooking(models.Model): def end_approval(self): self.write({'work_end': True}) - if self.issue_meeting_line_ids: - for meet in self.issue_meeting_line_ids: - if meet.issue_library_id: - meet.issue_library_id.issue_state = 'on_meet' def bottom_meeting_approval(self): library_data = [] @@ -102,12 +97,12 @@ class RoomBooking(models.Model): for line in main_record.issue_meeting_line_ids: if not line.issue_library_id: continue - existing_line = self.env['issue.library.room.line'].search([ - ('issue_library_id', '=', line.issue_library_id.id), - ('room_booking_id', '=', main_record.id), - ], limit=1) - if existing_line: - continue + # existing_line = self.env['issue.library.room.line'].search([ + # ('issue_library_id', '=', line.issue_library_id.id), + # ('room_booking_id', '=', main_record.id), + # ], limit=1) + # if existing_line: + # continue self.env['issue.library.room.line'].create({ 'issue_library_id': line.issue_library_id.id, 'room_booking_id': main_record.id, @@ -161,8 +156,6 @@ class IssueMeetingLine(models.Model): agree_name = '(未通过)' is_push = False - - # 2. 党委会相关:先清理旧后缀,再拼接新后缀 if '党' in meeting_type_name: if self.issue_library_id.is_class: @@ -177,15 +170,15 @@ class IssueMeetingLine(models.Model): for suffix in suffix_list: clean_party_char = clean_party_char.removesuffix(suffix) self.issue_library_id.party_char = clean_party_char + agree_name - - if self.issue_library_id.is_boss == False and self.issue_library_id.is_class == False: + if is_push: self.issue_library_id.issue_state_party = 'on_meet' + else: + self.issue_library_id.issue_state_party = 'will' # 3. 班子会相关:先清理旧后缀,再拼接新后缀 if '班子' in meeting_type_name: if self.issue_library_id.is_boss: self.issue_library_id.is_push_boss = is_push - self.issue_library_id.is_class_passed = is_agree original_class_char = self.issue_library_id.class_char or "" # 清理原有后缀 @@ -194,13 +187,13 @@ class IssueMeetingLine(models.Model): clean_class_char = clean_class_char.removesuffix(suffix) # 拼接新后缀 self.issue_library_id.class_char = clean_class_char + agree_name - - if self.issue_library_id.is_boss: + if is_push: self.issue_library_id.issue_state_class = 'on_meet' + else: + self.issue_library_id.issue_state_class = 'will' # 4. 董事会相关:先清理旧后缀,再拼接新后缀 if '董事' in meeting_type_name: - self.issue_library_id.issue_state_boss = 'on_meet' self.issue_library_id.is_push_boss = is_push self.issue_library_id.is_boss_passed = is_agree original_boss_char = self.issue_library_id.boss_char or "" @@ -210,3 +203,7 @@ class IssueMeetingLine(models.Model): clean_boss_char = clean_boss_char.removesuffix(suffix) # 拼接新后缀 self.issue_library_id.boss_char = clean_boss_char + agree_name + if is_push: + self.issue_library_id.issue_state_boss = 'on_meet' + else: + self.issue_library_id.issue_state_boss = 'will' diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 892a84858..be662b1a5 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -27,11 +27,11 @@ class IssueLibrary(models.Model): ('on_approval', '已上会审批'), ('cancel', '已取消')], default='to_do', string="议题状态") issue_state_party = fields.Selection([('',''), ('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='', string="会议状态") + default='will', string="会议状态") issue_state_class = fields.Selection([('',''), ('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='', string="会议状态") + default='will', string="会议状态") issue_state_boss = fields.Selection([('',''), ('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')], - default='', string="会议状态") + default='will', string="会议状态") is_party = fields.Boolean(string="党总支", store=True) party_char = fields.Char(string=' ')