fix

apps/view_atlas/view.py

@@ -423,44 +423,54 @@ def industry_policy():
             if policy_level == 1:  # 国家级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="国家级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 2:  # 省级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="省级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 3:  # 市级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="市级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 4:  # 区县
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="区县")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 5:  # 开发区
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="开发区")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
         if industry_level == 2:
             if policy_level == 1:  # 国家级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="国家级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 2:  # 省级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="省级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 3:  # 市级
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="市级")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 4:  # 区县
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="区县")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             if policy_level == 5:  # 开发区
                 indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="开发区")
                 size = indu_policy.count()  # 分页总数
-                indu_policy = indu_policy.paginate(page, perpage).items
+                # indu_policy = indu_policy.
+                indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
     except Exception as e:
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
@@ -470,7 +480,7 @@ def industry_policy():
             "id": i.id,
             "name": i.name,
             "org": i.org,
-            "pubdate": (i.pubdate).strftime("%Y-%m-%d %H:%M:%S")
+            "pubdate": (i.pubdate).strftime("%Y-%m-%d")
         } for i in indu_policy],
         "size": size
     }