no message

models/event_base.py

@@ -81,6 +81,8 @@ class EventCheckin(Base):
     sign_time = Column(DateTime, default=datetime.now, comment='签名时间')
     yzy_account = Column(String, default="", comment='粤政易账号')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    duties = Column(String, default="", comment='职务')
+    phone = Column(String, default="", comment='联系方式')
 
     class Config:
         orm_mode = True

routers/api/eventManagement/checkin.py

@@ -50,6 +50,57 @@ async def get_event_list(
     return StreamingResponse(BytesIO(img_data), media_type="image/png")
 
 
+@router.post("/getInfo")
+async def getInfo(
+    request: Request, 
+    db: Session = Depends(get_db), 
+    body = Depends(remove_xss_json), 
+    user_id = Depends(valid_access_token)
+):
+    event_id = body['event_id']
+
+    row = db.query(SysUser).filter(SysUser.user_id == user_id).first()
+    user_info = get_model_dict(row)
+
+    row = db.query(SysDept).filter(SysDept.dept_id == user_info['dept_id']).first()
+    dept_info = get_model_dict(row)
+
+    user_name = user_info['user_name']
+    nick_name = user_info['nick_name']
+    dept_id = user_info['dept_id']
+    dept_name = dept_info['dept_name']
+    duties = ''
+    sign_time = ''
+    phone = user_info['phonenumber']
+
+    row = db.query(EventCheckin).filter(and_(EventCheckin.event_id == event_id, EventCheckin.user_id == user_id, EventCheckin.del_flag == '0')).first()
+    if row is not None:
+        check_info = get_model_dict(row)
+        user_name = check_info['user_name']
+        nick_name = check_info['nick_name']
+        dept_id = check_info['dept_id']
+        dept_name = check_info['dept_name']
+        duties = check_info['duties']
+        sign_time = get_datetime_str(check_info['sign_time'])
+        phone = check_info['phone']
+        print('---------------', sign_time)
+
+    return {
+        'code': 200,
+        'msg': '查询成功',
+        'data': {
+            'user_id': user_info['user_id'],
+            'user_name': user_name,
+            'nick_name': nick_name,
+            'dept_id': dept_id,
+            'dept_name': dept_name,
+            'duties': duties,
+            'sign_time': sign_time,
+            'phone': phone
+        }
+    }
+
+
 @router.post("/check")
 async def check(
     request: Request, 
@@ -57,16 +108,20 @@ async def check(
     body = Depends(remove_xss_json), 
     user_id = Depends(valid_access_token)
 ):
+    time.sleep(3)
+
     row = db.query(SysUser).filter(SysUser.user_id == user_id).first()
     user_info = get_model_dict(row)
     dept_id = user_info['dept_id']
+    yzy_account = user_info['yzy_account']
 
     row = db.query(SysDept).filter(SysDept.dept_id == dept_id).first()
     dept_info = get_model_dict(row)
     dept_name = dept_info['dept_name']
 
     event_id = body['event_id']
-    yzy_account = body['yzy_account']
+    phone = body['phone']
+    duties = body['duties']
 
     row = db.query(EventCheckin).filter(and_(EventCheckin.event_id == event_id, EventCheckin.user_id == user_id)).first()
     if row is None:
@@ -79,6 +134,8 @@ async def check(
             dept_name = dept_name,
             sign_time = datetime.now(),
             yzy_account = yzy_account,
+            duties = duties,
+            phone = phone,
             del_flag = '0'
         )
         db.add(event_checkin)
@@ -86,28 +143,32 @@ async def check(
 
         return {
             'code': 200,
-            'msg': '签名成功'
+            'msg': '签到成功'
         }
     
     else:
         if row.del_flag == '0':
             row.sign_time = datetime.now()
+            row.duties = duties,
+            row.phone = phone,
             row.del_flag = '1'
             db.commit()
 
             return {
                 'code': 200,
-                'msg': '签出成功'
+                'msg': '签退成功'
             }
             
         else:
             row.sign_time = datetime.now()
+            row.duties = duties,
+            row.phone = phone,
             row.del_flag = '0'
             db.commit()
 
             return {
                 'code': 200,
-                'msg': '签名成功'
+                'msg': '签到成功'
             }
 
     
@@ -139,7 +200,8 @@ async def get_event_list(
                 "dept_id": row.dept_id,
                 "dept_name": row.dept_name,
                 "sign_time": get_datetime_str(row.sign_time),
-                "yzy_account": row.yzy_account
+                "yzy_account": row.yzy_account,
+                "duties": row.duties
             }
             for row in rows
         ]