diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index 215d40db2..e4156e504 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -24,15 +24,11 @@ class AppletAttendance(Controller):
_logger.info("----------------/ro/base/user/login/v1---------接口收到响应-------")
password = kw.get('password')
login = kw.get('login')
-
try:
uid = request.session.authenticate(request.env.cr.dbname, login, password)
except Exception as e:
_logger.info(f"接口登录失败: {e}")
- # 测试
- # 校验手机号是否存在于承租方.
- property_tenant_information = request.env['property.tenant.information'].sudo().search(
- [('phone', '=', login)])
+ property_tenant_information = request.env['property.tenant.information'].sudo().search([('phone', '=', login)])
if not property_tenant_information:
return_data = {'data': {}, 'code': 401, 'message': '用户名或密码错误'}
else:
@@ -136,7 +132,7 @@ class AppletAttendance(Controller):
Wifi_bool = kw['wifi_name'] in wifi_name_list
address_bool = self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude,
address_id.longitude, card_rice)
- _logger.info(f"\nwifi: {Wifi_bool} 地址:{address_bool}_______")
+ _logger.info(f"\nwifi: {Wifi_bool} wifi_name: {kw['wifi_name']} 地址:{address_bool}__")
message = '可以打卡'
state = 'yes'
break
@@ -712,7 +708,14 @@ class AppletAttendance(Controller):
})
record = request.env(user=SUPERUSER_ID)[model_name].search([('name', '=', code)], limit=1)
if record:
- record.write({'current_meter': dosage})
+ record.write({'dosage': dosage,
+ 'is_push': False
+ })
+ record.last_dosage += record.current_meter
+ record.current_meter = 0
+ record.last_meter = datetime.now()
+ record.meter_date = None
+
message = f"成功更新{meter_type_name}用量: {code}"
else:
message = f"未找到{meter_type_name}记录: {code}"
@@ -726,6 +729,7 @@ class AppletAttendance(Controller):
@route('/yuthon/peoperty/accounts/receivable', methods=['POST'], type='http', auth='none', cors='*', csrf=False)
def yuthon_peoperty_accounts_receivable(self, **kw):
+ _logger.info("-----/yuthon/peoperty/accounts/receivable---------接口收到请求-----")
phone = kw.get('phone')
if not phone:
return json.dumps({
@@ -733,11 +737,6 @@ class AppletAttendance(Controller):
'code': '400',
'message': '请输入手机号'
})
-
- # 查询该手机号的最近3个月的数据
- # 先查询承租方
- # 查询最近三个月(计算出从现在前3个月的月初,不需要合并查询,只要查询3个月记录即可)
- # 未收合计
lessee_records = request.env(user=SUPERUSER_ID)['property.tenant.information'].search([('phone', '=', phone)])
if not lessee_records:
return json.dumps({
diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index 7f46c2fc4..89c1b3fe0 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -543,7 +543,7 @@ class PropertyRentList(models.Model):
# 处理合同月
if contract.cycle_mode == 'fixed_monthly':
# 计算理论应收结束日（当月最后一天）
- next_month_first = (due_date_obj.replace(day=1) + timedelta(days=32)).replace(day=1)
+ next_month_first = (due_date_obj+ relativedelta(months=1))
theoretical_end = next_month_first - timedelta(days=1)
# 处理自然月
elif contract.cycle_mode == 'floating_monthly':
@@ -599,7 +599,7 @@ class PropertyRentList(models.Model):
# 处理合同月
if contract.cycle_mode == 'fixed_monthly':
# 计算理论应收结束日（当月最后一天）
- next_month_first = (due_date_obj.replace(day=1) + timedelta(days=32)).replace(day=1)
+ next_month_first = (due_date_obj+ relativedelta(months=1))
theoretical_end = next_month_first - timedelta(days=1)
# 处理自然月
elif contract.cycle_mode == 'floating_monthly':
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 579f1ecdc..82a74eb24 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -561,16 +561,16 @@
- 至
-
- 至
-