|
|
@@ -53,15 +53,18 @@ async def get_company_list(
|
|
|
# 将查询结果转换为列表形式的字典
|
|
|
Companys_list = []
|
|
|
for company in Companys:
|
|
|
+ province = city_code_get_city_name(db, company.province_code)
|
|
|
+ city = city_code_get_city_name(db, company.city_code)
|
|
|
+ district = city_code_get_city_name(db, company.district_code)
|
|
|
company_info = {
|
|
|
"id": company.id,
|
|
|
"company_name": company.company_name,
|
|
|
- "province": company.province,
|
|
|
+ "province": province,
|
|
|
"province_code": company.province_code,
|
|
|
- "city": company.province,
|
|
|
- "city_code": company.province_code,
|
|
|
- "district": company.province,
|
|
|
- "district_code": company.province_code,
|
|
|
+ "city": city,
|
|
|
+ "city_code": company.city_code,
|
|
|
+ "district": district,
|
|
|
+ "district_code": company.district_code,
|
|
|
"company_address": company.company_address,
|
|
|
"responsible_person": company.responsible_person,
|
|
|
"company_type": company.company_type,
|
|
|
@@ -104,16 +107,18 @@ async def get_company(
|
|
|
if not company:
|
|
|
detail = "数据不存在"
|
|
|
return JSONResponse(status_code=404, content={"code":404,"msg":"数据不存在"})
|
|
|
-
|
|
|
+ province = city_code_get_city_name(db, company.province_code)
|
|
|
+ city = city_code_get_city_name(db, company.city_code)
|
|
|
+ district = city_code_get_city_name(db, company.district_code)
|
|
|
company_result = {
|
|
|
"id": company.id,
|
|
|
"company_name": company.company_name,
|
|
|
- "province": company.province,
|
|
|
+ "province": province,
|
|
|
"province_code": company.province_code,
|
|
|
- "city": company.province,
|
|
|
- "city_code": company.province_code,
|
|
|
- "district": company.province,
|
|
|
- "district_code": company.province_code,
|
|
|
+ "city": city,
|
|
|
+ "city_code": company.city_code,
|
|
|
+ "district": district,
|
|
|
+ "district_code": company.district_code,
|
|
|
"company_address": company.company_address,
|
|
|
"responsible_person": company.responsible_person,
|
|
|
"company_type": company.company_type,
|
|
|
@@ -148,11 +153,11 @@ async def create_company(
|
|
|
new_company = CompanyManagementBaseInfo(
|
|
|
id=new_guid(),
|
|
|
company_name = body['company_name'],
|
|
|
- province = body['province'],
|
|
|
+ province = city_code_get_city_name(db,body['province_code']),
|
|
|
province_code = body['province_code'],
|
|
|
- city = body['city'],
|
|
|
+ city = city_code_get_city_name(db,body['city_code']),
|
|
|
city_code = body['city_code'],
|
|
|
- district = body['district'],
|
|
|
+ district = city_code_get_city_name(db,body['district_code']),
|
|
|
district_code = body['district_code'],
|
|
|
company_address = body['company_address'],
|
|
|
responsible_person = body['responsible_person'],
|
|
|
@@ -180,6 +185,11 @@ def area_code_get_area_name(db,area_code):
|
|
|
if query:
|
|
|
return query.area_name
|
|
|
return ''
|
|
|
+def city_code_get_city_name(db,area_code):
|
|
|
+ query = db.query(GovdataCity).filter_by(id=area_code).first()
|
|
|
+ if query:
|
|
|
+ return query.name
|
|
|
+ return ''
|
|
|
@router.put('/company/update')
|
|
|
async def update_company(
|
|
|
db: Session = Depends(get_db),
|
|
|
@@ -201,17 +211,17 @@ async def update_company(
|
|
|
# company.province = body['province']
|
|
|
if 'province_code' in body:
|
|
|
company.province_code = body['province_code']
|
|
|
- company.province = area_code_get_area_name(db,body['province_code'])
|
|
|
+ company.province = city_code_get_city_name(db,body['province_code'])
|
|
|
# if 'city' in body:
|
|
|
# company.city = body['city']
|
|
|
if 'city_code' in body:
|
|
|
company.city_code = body['city_code']
|
|
|
- company.city = area_code_get_area_name(db,body['city_code'])
|
|
|
+ company.city = city_code_get_city_name(db,body['city_code'])
|
|
|
# if 'district' in body:
|
|
|
# company.district = body['district']
|
|
|
if 'district_code' in body:
|
|
|
company.district_code = body['district_code']
|
|
|
- company.district =area_code_get_area_name(db,body['district_code'])
|
|
|
+ company.district =city_code_get_city_name(db,body['district_code'])
|
|
|
if 'company_address' in body:
|
|
|
company.company_address = body['company_address']
|
|
|
if 'responsible_person' in body:
|
