|
@@ -159,11 +159,11 @@ def jsonResToDict(json_res):
|
|
|
input_factors[factor_info["id"]] = factor_info
|
|
|
# 循环遍历模板
|
|
|
for factorTemplate in factorTemplates:
|
|
|
- factorId = factorTemplate["factor_id"]
|
|
|
+ factorId = factorTemplate["id"]
|
|
|
if factorId in input_factors:
|
|
|
res["yxyz"].append(input_factors[factorId])
|
|
|
else:
|
|
|
- factorTemplate["condition_info"]=json.loads(factorTemplate["condition_info"])
|
|
|
+ factorTemplate["conditionInfo"]=json.loads(factorTemplate["conditionInfo"])
|
|
|
res["yxyz"].append(factorTemplate)
|
|
|
return res
|
|
|
|
|
@@ -184,7 +184,7 @@ def getFactorByName(name):
|
|
|
|
|
|
def getTemplateByCode(code):
|
|
|
with conn.cursor(cursor_factory=DictCursor) as cur:
|
|
|
- sql = "SELECT * FROM base.t_fzss_fzxz_factor_temp WHERE land_type_code = %s"
|
|
|
+ sql = 'SELECT factor_id as id,factor_name as name,factor_bsm as bsm,condition_info as "conditionInfo" FROM base.t_fzss_fzxz_factor_temp WHERE land_type_code = %s'
|
|
|
complete_sql = cur.mogrify(sql, (code,)).decode('utf-8')
|
|
|
logger.info(f"Executing SQL: {complete_sql}")
|
|
|
cur.execute(sql, (code,))
|