no message

models/event_base.py

@@ -25,11 +25,12 @@ class EventBase(Base):
     event_description = Column(Text, comment='事件概要')
     recorded_by = Column(Integer, nullable=False, comment='记录用户ID')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
-    contact = Column(String(50), comment='联系人')
+    contact = Column(String(50), default='', server_default='', comment='联系人')
     region_code = Column(String(50), comment='地区代码')
     plan_id = Column(String(50), default='', server_default='', comment='匹配预案ID')
     casualties = Column(String(1), default='0', comment='伤亡情况上报（0未上报 1已上报）')
     response_level = Column(String(2), default='', server_default='', comment='响应等级')
+    create_time = Column(DateTime, default=datetime.now, comment='登记时间')
 
     class Config:
         orm_mode = True

routers/api/dutyManagement/duty.py

@@ -219,7 +219,7 @@ async def handover(
         if row is None:
             raise AppException("班次不存在")
         
-        if row.shift_status == 1 is None:
+        if row.shift_status == 1:
             raise AppException("班次已交班，不用重复操作")
         
         row.shift_status = 1

routers/api/eventManagement/event.py

@@ -46,10 +46,11 @@ async def create_event(
         eventId = db_event_management.get_next_event_id(db)
 
         # 未上报时清空伤亡人数
-        if body['casualties'] == '0':
+        if body['casualties'] == '0' or body['casualties'] == '':
             body['deaths'] = None
             body['injuries'] = None
             body['missing'] = None
+            body['casualties'] == '0'
 
         region_code = db_area.get_region_code_by_gps(db, body['longitude'], body['latitude'])
 
@@ -57,7 +58,8 @@ async def create_event(
             **body,
             event_code = eventId,
             recorded_by = user_id,
-            region_code = region_code
+            region_code = region_code,
+            create_time = datetime.now()
         )
         db.add(event_base)
         db.commit()
@@ -138,7 +140,8 @@ async def get_event_list(
                 "latitude": row.latitude,
                 "longitude": row.longitude,
                 "address": row.address,
-                "event_time": get_datetime_str(row.event_time)
+                "event_time": get_datetime_str(row.event_time),
+                "create_time": get_datetime_str(row.create_time),
             }
             for row in rows
         ]
@@ -255,6 +258,7 @@ async def get_event_detail(
                     "latitude": row.latitude,
                     "longitude": row.longitude,
                     "address": row.address,
+                    "create_time": get_datetime_str(row.create_time),
                     
                     # 关联预案
                     "plan_id": row.plan_id,
@@ -488,7 +492,8 @@ async def list_registered(
             "latitude": row.latitude,
             "longitude": row.longitude,
             "address": row.address,
-            "event_time": get_datetime_str(row.event_time)
+            "event_time": get_datetime_str(row.event_time),
+            "create_time": get_datetime_str(row.create_time)
         }
         for row in rows
     ]
@@ -518,7 +523,8 @@ async def list_active(
             "latitude": row.latitude,
             "longitude": row.longitude,
             "address": row.address,
-            "event_time": get_datetime_str(row.event_time)
+            "event_time": get_datetime_str(row.event_time),
+            "create_time": get_datetime_str(row.create_time)
         }
         for row in rows
     ]
@@ -571,7 +577,8 @@ async def update_event_id(
                 "latitude": row.latitude,
                 "longitude": row.longitude,
                 "address": row.address,
-                "event_time": get_datetime_str(row.event_time)
+                "event_time": get_datetime_str(row.event_time),
+                "create_time": get_datetime_str(row.create_time)
             }
 
             return {