fix20230111

apps/inves_manage/project_manager.py

@@ -881,10 +881,10 @@ def shanxi_data_list():
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
     req_dic = request.get_json()
     req_dic = request.get_json()
     year = req_dic['year']
     year = req_dic['year']
-    current_year = datetime.now().year
+    # current_year = datetime.now().year
     try:
     try:
         target_obj_list = ShanxiTarget.query.filter(
         target_obj_list = ShanxiTarget.query.filter(
-            ShanxiTarget.data_time.like('%{}%'.format(year) if year else current_year),
+            ShanxiTarget.data_time.like('%{}%'.format(year) if year else year),
             ShanxiTarget.is_delete == 0
             ShanxiTarget.is_delete == 0
         ).all()
         ).all()
         data_time_set = set(target_obj.data_time for target_obj in target_obj_list)
         data_time_set = set(target_obj.data_time for target_obj in target_obj_list)
@@ -1001,13 +1001,13 @@ def shanxi_data_detail():
     req_dic = request.get_json()
     req_dic = request.get_json()
     data_time = req_dic["data_time"]
     data_time = req_dic["data_time"]
     try:
     try:
-        if not data_time:
-            # 获取最新的时间周期
-            data_obj = ShanxiTarget.query.order_by(sqlalchemy.desc(ShanxiTarget.id)).first()
-            data_time = data_obj.data_time
-            target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
-        else:
-            target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
+        # if not data_time:
+        #     # 获取最新的时间周期
+        #     data_obj = ShanxiTarget.query.order_by(sqlalchemy.desc(ShanxiTarget.id)).first()
+        #     data_time = data_obj.data_time
+        #     target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
+        # else:
+        target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
         data = [{
         data = [{
             "id": target_obj.id,
             "id": target_obj.id,
             "data_time": target_obj.data_time,
             "data_time": target_obj.data_time,