From d1a846fe88955405790118882fdf29a80c7c33cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 6 Aug 2026 18:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_issue/models/inherit_room_booking.py | 12 +++---- yuthon_issue/models/issue_library.py | 10 +++--- yuthon_issue/views/issue_library_views.xml | 38 +++++---------------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 58ff31ab4..964ccf365 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -177,16 +177,16 @@ class RoomBooking(models.Model): # 前置会议必须早于当前会议 if tb.start_datetime >= record.start_datetime: raise UserError( - f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime} ~ {tb.stop_datetime}）' - f'必须早于{record.meeting_type_id.name}会议时间（{record.start_datetime} ~ {record.stop_datetime}）！' + f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime + timedelta(hours=8)} ~ {tb.stop_datetime + timedelta(hours=8)}）' + f'必须早于{record.meeting_type_id.name}会议时间（{record.start_datetime + timedelta(hours=8)} ~ {record.stop_datetime + timedelta(hours=8)}）！' ) # 时间不能重叠 if _has_overlap(record.start_datetime, record.stop_datetime, tb.start_datetime, tb.stop_datetime): raise UserError( - f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime} ~ {tb.stop_datetime}）' - f'与{record.meeting_type_id.name}会议时间（{record.start_datetime} ~ {record.stop_datetime}）有重叠！' + f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime + timedelta(hours=8)} ~ {tb.stop_datetime + timedelta(hours=8)}）' + f'与{record.meeting_type_id.name}会议时间（{record.start_datetime + timedelta(hours=8)} ~ {record.stop_datetime + timedelta(hours=8)}）有重叠！' ) # ========== 班子会：党的 party_char 非空（党已上会），班子必须晚于党，且时间不能重叠 ========== @@ -458,20 +458,18 @@ class IssueMeetingLine(models.Model): meeting_type_name = str(record.meeting_booking_id.meeting_type_id.name).strip() suffix_list = ['(通过)', '(未通过)'] record.meeting_booking_id._check_name() + is_push = True # 统一处理通过/不通过标识 if record.decision_results == 'agree': is_agree = 'pass' agree_name = '(通过)' - is_push = True elif record.decision_results == 'rejected': is_agree = 'reject' agree_name = '(未通过)' - is_push = False else: is_agree = None agree_name = '' - is_push = False record.issue_library_id.is_push_depart = True record.issue_library_id.issue_state = False diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 639c3e815..0f9f4f2e3 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -712,9 +712,9 @@ class IssueLibrary(models.Model): issue_details = [] target_meeting_type_id = False meeting_priority = [ - ('is_party', 'is_party_passed', None), - ('is_class', 'is_class_passed', '班子'), - ('is_boss', 'is_boss_passed', '董事'), + ('is_party', 'party_char', None), + ('is_class', 'class_char', '班子'), + ('is_boss', 'boss_char', '董事'), ] def get_all_sub_departments(department): @@ -740,7 +740,7 @@ class IssueLibrary(models.Model): if not getattr(issue, field_flag, False): continue passed_result = getattr(issue, field_passed, '') - if passed_result in (False, 'reject'): + if passed_result == False: # 班子上会：党的 party_char 不能为空 if idx == 1 and ras.is_party == True: clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip() @@ -763,7 +763,7 @@ class IssueLibrary(models.Model): if meeting_type: target_meeting_type_id = meeting_type.id break - elif passed_result == 'pass': + else: continue # 天河粮储 套会逻辑 diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index b26a3e8c3..41db3d7aa 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -8,10 +8,6 @@ decoration-info="issue_state == 'will'" decoration-success="issue_state == 'done'" decoration-muted="issue_state == 'cancel'"> -
-
@@ -63,9 +59,6 @@ decoration-muted="issue_state == 'cancel'">
@@ -118,11 +111,6 @@ decoration-info="issue_state == 'will'" decoration-success="issue_state == 'done'" decoration-muted="issue_state == 'cancel'"> -
-
@@ -466,8 +454,6 @@
@@ -488,8 +474,8 @@ -