|
@@ -70,7 +70,7 @@ class FeedBackView(View):
|
|
|
return response.json(444, 'page,line')
|
|
|
|
|
|
fb_qs = FeedBackModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line]. \
|
|
|
- values('id', 'status', 'content', 'addTime', 'updTime')
|
|
|
+ values('id', 'status', 'content', 'addTime', 'updTime','type')
|
|
|
sid_list = []
|
|
|
for fb in fb_qs:
|
|
|
sid_list.append(fb['id'])
|
|
@@ -92,6 +92,7 @@ class FeedBackView(View):
|
|
|
def do_add(self, userID, request_dict, response):
|
|
|
nowTime = int(time.time())
|
|
|
content = request_dict.get('content', None)
|
|
|
+ type = request_dict.get('type', None)
|
|
|
res_1 = request_dict.get('res_1', None)
|
|
|
res_2 = request_dict.get('res_2', None)
|
|
|
res_3 = request_dict.get('res_3', None)
|
|
@@ -102,6 +103,8 @@ class FeedBackView(View):
|
|
|
fb.addTime = nowTime
|
|
|
fb.updTime = nowTime
|
|
|
fb.content = content
|
|
|
+ if type:
|
|
|
+ fb.type = type
|
|
|
fb.userID_id = userID
|
|
|
fb.save()
|
|
|
if res_1:
|
|
@@ -169,7 +172,7 @@ class FeedBackView(View):
|
|
|
if filter_data:
|
|
|
fb_qs = fb_qs.filter(**filter_data)
|
|
|
count = fb_qs.count()
|
|
|
- fb_qs = fb_qs[(page - 1) * line:page * line].values('id', 'status', 'content', 'addTime', 'updTime','userID__username')
|
|
|
+ fb_qs = fb_qs[(page - 1) * line:page * line].values('id','type', 'status', 'content', 'addTime', 'updTime','userID__username')
|
|
|
sid_list = []
|
|
|
print (fb_qs)
|
|
|
for fb in fb_qs:
|