seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/117/head
13621160019@163.com 2022-01-12 21:57:24 +08:00
parent c0116cbcef 064f47786d
commit 373168933e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
myems-api/README.md
View File

@ -1522,6 +1522,7 @@ Result
| contact | Object | Contact Object | | contact | Object | Contact Object |
| cost_center | Object | Cost Center Object | | cost_center | Object | Cost Center Object |
| description | string | Space description | | description | string | Space description |
| qrcode | string | QRCode in String |
* GET All Spaces * GET All Spaces
```bash ```bash

10
myems-api/core/space.py
View File

@ -97,7 +97,8 @@ class SpaceCollection:
"is_output_counted": bool(row['is_output_counted']), "is_output_counted": bool(row['is_output_counted']),
"contact": contact, "contact": contact,
"cost_center": cost_center, "cost_center": cost_center,
"description": row['description']} "description": row['description'],
"qrcode": "space:" + row['uuid']}
result.append(meta_result) result.append(meta_result)
cursor.close() cursor.close()
@ -355,7 +356,8 @@ class SpaceItem:
"is_output_counted": bool(row['is_output_counted']), "is_output_counted": bool(row['is_output_counted']),
"contact": contact, "contact": contact,
"cost_center": cost_center, "cost_center": cost_center,
"description": row['description']} "description": row['description'],
"qrcode": "space:" + row['uuid']}
resp.text = json.dumps(meta_result) resp.text = json.dumps(meta_result)
@ -783,6 +785,7 @@ class SpaceChildrenCollection:
result['current']['contact'] = contact_dict.get(row_current_space['contact_id'], None) result['current']['contact'] = contact_dict.get(row_current_space['contact_id'], None)
result['current']['cost_center'] = cost_center_dict.get(row_current_space['cost_center_id'], None) result['current']['cost_center'] = cost_center_dict.get(row_current_space['cost_center_id'], None)
result['current']['description'] = row_current_space['description'] result['current']['description'] = row_current_space['description']
result['current']['qrcode'] = 'space:' + row_current_space['uuid']
result['children'] = list() result['children'] = list()
@ -811,7 +814,8 @@ class SpaceChildrenCollection:
"is_output_counted": bool(row['is_output_counted']), "is_output_counted": bool(row['is_output_counted']),
"contact": contact, "contact": contact,
"cost_center": cost_center, "cost_center": cost_center,
"description": row['description']} "description": row['description'],
"qrcode": 'space:' + row['uuid']}
result['children'].append(meta_result) result['children'].append(meta_result)
cursor.close() cursor.close()