Merge remote-tracking branch 'origin/dev' into dev

soong_workflow/models/soong_workflow_mixin.py

@@ -150,7 +150,7 @@ class SoongWorkflowMixin(models.AbstractModel):
             ]
             lg1 = record.log_ids.search(log_ids_domain)
             if lg1:
-                if lg1.approval_state == '2':
+                if any(l.approval_state == '2' for l in lg1):
                     record.is_done = True
 
     def _compute_is_confirm(self):

yuthon_catering/controllers/restaurant.py

@@ -51,15 +51,19 @@ class RestaurantController(Controller):
         _logger.info(f'---当前获取数据--{user_id}---')
         _logger.info(f'---当前获取数据--{employee.id}---{employee.name}')
         menu_date = kwargs.get('menu_date', date.today())
-        record = request.env['yuthon.catering'].create({
-            'date': menu_date,
-            'employee_id': employee.id,
-            'breakfast': kwargs.get('breakfast') == 'true',
-            'lunch': kwargs.get('lunch') == 'true',
-            'menu_day_id': kwargs.get('menu_id'),
-            'state': 'confirmed'
-        })
-        if record:
+        existing_record = request.env['yuthon.catering'].search([
+            ('date', '=', menu_date),
+            ('employee_id', '=', employee.id)
+        ], limit=1)
+        if not existing_record:
+            record = request.env['yuthon.catering'].create({
+                'date': menu_date,
+                'employee_id': employee.id,
+                'breakfast': kwargs.get('breakfast') == 'true',
+                'lunch': kwargs.get('lunch') == 'true',
+                'menu_day_id': kwargs.get('menu_id'),
+                'state': 'confirmed'
+            })
             catering_data = {
                 'id': record.id,
                 'user_id': employee.user_id.id,

yuthon_will_task/models/inherit_room_booking.py

@@ -28,11 +28,26 @@ class InheritRoomBooking(models.Model):
         task_time_ids = self.env['yuthon.task.time'].search([('name', '=', '30分钟')])
         new_record = super(InheritRoomBooking, self).create(vals)
         employee_list = []
+        user_list = []
         if new_record.room_users_ids:
+            user_list.extend(new_record.room_users_ids.ids)
             for user_id in new_record.room_users_ids:
                 if user_id.employee_id:
                     employee_list.append(user_id.employee_id.id)
 
+        if new_record.recorder_ids:
+            employee_list.extend(new_record.recorder_ids.ids)
+            for emp in new_record.recorder_ids:
+                if emp.user_id:
+                    user_list.append(emp.user_id.id)
+
+        if new_record.host:
+            employee_list.append(new_record.host.id)
+            if new_record.host.user_id:
+                user_list.append(new_record.host.user_id.id)
+        employee_list = list(set(employee_list))
+        user_list = list(set(user_list))
+
         def get_hour_selection(datetime_obj):
             if not datetime_obj:
                 return None
@@ -66,9 +81,9 @@ class InheritRoomBooking(models.Model):
             start_date = start_datetime.date()
             request_hour_from = get_hour_selection(new_record.start_datetime)
             request_hour_to = get_hour_selection(new_record.stop_datetime)
-            self.env['yuthon.will.task'].sudo().create({
+            task_id = self.env['yuthon.will.task'].sudo().create({
                 'name': new_record.name,
-                'users_ids': [(6, 0, new_record.room_users_ids.ids)],
+                'users_ids': [(6, 0, user_list)],
                 'employee_ids': [(6, 0, employee_list)],
                 'task_time_ids': [(6, 0, task_time_ids.ids)],
                 'start_date': start_date,
@@ -79,4 +94,5 @@ class InheritRoomBooking(models.Model):
                 'task_type': 'meet',
                 'task_state': 'will',
             })
+            task_id._onchange_employee_ids()
         return new_record