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

server/apps/ability/migrations/0035_auto_20220607_0900.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2022-06-07 01:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ability', '0034_quali_file'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qaction',
+            name='action',
+            field=models.CharField(choices=[('service:update', '更新服务'), ('quali:create', '新增资质'), ('quali:update', '更新资质'), ('ablity:create', '新增能力'), ('ablity:nochange', '能力无变化'), ('quali:nochange', '资质无变化')], max_length=20, verbose_name='操作类型'),
+        ),
+    ]

server/apps/ability/models.py

@@ -198,6 +198,8 @@ class QAction(CommonBModel):
         ('quali:create', '新增资质'),
         ('quali:update', '更新资质'),
         ('ablity:create', '新增能力'),
+        ('ablity:nochange', '能力无变化'),
+        ('quali:nochange', '资质无变化')
     )
     action = models.CharField('操作类型', max_length=20, choices=QACTION_CHOICE)
     quali = models.ForeignKey(Quali, null=True, blank=True, verbose_name='操作资质', on_delete=models.CASCADE)

server/apps/ability/serializers_qtask.py

@@ -146,6 +146,11 @@ class QActionQualiUpdateSerializer(serializers.ModelSerializer):
         validated_data['value2'] = self.data['value2']
         return super().create(validated_data)
 
+class QActionNoChangeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = QAction
+        fields = ['qtask']
+
 class QActionACreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = QAction

server/apps/ability/views_qtask.py

@@ -2,7 +2,7 @@ from rest_framework.viewsets import GenericViewSet
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin, RetrieveModelMixin
 from rest_framework.decorators import action
 from apps.ability.models import QAction, QActionItem, QOrg, QTask, Quali, QualiLib
-from apps.ability.serializers_qtask import QActionACreateSerializer, QActionDetailSerializer, QActionListSerializer, QActionQualiCreateSerializer, QActionQualiUpdateSerializer, QActionServiceSerializer, QOrgListSerializer, QTaskCreateUpdateSerializer, QTaskListSerializer, QualiCreateSerializer, QualiLibListSerializer, QualiListSerializer, QualiSerializer, QualiUpdateSerializer
+from apps.ability.serializers_qtask import QActionACreateSerializer, QActionDetailSerializer, QActionListSerializer, QActionNoChangeSerializer, QActionQualiCreateSerializer, QActionQualiUpdateSerializer, QActionServiceSerializer, QOrgListSerializer, QTaskCreateUpdateSerializer, QTaskListSerializer, QualiCreateSerializer, QualiLibListSerializer, QualiListSerializer, QualiSerializer, QualiUpdateSerializer
 from django.db import transaction
 from rest_framework.response import Response
 from rest_framework import status
@@ -99,7 +99,7 @@ def cal_count(qtask, org):
     qorg.save()
 
 class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModelMixin,GenericViewSet):
-    perms_map = {'get': 'qtask_view', 'delete': 'qaction_delete'}
+    perms_map = {'get': '*', 'delete': 'qaction_delete'}
     queryset = QAction.objects.select_related('file', 'atype', 'afield', 'qtask', 'belong_dept', 'create_by')
     filterset_fields = ['qtask', 'belong_dept', 'atype', 'afield']
     serializer_class = QActionListSerializer
@@ -198,7 +198,7 @@ class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModel
         return Response()
     
     @action(methods=['post'], detail=False,
-            perms_map = {'post':'ability_create'}, serializer_class=QActionACreateSerializer)
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionACreateSerializer)
     @transaction.atomic
     def ability_create(self, request, *args, **kwargs):
         """
@@ -212,6 +212,37 @@ class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModel
         cal_count(vdata['qtask'], user.dept)
         return Response()
 
+    @action(methods=['post'], detail=False,
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionNoChangeSerializer)
+    @transaction.atomic
+    def ability_nochange(self, request, *args, **kwargs):
+        """
+        能力无变化
+        """
+        user = request.user
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save(create_by=user, belong_dept=user.dept, action='ability:nochange')
+        vdata = serializer.validated_data
+        cal_count(vdata['qtask'], user.dept)
+        return Response()
+    
+    @action(methods=['post'], detail=False,
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionNoChangeSerializer)
+    @transaction.atomic
+    def quali_nochange(self, request, *args, **kwargs):
+        """
+        资质无变化
+        """
+        user = request.user
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save(create_by=user, belong_dept=user.dept, action='quali:nochange')
+        vdata = serializer.validated_data
+        cal_count(vdata['qtask'], user.dept)
+        return Response()
+
+
     @action(methods=['put'], detail=True, perms_map = {'put':'qaction_confirm'},
             serializer_class=serializers.Serializer)
     @transaction.atomic

server/apps/system/views.py

@@ -378,25 +378,28 @@ class UserViewSet(PageOrNot, ModelViewSet):
         i = 3
         role1 = Role.objects.get(name='能力查询')
         role2 = Role.objects.get(name='资质能力报送')
-        role3 = Role.objects.get(name='资料分享和视频培训')
+        role3 = Role.objects.get(name='资料分享')
+        role4 = Role.objects.get(name='视频培训')
         while sheet['b'+str(i)].value:
             name = sheet['b'+str(i)].value
             email = sheet['e'+str(i)].value
             if not User.objects.filter(username=email).exists():
-                dept = Organization.objects.get(name=sheet['j'+str(i)].value)
                 user = User.objects.create(name=name,
                                            username=email,
                                            password=make_password(''.join(random.sample(string.ascii_letters + string.digits, 8))),
                                            dept=dept)
-                if sheet['f'+str(i)].value:
-                    user.roles.add(role1)
-                if sheet['g'+str(i)].value:
-                    user.roles.add(role2)
-                if sheet['h'+str(i)].value:
-                    user.roles.add(role3)
-                print(str(i)+name+'已导入')
             else:
-                print(str(i)+name+'已存在')
+                user = User.objects.get(username=email)
+            dept = Organization.objects.get(name=sheet['j'+str(i)].value)
+            if sheet['f'+str(i)].value:
+                user.roles.add(role1)
+            if sheet['g'+str(i)].value:
+                user.roles.add(role2)
+            if sheet['h'+str(i)].value:
+                user.roles.add(role3)
+            if sheet['i'+str(i)].value:
+                user.roles.add(role4)
+            print(str(i)+name+'已导入')
             i = i + 1
         return Response()
 

server/apps/vod/views.py

@@ -48,8 +48,8 @@ class VideoViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet):
     search_fields = ['name', 'category__name', 'description']
     # filterset_fields = ['category']
     serializer_class = VideoSerializer
-    ordering_fields = ['category__sort', 'sort_str', 'views', 'viewsp']
+    ordering_fields = ['category__code', 'sort_str', 'views', 'viewsp']
-    ordering = ['category__sort', 'sort_str']
+    ordering = ['category__code', 'sort_str']
 
     def get_serializer_class(self):
         if self.action in ['list', 'retrieve']: