1
This commit is contained in:
@@ -54,7 +54,7 @@ class AppletAttendance(Controller):
|
||||
latitude = address_id.latitude # 要求纬度
|
||||
if not att_longitude or not att_latitude:
|
||||
return_data = {
|
||||
'data': {"Msg": "经纬度必填", 'state': 'no', 'state_result': '超出范围'},
|
||||
'data': {"message": "经纬度必填", 'state': 'no', 'state_result': '超出范围'},
|
||||
'code': '200',
|
||||
'message': 'OK',
|
||||
}
|
||||
@@ -62,7 +62,7 @@ class AppletAttendance(Controller):
|
||||
card_rice = address_id.card_rice * 0.001 # 打卡范围
|
||||
if not self.is_within_radius_geopy(att_latitude, att_longitude, latitude, longitude, card_rice):
|
||||
return_data = {
|
||||
'data': {"Msg": "超出范围,不允许打卡", 'state': 'no', 'state_result': '超出范围'},
|
||||
'data': {"message": "超出范围,不允许打卡", 'state': 'no', 'state_result': '超出范围'},
|
||||
'code': '200',
|
||||
'message': 'OK',
|
||||
}
|
||||
@@ -151,4 +151,9 @@ class AppletAttendance(Controller):
|
||||
'checkin_time': checkin_time, # 打卡时间
|
||||
'source': 'mini_programs', # 打卡来源
|
||||
'location_title': location_title, # 打卡地点
|
||||
})
|
||||
})
|
||||
return_data = {
|
||||
'code': '200',
|
||||
'message': '推送成功',
|
||||
}
|
||||
return json.dumps(return_data)
|
||||
@@ -155,7 +155,7 @@ class YuthonWillTask(models.Model):
|
||||
if not employee_id.wecom_userid:
|
||||
raise UserError("请同步{}的企业微信".format(employee_id.name))
|
||||
menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的日程')])
|
||||
url = f'https://oa.thtzjt.com/web?login={employee_id.user_id.login}oauth_uid={employee_id.wecom_userid}#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=form&menu_id={menu_id.id}'
|
||||
url = f'https://oa.thtzjt.com/web?id={employee_id.user_id.id}oauth_uid={employee_id.wecom_userid}#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=form&menu_id={menu_id.id}'
|
||||
data_name = "事项名称: " + self.task_content + '\n'
|
||||
# data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
|
||||
data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'
|
||||
|
||||
Reference in New Issue
Block a user