diff --git a/CompanyObject/CompanyImpl.py b/CompanyObject/CompanyImpl.py index c3a5c0a..bc3cead 100644 --- a/CompanyObject/CompanyImpl.py +++ b/CompanyObject/CompanyImpl.py @@ -198,7 +198,7 @@ class CompanyImpl(Company): "企业数据", "经营风险分析", {"企业ID": self.cid}, - ["评价ID", "更新日期", "风险级别", "风险分数", "列入失信名单", "合规风险", "经营风险", "周边风险", "变更记录"], + ["评价ID", "更新日期", "风险级别", "风险数量", "风险分数", "列入失信名单", "合规风险", "经营风险", "周边风险", "变更记录"], {"更新日期": -1} ) @@ -208,10 +208,11 @@ class CompanyImpl(Company): operating_risk.update_time = result["更新日期"] operating_risk.risk_level = result['风险级别'] operating_risk.risk_score = result['风险分数'] + operating_risk.risk_num = result['风险数量'] operating_risk.in_untrustworthy_list = result['列入失信名单'] - operating_risk.compliance_risk = self.instance_list_to_set(instance=OperatingRisk().InfluenceObj, data=result['合规风险']) - operating_risk.operating_risk = self.instance_list_to_set(instance=OperatingRisk().InfluenceObj, data=result['经营风险']) - operating_risk.peripheral_risk = self.instance_list_to_set(instance=OperatingRisk().DetailObj, data=result['周边风险']) - operating_risk.change_records = self.instance_list_to_set(instance=OperatingRisk().InfluenceObj, data=result['变更记录']) + operating_risk.compliance_risk = self.instance_list_to_set(instance=OperatingRisk.InfluenceObj, data=result['合规风险']) + operating_risk.operating_risk = self.instance_list_to_set(instance=OperatingRisk.InfluenceObj, data=result['经营风险']) + operating_risk.peripheral_risk = self.instance_list_to_set(instance=OperatingRisk.DetailObj, data=result['周边风险']) + operating_risk.change_records = self.instance_list_to_set(instance=OperatingRisk.InfluenceObj, data=result['变更记录']) self.operating_risk_analysis = operating_risk diff --git a/CompanyObject/CompanyObj.py b/CompanyObject/CompanyObj.py index 634a70f..e391d15 100644 --- a/CompanyObject/CompanyObj.py +++ b/CompanyObject/CompanyObj.py @@ -447,6 +447,7 @@ class OperatingRisk(SpecObject): rid = ValidateAttr(field='rid', type=str, length=8, default='') risk_level = ValidateAttr(field='risk_level', type=str, in_list=['高', '较高', '中等', '警示', '低'], default='') risk_score = ValidateAttr(field='risk_score', type=[int, float], default='') + risk_num = ValidateAttr(field="risk_num", type=int) in_untrustworthy_list = ValidateAttr(field='in_untrustworthy_list', type=str, in_list=["是", "否"], default='') compliance_risk = ValidateAttr(field='compliance_risk', instance_list=InfluenceObj) operating_risk = ValidateAttr(field='operating_risk', instance_list=InfluenceObj) @@ -459,6 +460,7 @@ class OperatingRisk(SpecObject): "rid": "评价ID", "risk_level": "风险级别", "risk_score": "风险分数", + "risk_num": "风险数量", "in_untrustworthy_list": "列入失信名单", "compliance_risk": "合规风险统计", "operating_risk": "经营风险统计", @@ -467,7 +469,7 @@ class OperatingRisk(SpecObject): } def dict_to_return(self): - _dict_ = self.dict_to_show(columns=["更新日期", "风险分数", "风险级别", "列入失信名单", "合规风险统计", "经营风险统计", "周边风险统计", "变更记录统计"]) + _dict_ = self.dict_to_show(columns=["更新日期", "风险分数", "风险级别", "风险数量", "列入失信名单", "合规风险统计", "经营风险统计", "周边风险统计", "变更记录统计"]) _dict_["合规风险"] = _dict_.pop("合规风险统计") _dict_["经营风险"] = _dict_.pop("经营风险统计") _dict_["周边风险"] = _dict_.pop("周边风险统计")