zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shijing 2023-11-23 15:21:08 +08:00
parent 3bd80d75fb a7f008a541
commit 0b55682cf9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/apps/supervision/serializers.py
View File

@ -199,7 +199,7 @@ class ComplaintSerializer(ValidateMixin, serializers.ModelSerializer):
model = Complaint
class PtSerializer(ValidateMixin, serializers.ModelSerializer):
belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True)
class Meta(BaseMeta):
model = Pt

10
server/apps/supervision/views.py
View File

@ -669,7 +669,7 @@ class RcViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet):
"num_error": {'etype': 10},
"num_overdue": {'etype': 20}
}
filterset_fields = ['etype', 'task2do', 'task2do__belong_dept', 'task2do__task2__year']
filterset_fields = ['etype', 'task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype):
@ -715,7 +715,7 @@ class ComplaintViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet)
"num_complaint": {},
"num_complaint_10": {'is_satisfied': True}
}
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year']
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype):
data['complainant'] = sheet['b'+str(i)].value
@ -742,7 +742,7 @@ class PtViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet):
"num_pt": {},
"num_pt_10": {'result': 10}
}
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year']
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype):
data['name'] = sheet['b'+str(i)].value
@ -769,7 +769,7 @@ class RiskViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet):
count_dict = {
"num_risk": {}
}
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year']
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype):
data['content'] = sheet['b'+str(i)].value
@ -794,7 +794,7 @@ class OinspectViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet):
count_dict = {
"num_oinspect": {}
}
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year']
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype):
data['cate'] = self.get_enum(sheet['b'+str(i)].value, Oinspect.oinspect_cate_choices, i)