| 
                
               | 
              
                
               | 
              
                @@ -115,7 +115,7 @@ def shot_request_list(request, administrator): 
               | 
            
            
            
              | 
                115
               | 
              
                115
               | 
              
                     reqs = TenancyShotRequestInfo.objects.filter(status=True).order_by('-pk')
               | 
            
            
            
              | 
                116
               | 
              
                116
               | 
              
                  
               | 
            
            
            
              | 
                117
               | 
              
                117
               | 
              
                     if query: 
               | 
            
            
            
              | 
                118
               | 
              
                
               | 
              
                -        shots = list(TenancyShotInfo.objects.values_list('model_id', flat=True).filter(sn__icontains=query))
               | 
            
            
            
              | 
                
               | 
              
                118
               | 
              
                +        shots = list(TenancyShotInfo.objects.values_list('shot_id', flat=True).filter(sn__icontains=query))
               | 
            
            
            
              | 
                119
               | 
              
                119
               | 
              
                         reqs = reqs.filter(Q(phone__icontains=query) | Q(name__icontains=query) | Q(shot_id__in=shots)) 
               | 
            
            
            
              | 
                120
               | 
              
                120
               | 
              
                  
               | 
            
            
            
              | 
                121
               | 
              
                121
               | 
              
                  
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -181,6 +181,9 @@ def shot_request_update(request, administrator): 
               | 
            
            
            
              | 
                181
               | 
              
                181
               | 
              
                     old_tracking_number = req.tracking_number 
               | 
            
            
            
              | 
                182
               | 
              
                182
               | 
              
                     old_back_tracking_number = req.back_tracking_number 
               | 
            
            
            
              | 
                183
               | 
              
                183
               | 
              
                  
               | 
            
            
            
              | 
                
               | 
              
                184
               | 
              
                +    if req.admin_id and req.admin_id != administrator.admin_id: 
               | 
            
            
            
              | 
                
               | 
              
                185
               | 
              
                +        return response(40001, 'No permission', '不是经办人,没有权限') 
               | 
            
            
            
              | 
                
               | 
              
                186
               | 
              
                + 
               | 
            
            
            
              | 
                184
               | 
              
                187
               | 
              
                     if shot_id: 
               | 
            
            
            
              | 
                185
               | 
              
                188
               | 
              
                         req.shot_id = shot_id 
               | 
            
            
            
              | 
                186
               | 
              
                189
               | 
              
                     if name: 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -265,9 +268,13 @@ def shot_request_send(request, administrator): 
               | 
            
            
            
              | 
                265
               | 
              
                268
               | 
              
                         shot = TenancyShotInfo.objects.get(shot_id=shot_id, status=True) 
               | 
            
            
            
              | 
                266
               | 
              
                269
               | 
              
                     except TenancyShotInfo.DoesNotExist: 
               | 
            
            
            
              | 
                267
               | 
              
                270
               | 
              
                         return response() 
               | 
            
            
            
              | 
                
               | 
              
                271
               | 
              
                +     
               | 
            
            
            
              | 
                
               | 
              
                272
               | 
              
                +    if req.admin_id and req.admin_id != administrator.admin_id: 
               | 
            
            
            
              | 
                
               | 
              
                273
               | 
              
                +        return response(40001, 'No permission', '不是经办人,没有权限') 
               | 
            
            
            
              | 
                268
               | 
              
                274
               | 
              
                  
               | 
            
            
            
              | 
                269
               | 
              
                275
               | 
              
                     old_tracking_number = req.tracking_number 
               | 
            
            
            
              | 
                270
               | 
              
                276
               | 
              
                  
               | 
            
            
            
              | 
                
               | 
              
                277
               | 
              
                +    req.admin_id = administrator.admin_id 
               | 
            
            
            
              | 
                271
               | 
              
                278
               | 
              
                     req.express_name = express_name 
               | 
            
            
            
              | 
                272
               | 
              
                279
               | 
              
                     req.express_com = express_com 
               | 
            
            
            
              | 
                273
               | 
              
                280
               | 
              
                     req.tracking_number = tracking_number 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -310,6 +317,9 @@ def shot_request_signed(request, administrator): 
               | 
            
            
            
              | 
                310
               | 
              
                317
               | 
              
                     except TenancyShotRequestInfo.DoesNotExist: 
               | 
            
            
            
              | 
                311
               | 
              
                318
               | 
              
                         return response(TenancyStatusCode.TENANCY_SHOT_REQUEST_NOT_FOUND) 
               | 
            
            
            
              | 
                312
               | 
              
                319
               | 
              
                  
               | 
            
            
            
              | 
                
               | 
              
                320
               | 
              
                +    if req.admin_id and req.admin_id != administrator.admin_id: 
               | 
            
            
            
              | 
                
               | 
              
                321
               | 
              
                +        return response(40001, 'No permission', '不是经办人,没有权限') 
               | 
            
            
            
              | 
                
               | 
              
                322
               | 
              
                + 
               | 
            
            
            
              | 
                313
               | 
              
                323
               | 
              
                     req.request_status = TenancyShotRequestInfo.TENANCY_TRACKING_BACK_SIGNED 
               | 
            
            
            
              | 
                314
               | 
              
                324
               | 
              
                     request_status_at = req.request_status_at 
               | 
            
            
            
              | 
                315
               | 
              
                325
               | 
              
                     request_status_at[TenancyShotRequestInfo.TENANCY_TRACKING_BACK_SIGNED] = tc.utc_string() 
               |