!1067 1

Merge pull request !1067 from 李鹏宇/dev

yuthon_property/wizard/yuthon_property_wizard.py

@@ -141,7 +141,9 @@ class YuthonPropertyWizard(models.Model):
             company_id = self.env['yuthon.property.company'].create({
                 'name': row[2].value,
             })
-        purpose_id = self.env['yuthon.resource.purpose'].search([('name', '=', row[7].value)])
+        purpose_id = self.env['yuthon.resource.purpose'].search([('name', '=', row[9].value)])
+        tenure_type_dict = {'自有': 'self', '代管': 'agency', '': ''}
+        tenure_type = tenure_type_dict.get(row[3].value, '')
         admin_id = self.env['res.users'].search([('name', '=', row[4].value)])
         management_area = row[6].value
         rent_area = row[7].value
@@ -153,6 +155,7 @@ class YuthonPropertyWizard(models.Model):
                 'yuthon_property_id':property_id.id,
                 'company_id':company_id.id,
                 'purpose_id':purpose_id.id,
+                'tenure_type':tenure_type,
                 'management_area':management_area,
                 'rent_area':rent_area,
                 'admin_id':admin_id.id,