Merge pull request #6 from wccdev/dev

Dev

Author: LinkanDawang

drf_oa_workflow/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Leslie Chan"""
 __email__ = '[email protected]'
-__version__ = '0.5.0'
+__version__ = '0.5.1'

drf_oa_workflow/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from django.contrib.auth import get_user_model
+
+# from django.contrib.auth import get_user_model
 from django.db.models import Case, F, Value, When
 
 from .models import OaUserInfo

drf_oa_workflow/choices.py

@@ -0,0 +1,69 @@
+from django.db.models import IntegerChoices, TextChoices
+
+
+class TransmitTypes(IntegerChoices):
+    FORWARD = 1, "转发"
+    CONSULTATION = 2, "意见征询"
+    TRANSFER = 3, "转办"
+
+
+class WFOperationTypes(IntegerChoices):
+    SUBMIT_WITHOUT_WF = 0, "不走流程提交"
+    SUBMIT = 1, "提交"
+    APPROVAL = 2, "批准"
+    SAVE = 3, "保存"
+    FORWARD = 4, "转发"
+    FORWARD_ROLLBACK = 5, "转发收回"
+    TRANSFER = 6, "转办"
+    MARKUP = 7, "批注"
+    REJECT = 8, "退回"
+    WITHDRAW = 9, "撤回"
+    CONSULTATION = 10, "意见征询"
+    RE_SUBMIT = 11, "重新提交"  # 流程被退回时
+    DO_FORCE_RECOVER = 12, "强制收回"
+    DO_DELETE = 13, "删除流程"
+
+    TERMINATE = 50, "终止"
+
+
+class OAWorkflowLogTypes(TextChoices):
+    # FIXME 确认OA不同环境关于LOGTYPE字段值与定义是否相同
+    APPROVAL = "0", "批准"
+    SAVE = "1", "保存"
+    SUBMIT = "2", "提交"
+    REJECT = "3", "退回"
+    REOPEN = "4", "重新打开"
+    DELETE = "5", "删除"
+    ACTIVE = "6", "激活"
+    FORWARD = "7", "转发"
+    MARKUP = "9", "批注"
+    CONSULTATION = "a", "意见征询"
+    REPLY = "b", "意见征询回复"
+    CIRCULATION = "c", "传阅"
+    FORCE_ARCHIVE = "e", "强制归档"
+    TRANSFER = "h", "转办"
+    INTERVENE = "i", "流程干预"
+    TRANSFER_REPLY = "j", "转办反馈"
+    WITHDRAW = "r", "撤回"
+    SUPERVISING = "s", "督办"
+    CC = "t", "抄送"
+    END_CONSULTATION = "x", "结束征询"
+    CONSULTATION_TRANSFER = "z", "征询转办"
+
+
+class OAWFCOViewType(IntegerChoices):
+    VIEWED = -2, "已查看过流程，不显示任何new标记"
+    VIEWED_WITHOUT_NEWEST = -1, "查看过流程后又有新的未查看回复，显示黄色new标记"
+    UN_VIEW = 0, "接收到流程且未查看过，显示红色new标记"
+
+
+class OAWFCOIsRemarks(IntegerChoices):
+    NOT_OPERATED = 0, "未操作"
+    TRANS = 1, "转发"
+    OPERATED = 2, "已操作"
+    ARCHIVED = 4, "归档"
+    TIMEOUT = 5, "超时"
+    AUTO_REVIEW = 6, "自动审批(审批中)"
+    CC_WITHOUT_SUB = 8, "抄送(不需提交)"
+    CC_WITH_SUB = 9, "抄送(需提交)"
+    CIRCULATION = 11, "传阅"

drf_oa_workflow/db/__init__.py

@@ -0,0 +1,16 @@
+from django.db.models import DateTimeField
+from django.db.models.expressions import F, Func, Value
+from django.db.models.functions import Concat
+
+
+class ConvertOADbDatetime(Func):
+    """
+    处理OA Oracle数据库 时间（字符串）和日期（字符串）字段，输出为DateTime类型
+    """
+
+    function = "TO_DATE"
+    template = "%(function)s(%(expressions)s, 'YYYY-MM-DD HH24:MI:SS') - INTERVAL '8' HOUR"
+
+    def __init__(self, date_field, time_field, *expressions, output_field=DateTimeField(), **extra):
+        base_expressions = Concat(F(date_field), Value(" "), F(time_field))
+        super().__init__(base_expressions, *expressions, output_field=output_field, extra=extra)

drf_oa_workflow/db/function.py

@@ -0,0 +1,109 @@
+from django.db import models
+from django.db.models import Case, F, Q, Value, When
+
+from drf_oa_workflow.db.function import ConvertOADbDatetime
+from drf_oa_workflow.settings import api_settings
+
+
+class BaseOADbManager(models.Manager):
+    def __init__(self):
+        super().__init__()
+        self._db = api_settings.OA_DATABASE_ALIAS
+
+    def using(self, *args, **kwargs):
+        return super().using(api_settings.OA_DATABASE_ALIAS)
+
+
+class CurrentOperatorManager(BaseOADbManager):
+    def wf_un_operators(self):
+        """
+        流程当前节点未操作人
+        """
+        from drf_oa_workflow.choices import OAWFCOIsRemarks
+
+        return (
+            self.get_queryset()
+            .filter(
+                Q(
+                    ISREMARK__in=[OAWFCOIsRemarks.NOT_OPERATED, OAWFCOIsRemarks.ARCHIVED, OAWFCOIsRemarks.CC_WITH_SUB],
+                    OPERATEDATE__isnull=True,
+                    OPERATETIME__isnull=True,
+                )
+                | Q(ISREMARK=OAWFCOIsRemarks.NOT_OPERATED),
+                ISLASTTIMES=1,
+                NODEID=F("REQUESTID__CURRENTNODEID_id"),
+            )
+            .annotate(
+                un_operator_id=F("USERID_id"), un_operator_name=F("USERID__LASTNAME"), request_id=F("REQUESTID_id")
+            )
+            .distinct()
+        )
+
+
+class WorkflowQuerySet(models.QuerySet):
+    def build_fields(self):
+        return self.annotate(
+            RECEIVEDATE=F("current_operators__RECEIVEDATE"),
+            RECEIVETIME=F("current_operators__RECEIVETIME"),
+            C_VIEWTYPE=F("current_operators__VIEWTYPE"),
+            C_ISREMARRK=F("current_operators__ISREMARK"),
+            C_NODEID=F("current_operators__NODEID"),
+            C_ISREJECT=F("current_operators__ISREJECT"),
+            C_ISBEREJECT=F("current_operators__ISBEREJECT"),
+            # createTime=Concat(F("CREATEDATE"), Value(" "), F("CREATETIME")),
+            # receiveTime=Concat(F("current_operators__RECEIVEDATE"), Value(" "), F("current_operators__RECEIVETIME")),
+            # lastOperateTime=Concat(F("LASTOPERATEDATE"), Value(" "), F("LASTOPERATETIME")),
+            createTime=ConvertOADbDatetime("CREATEDATE", "CREATETIME"),
+            receiveTime=Case(
+                When(
+                    Q(current_operators__RECEIVEDATE__isnull=False, current_operators__RECEIVETIME__isnull=False),
+                    then=ConvertOADbDatetime("current_operators__RECEIVEDATE", "current_operators__RECEIVETIME"),
+                ),
+                default=Value(None),
+            ),
+            lastOperateTime=Case(
+                When(
+                    Q(LASTOPERATEDATE__isnull=False, LASTOPERATETIME__isnull=False),
+                    then=ConvertOADbDatetime("LASTOPERATEDATE", "LASTOPERATETIME"),
+                ),
+                default=Value(None),
+            ),
+        )
+
+    def todo(self, oa_user_id, workflow_ids):
+        """
+        待办查询
+        0：未操作;
+        1：转发;
+        2：已操作;
+        4：归档;
+        5：超时;
+        6:自动审批（审批中）
+        8：抄送(不需提交);
+        9：抄送(需提交);
+        11:传阅;
+        """
+        queryset = self.filter(
+            current_operators__USERTYPE=0,
+            current_operators__ISREMARK__in=[0, 1, 5, 7, 8, 9],
+            current_operators__ISLASTTIMES=1,
+            current_operators__USERID=oa_user_id,
+            WORKFLOWID__in=workflow_ids,
+        )
+        return queryset.build_fields()
+
+    def handled(self, oa_user_id, workflow_ids):
+        queryset = self.filter(
+            current_operators__USERTYPE=0,
+            current_operators__ISREMARK__in=[2, 4],
+            current_operators__ISLASTTIMES=1,
+            current_operators__USERID=oa_user_id,
+            WORKFLOWID__in=workflow_ids,
+        )
+        return queryset.build_fields()
+
+
+class WorkflowManager(BaseOADbManager):
+    def get_queryset(self):
+        queryset = WorkflowQuerySet(self.model, using=self._db, hints=self._hints)
+        return queryset

drf_oa_workflow/db/manager.py

@@ -0,0 +1,10 @@
+from django.db import models
+
+from .manager import BaseOADbManager
+
+
+class OADbBaseModel(models.Model):
+    objects = BaseOADbManager()
+
+    class Meta:
+        abstract = True

drf_oa_workflow/db/models.py

@@ -1,24 +0,0 @@
-import oracledb
-
-from .settings import api_settings
-
-# from django.conf import settings
-
-
-try:
-    oracledb.init_oracle_client()
-except Exception as e:  # noqa
-    pass
-
-
-def get_oa_oracle_connection():
-    """
-    OA 数据库连接
-    """
-    return oracledb.connect(
-        user=api_settings.OA_DB_USER,
-        password=api_settings.OA_DB_PASSWORD,
-        host=api_settings.OA_DB_HOST,
-        port=api_settings.OA_DB_PORT,
-        service_name=api_settings.OA_DB_SERVER_NAME,
-    )