Browse Source

241126-2代码。

baoyubo 7 months ago
parent
commit
3a79463c70
2 changed files with 10 additions and 2 deletions
  1. 1 0
      models/pattern_base.py
  2. 9 2
      routers/api/pattern/__init__.py

+ 1 - 0
models/pattern_base.py

@@ -59,6 +59,7 @@ class TpPatternWSGroupList(Base):
     group_name = Column(String(255), nullable=True, comment='分组名称')
     pattern_id = Column(String(255), nullable=True, comment='图案id')
     pattern_name = Column(String(255), comment='图案名称')
+    visible = Column(String(10), default='0', comment='是否显示')
     del_flag = Column(String(1), default='0', comment='删除标志(0代表存在 2代表删除)')
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
     update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')

+ 9 - 2
routers/api/pattern/__init__.py

@@ -692,7 +692,7 @@ async def get_pattern_list(
                 "group_name":group.group_name,
                 "pattern_id":group.pattern_id,
                 "pattern_name":group.pattern_name,
-                "visible":"0",
+                "visible":group.visible,
                 "bz_list":[],
                 "create_time": group.create_time.strftime('%Y-%m-%d %H:%M:%S')
             }
@@ -746,7 +746,7 @@ async def get_pattern_list(
             "group_name":group.group_name,
             "pattern_id":group.pattern_id,
             "pattern_name":group.pattern_name,
-            "visible":"0",
+            "visible":group.visible,
             "bz_list":[],
             "create_time": group.create_time.strftime('%Y-%m-%d %H:%M:%S')
         }
@@ -806,6 +806,8 @@ async def update_group_visible(
     try:
         group_id = body['group_id']
         visible = body['visible']
+        group0 = group_id_get_tp_pattern_ws_group_info(group_id,db)
+        # print(visible,group0.visible)
         if visible=='0':#1显示 0隐藏
             query = db.query(TpPatternWSList)
             query = query.filter(TpPatternWSList.del_flag!='2')
@@ -820,7 +822,11 @@ async def update_group_visible(
                 # print(group.group_id)
                 visible = '0'
                 if group.group_id==group_id:
+                    # group.visible='1'
+                    # db.commit()
+                    # print(group.group_id,group_id, group.visible)
                     visible='1'
+                group.visible=visible
                 query = db.query(TpPatternWSList)
                 query = query.filter(TpPatternWSList.del_flag != '2')
                 query = query.filter(TpPatternWSList.pattern_id == group.group_id)
@@ -828,6 +834,7 @@ async def update_group_visible(
                 for info in bz_list:
                     # print(info.visible)
                     info.visible = visible
+        # group0.visible=visible
         db.commit()
         return {"code": 200, "msg": "查询成功", "data": None
                 }