fix: 去除cycle str
This commit is contained in:
parent
5e7a9ca4d8
commit
38ce07896a
|
@ -4,13 +4,15 @@ from rest_framework.decorators import action
|
|||
from rest_framework.response import Response
|
||||
from utils.sql import query_all_dict
|
||||
|
||||
|
||||
class YearSerializer(serializers.Serializer):
|
||||
year = serializers.IntegerField(label='年份')
|
||||
dept_name = serializers.CharField(label='单位名称', default='', allow_blank=True)
|
||||
dept_type_name = serializers.CharField(label='单位类型', default='2级公司', allow_blank=True)
|
||||
year = serializers.IntegerField(label="年份")
|
||||
dept_name = serializers.CharField(label="单位名称", default="", allow_blank=True)
|
||||
dept_type_name = serializers.CharField(label="单位类型", default="2级公司", allow_blank=True)
|
||||
|
||||
|
||||
class AnalyseViewSet(GenericViewSet):
|
||||
perms_map = {'post': '*'}
|
||||
perms_map = {"post": "*"}
|
||||
serializer_class = YearSerializer
|
||||
|
||||
def is_valid(self, request):
|
||||
|
@ -20,7 +22,7 @@ class AnalyseViewSet(GenericViewSet):
|
|||
vdata = sr.validated_data
|
||||
return vdata
|
||||
|
||||
@action(methods=['post'], detail=False)
|
||||
@action(methods=["post"], detail=False)
|
||||
def group_by_dept(self, request):
|
||||
"""
|
||||
质量目标集团统计
|
||||
|
@ -28,9 +30,9 @@ class AnalyseViewSet(GenericViewSet):
|
|||
质量目标集团统计
|
||||
"""
|
||||
vdata = self.is_valid(request)
|
||||
cycle_str = ''
|
||||
if vdata['year'] == 2023:
|
||||
cycle_str = 'AND task2.cycle in (3,4,5)'
|
||||
cycle_str = ""
|
||||
# if vdata['year'] == 2023:
|
||||
# cycle_str = 'AND task2.cycle in (3,4,5)'
|
||||
sql_str = f"""select task2.year as 年份,
|
||||
dept.name as 单位,
|
||||
dict.name as 单位类型,
|
||||
|
@ -86,4 +88,4 @@ pdept4.goal_value_b,
|
|||
pdept5.goal_value_b
|
||||
ORDER BY dept.sort
|
||||
"""
|
||||
return Response(query_all_dict(sql_str))
|
||||
return Response(query_all_dict(sql_str))
|
||||
|
|
Loading…
Reference in New Issue