fix20221229

apps/view_index/view.py

@@ -28,17 +28,29 @@ def industry_distribute():
 
 
     try:
     try:
         indu_obj_list = IndustryDistribute.query.all()
         indu_obj_list = IndustryDistribute.query.all()
+        industry_num_list = []
+        data_list = []
         if flag == 1:
         if flag == 1:
-            data_dic = [{
-                "industry_name": i.industry_name,
-                "industry_num": i.industry_num,
-            } for i in indu_obj_list]
+            for i in indu_obj_list:
+                if i.industry_num:
+                    industry_num_list.append(i.industry_num)
+                data_dic = {
+                    "industry_name": i.industry_name,
+                    "industry_num": i.industry_num if i.industry_num else 0
+                }
+                data_list.append(data_dic)
+            # data = {"data": data_list, "total": sum(industry_num_list)}
         if flag == 2:
         if flag == 2:
-            data_dic = [{
-                "industry_name": i.industry_name,
-                "investment_volume": i.investment_volume,
-            } for i in indu_obj_list]
-        return jsonify(code=RET.OK, data=data_dic, msg='查询成功!')
+            for i in indu_obj_list:
+                if i.industry_num:
+                    industry_num_list.append(i.investment_volume)
+                data_dic = {
+                    "industry_name": i.industry_name,
+                    "investment_volume": i.investment_volume
+                }
+                data_list.append(data_dic)
+        data = {"data": data_list, "total": round(sum(industry_num_list), 2)}
+        return jsonify(code=RET.OK, data=data, msg='查询成功!')
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库错误")
         return jsonify(code=RET.DBERR, msg="数据库错误")