diff --git a/yuthon_hr_attendance/data/attendance_time_data.xml b/yuthon_hr_attendance/data/attendance_time_data.xml
index 3432f0d7d..e875e00a7 100644
--- a/yuthon_hr_attendance/data/attendance_time_data.xml
+++ b/yuthon_hr_attendance/data/attendance_time_data.xml
@@ -18,7 +18,7 @@
             <field name="name">定时任务:粮库上班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.card_lc_remind_in()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -31,12 +31,12 @@
             <field name="name">定时任务:粮储下班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.card_lc_remind_out()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
-            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 16:00:00')"/>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 16:30:00')"/>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
@@ -44,34 +44,7 @@
             <field name="name">定时任务:粮库值班上班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
-            <field eval="True" name="active"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 08:20:00')"/>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-        </record>
-        <record forcecreate="True" id="card_shift_remind_time_out" model="ir.cron">
-            <field name="name">定时任务:粮储值班下班打卡提醒</field>
-            <field name="model_id" ref="model_hr_attendance"/>
-            <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
-            <field eval="True" name="active"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="nextcall" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 16:30:00')"/>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-        </record>
-    <!--工程部打卡提醒-->
-        <record forcecreate="True" id="card_gc_white_remind_time_in" model="ir.cron">
-            <field name="name">定时任务:工程部白班上班打卡提醒</field>
-            <field name="model_id" ref="model_hr_attendance"/>
-            <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.card_lc_shift_remind_in()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -80,11 +53,64 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
+        <record forcecreate="True" id="card_lc_shift_remind_time" model="ir.cron">
+            <field name="name">定时任务:粮库值班打卡提醒</field>
+            <field name="model_id" ref="model_hr_attendance"/>
+            <field name="state">code</field>
+            <field name="code">model.card_lc_shift_remind()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 22:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+        <record forcecreate="True" id="card_lc_shift_remind_time_out" model="ir.cron">
+            <field name="name">定时任务:粮储值班下班打卡提醒</field>
+            <field name="model_id" ref="model_hr_attendance"/>
+            <field name="state">code</field>
+            <field name="code">model.card_lc_shift_remind_out()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 8:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+    <!--工程部打卡提醒-->
+        <record forcecreate="True" id="card_gc_white_remind_time_in" model="ir.cron">
+            <field name="name">定时任务:工程部白班上班打卡提醒</field>
+            <field name="model_id" ref="model_hr_attendance"/>
+            <field name="state">code</field>
+            <field name="code">model.gc_white_in_remind()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 07:50:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+        <record forcecreate="True" id="card_gc_white_remind_time_shift" model="ir.cron">
+            <field name="name">定时任务:工程部白班值班打卡提醒</field>
+            <field name="model_id" ref="model_hr_attendance"/>
+            <field name="state">code</field>
+            <field name="code">model.gc_white_shift_remind()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 12:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
         <record forcecreate="True" id="card_gc_white_remind_time_out" model="ir.cron">
             <field name="name">定时任务:工程部白班下班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.gc_white_out_remind()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -97,7 +123,7 @@
             <field name="name">定时任务:工程部中值夜班上班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.gc_night_remind_in()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -106,16 +132,29 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
-        <record forcecreate="True" id="card_gc_night_remind_time_out" model="ir.cron">
-            <field name="name">定时任务:工程部中值夜班下班打卡提醒</field>
+        <record forcecreate="True" id="card_gc_night_remind_time_shift" model="ir.cron">
+            <field name="name">定时任务:工程部中值夜班值班打卡提醒</field>
             <field name="model_id" ref="model_hr_attendance"/>
             <field name="state">code</field>
-            <field name="code">model.card_remind()</field>
+            <field name="code">model.gc_night_remind_shift()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
-            <field name="nextcall" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 08:00:00')"/>
+            <field name="nextcall" eval="(DateTime.now()).strftime('%Y-%m-%d 22:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+        <record forcecreate="True" id="card_gc_night_remind_time_out" model="ir.cron">
+            <field name="name">定时任务:工程部中值夜班下班打卡提醒</field>
+            <field name="model_id" ref="model_hr_attendance"/>
+            <field name="state">code</field>
+            <field name="code">model.gc_night_remind_out()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="nextcall" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 7:30:00')"/>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index f2838738c..5baa37205 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -298,6 +298,85 @@ class HrAttendance(models.Model):
             if user.end_datetime.date() == fields.date.today():
                 self.card_out_comment(user.resource_id.employee_id)
 
+    # 工程部 - 白班 白值
+    def gc_white_in_remind(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', 'in', ['白班', '白班中午值班'])])
+        for user in ba_up_users:
+            if user.start_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    def gc_white_shift_remind(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '白班中午值班')])
+        for user in ba_up_users:
+            self.card_in_comment(user.resource_id.employee_id)
+
+    def gc_white_out_remind(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', 'in', ['白班', '白班中午值班'])])
+        for user in ba_up_users:
+            if user.end_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    # 工程部-中值夜
+    def gc_night_remind_in(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
+        for user in ba_up_users:
+            if user.start_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    def gc_night_remind_shift(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
+        for user in ba_up_users:
+            self.card_in_comment(user.resource_id.employee_id)
+
+    def gc_night_remind_out(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
+        for user in ba_up_users:
+            if user.end_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    # 粮储-白班
+    def card_lc_remind_in(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '联安粮储'), ('template_id.planning_name', '=', '粮库白班')])
+        for user in ba_up_users:
+            if user.start_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    def card_lc_remind_out(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '粮库白班')])
+        for user in ba_up_users:
+            if user.end_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    # 粮储-值班
+    def card_lc_shift_remind_in(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '粮库值班')])
+        for user in ba_up_users:
+            if user.start_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+    def card_lc_shift_remind_time(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '粮库值班')])
+        for user in ba_up_users:
+            self.card_in_comment(user.resource_id.employee_id)
+
+    def card_lc_shift_remind_out(self):
+        ba_up_users = self.env['planning.slot'].search(
+            [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '粮库值班')])
+        for user in ba_up_users:
+            if user.end_datetime.date() == fields.date.today():
+                self.card_in_comment(user.resource_id.employee_id)
+
+
     # def card_remind(self):
     #     today = datetime.today()
     #     tomorrow = today + timedelta(days=1)