fix20230111

apps/inves_manage/project_manager.py

@@ -80,6 +80,7 @@ def search_project1():
             ProjectManagement.sign_time.notin_(['Null', '']),
             ProjectManagement.sign_time.notin_(['Null', '']),
             ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
             ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
             ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
             ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
+            ProjectManagement.project_stalker != '',
             ProjectManagement.district == district if district else text(''),
             ProjectManagement.district == district if district else text(''),
             ProjectManagement.development_area == development_area if development_area else text(''),
             ProjectManagement.development_area == development_area if development_area else text(''),
             ProjectManagement.investment_volume > investment_volume[0] if investment_volume else text(''),
             ProjectManagement.investment_volume > investment_volume[0] if investment_volume else text(''),
@@ -103,6 +104,7 @@ def search_project1():
             data = [{
             data = [{
                 "id": project_obj.id,
                 "id": project_obj.id,
                 "project_stalker": project_obj.project_stalker,
                 "project_stalker": project_obj.project_stalker,
+                "sign_time": project_obj.sign_time,
                 "project_name": project_obj.project_name,
                 "project_name": project_obj.project_name,
                 "district": project_obj.district,
                 "district": project_obj.district,
                 "development_area": project_obj.development_area,
                 "development_area": project_obj.development_area,

apps/inves_manage/view.py

@@ -41,7 +41,10 @@ def project_stalker():
     new_value_num = 0
     new_value_num = 0
     revenue_num = 0
     revenue_num = 0
     try:
     try:
-        project_obj_list = ProjectManagement.query.filter(district == district if district else text('')).all()
+        project_obj_list = ProjectManagement.query.filter(
+            ProjectManagement.district == district if district else text(''),
+            ProjectManagement.is_delete == 0
+        ).all()
         for project_obj in project_obj_list:
         for project_obj in project_obj_list:
             if project_obj.sign_time and project_obj.project_stalker == '进展顺利项目':
             if project_obj.sign_time and project_obj.project_stalker == '进展顺利项目':
                 stalker_num1 += 1
                 stalker_num1 += 1