changes

Modules/Rating/RatingImpl.py

@@ -44,25 +44,33 @@ class RatingRecordImpl(object):
         report_date = kwargs["report_date"]
 
         rid = RatingUtils.in_progress_rating(cid)
-        assert not rid, "已有正在进行的评级"
 
-        business_info = DB_GUA.find_single_data(
+        # 继续评级
-            "企业数据",
+        if rid:
-            "工商信息",
+            return rid, "继续评级"
-            {"企业ID": cid},
-            ["企业名称", "所在省份", "所在城市"]
-        )
 
-        rating_record = RatingRecord()
+        # 开始评级
-        rating_record.rid = RatingUtils.make_new_rid()
+        else:
-        rating_record.report_date = report_date
-        rating_record.status = "进行"
-        rating_record.cid = cid
-        rating_record.company_name = business_info["企业名称"]
-        rating_record.province_and_city = business_info["所在省份"] + business_info["所在城市"]
 
-        DB_GUA.insert_single_data(
+            business_info = DB_GUA.find_single_data(
-            "评级数据",
+                "企业数据",
-            "评级记录",
+                "工商信息",
-            rating_record.fields_toggle()
+                {"企业ID": cid},
-        )
+                ["企业名称", "所在省份", "所在城市"]
+            )
+
+            rating_record = RatingRecord()
+            rating_record.rid = RatingUtils.make_new_rid()
+            rating_record.report_date = report_date
+            rating_record.status = "进行"
+            rating_record.cid = cid
+            rating_record.company_name = business_info["企业名称"]
+            rating_record.province_and_city = business_info["所在省份"] + business_info["所在城市"]
+
+            DB_GUA.insert_single_data(
+                "评级数据",
+                "评级记录",
+                rating_record.fields_toggle()
+            )
+
+            return rating_record.rid, "开始评级"

Modules/Rating/RatingRoutes.py

@@ -43,8 +43,8 @@ def create_routes(**kwargs):
 
     try:
         impl = RatingRecordImpl()
-        impl.create(cid=cid, report_date=report_date)
+        rid, info = impl.create(cid=cid, report_date=report_date)
-        return {"info": "新建评级成功"}
+        return {"info": info, "result": {"rid": rid}}
     except AssertionError as e:
         return {"info": e.__str__()}, 200
     except AttrCheckError as e: