feats

functions.sql

@@ -0,0 +1,75 @@
+CREATE PROCEDURE `pro_resume_work_daily`(IN `lstr_day` varchar(32))
+BEGIN
+
+	-- 先删除旧的
+	DELETE t FROM ts_resume_work_form t WHERE t.`name` = lstr_day;
+	
+	-- 再新增新的
+	-- 1, 统计总的, 按机构分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), t.org_id, 'total', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1
+		GROUP BY t.org_id;
+		
+	-- 不分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), null, 'total', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1;
+		
+	-- 2, 统计正常的，按机构分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), t.org_id, 'normal', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE
+		( t.nucleic_is_normal is NULL OR t.nucleic_is_normal = 1 )
+		AND ( t.antigen_is_normal is NULL OR t.antigen_is_normal = 1 )
+		AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1
+		GROUP BY t.org_id;
+
+-- 不分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), null, 'normal', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE
+		( t.nucleic_is_normal is NULL OR t.nucleic_is_normal = 1 )
+		AND ( t.antigen_is_normal is NULL OR t.antigen_is_normal = 1 )
+		AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1;
+		
+	-- 3, 统计异常, 按机构分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), t.org_id, 'abnormal', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE
+		( t.nucleic_is_normal = 0 OR t.antigen_is_normal = 0 )
+		AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1
+		GROUP BY t.org_id;
+		
+	-- 不分组
+	INSERT INTO ts_resume_work_form (statis_id, org_id, st_type, `name`, `value`)
+	SELECT UUID_SHORT(), null, 'abnormal', lstr_day, count( 1 ) 
+	FROM
+		ta_resume_work_form t 
+	WHERE
+		( t.nucleic_is_normal = 0 OR t.antigen_is_normal = 0 )
+		AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = lstr_day  -- lstr_day 格式 YYYY-MM-DD
+		AND t.`status` > - 1;
+
+END;;
+
+
+CREATE EVENT `job_resume_work_daily`
+ON SCHEDULE
+EVERY '1' DAY STARTS '2022-05-16 01:00:00'
+DO call pro_resume_work_daily(DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY), '%Y-%m-%d'));;

ubpa.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.0.0",
   "createdTime": "2022-4-30 21:08:08",
-  "updatedTime": "2022-4-30 22:36:04",
+  "updatedTime": "2022-5-16 19:01:27",
   "dbConns": [],
   "profile": {
     "default": {
@@ -613,7 +613,7 @@
           "codeRoot": ""
         }
       },
-      "defKey": "sys_org",
+      "defKey": "ta_org",
       "defName": "企业表",
       "comment": "",
       "properties": {
@@ -751,6 +751,22 @@
           "domain": "F56868D6-C821-4317-AB5A-BC9AF64495B7",
           "id": "D5D544CB-73C7-4EE9-8527-703FE54391DC"
         },
+        {
+          "defKey": "create_org",
+          "defName": "物业ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "78803E94-FF38-41FE-BE54-3092E301A2B0"
+        },
         {
           "defKey": "create_date",
           "defName": "创建时间",
@@ -766,6 +782,22 @@
           "refDict": "",
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "20553251-44A1-41E9-9173-06460E3B2350"
+        },
+        {
+          "defKey": "weight",
+          "defName": "权重",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "8EE33E84-1674-436C-AE24-32B775E6CCFD"
         }
       ],
       "correlations": [],
@@ -890,15 +922,15 @@
           "defKey": "user_name",
           "defName": "用户名",
           "comment": "",
-          "type": "VARCHAR",
-          "len": 90,
+          "type": "",
+          "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "F3758B35-11A9-4A85-9F81-BDF9F0EE0008",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "refDict": "",
           "id": "200C9BED-0CD7-4EA6-9DAC-22BA0F1D542D"
         },
@@ -914,7 +946,7 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "DF0AA11B-C1E4-45C2-B97D-6A77B3A6A929",
+          "domain": "",
           "refDict": "",
           "id": "FBB3274E-F74C-4683-B833-FC79B19704FB"
         },
@@ -923,14 +955,14 @@
           "defName": "手机号",
           "comment": "",
           "type": "VARCHAR",
-          "len": "60",
+          "len": 32,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "90BE0DD1-EA61-4EF0-B478-A19D7BDC3231",
+          "domain": "",
           "refDict": "",
           "id": "82FC065C-328C-4391-BFC0-D25298B5185D"
         },
@@ -966,6 +998,38 @@
           "domain": "",
           "id": "EC791805-8C6E-45D8-B6EB-6403059B4D69"
         },
+        {
+          "defKey": "org_id",
+          "defName": "所属企业",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "3B406408-C022-49B9-AB05-B362DC5698C0"
+        },
+        {
+          "defKey": "is_admin",
+          "defName": "是否管理员",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+          "id": "8067668D-5E1A-490A-B8A8-0A4A6AEA9133"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -1265,6 +1329,441 @@
           "refDict": "",
           "uiHint": "",
           "id": "9994B7C2-A957-4897-BC6A-E6B442FA063B"
+        },
+        {
+          "defKey": "delete_user_type",
+          "defName": "删除人类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "1F47B8E7-8B5A-40FE-80EF-CF2E87C46708"
+        },
+        {
+          "defKey": "delete_user",
+          "defName": "删除人ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "D289E449-6350-437C-814A-C70C0D551054"
+        },
+        {
+          "defKey": "delete_date",
+          "defName": "删除时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "023F223A-9D3A-4C88-9263-C0A67BE140BE"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
+    },
+    {
+      "id": "07C8A339-DA0E-4D3D-A24D-0ADADBEAFC08",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "sys_setting",
+      "defName": "系统配置",
+      "comment": "",
+      "properties": {
+        "partitioned by": "(date string)",
+        "row format delimited": "",
+        "fields terminated by ','": "",
+        "collection items terminated by '-'": "",
+        "map keys terminated by ':'": "",
+        "store as textfile;": ""
+      },
+      "nameTemplate": "{defKey}[{defName}]",
+      "headers": [
+        {
+          "freeze": false,
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "freeze": true,
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "freeze": true,
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "uiHint",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "setting_id",
+          "defName": "配置ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "DC256D2F-980D-426C-BF58-D8985857C179"
+        },
+        {
+          "defKey": "title",
+          "defName": "配置标题",
+          "comment": "",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "C608D673-8D27-4DCB-9CB4-0566BA8091FC"
+        },
+        {
+          "defKey": "desc",
+          "defName": "详细说明",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "DE7E2669-E15B-44CA-8A28-32B0B068EF46"
+        },
+        {
+          "defKey": "content",
+          "defName": "配置内容",
+          "comment": "",
+          "type": "TEXT",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "",
+          "id": "7BE8003E-D2A8-459A-A31B-F4D492946988"
+        },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "D952237B-925E-4620-8D27-AA4FC6365030"
+        },
+        {
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "9184F4A9-D287-42E5-A838-690C4BF7F7F1"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
+    },
+    {
+      "id": "D28CBEC4-98D9-41D9-8349-F437FE4980E0",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ts_resume_work_form",
+      "defName": "通用统计",
+      "comment": "",
+      "properties": {
+        "partitioned by": "(date string)",
+        "row format delimited": "",
+        "fields terminated by ','": "",
+        "collection items terminated by '-'": "",
+        "map keys terminated by ':'": "",
+        "store as textfile;": ""
+      },
+      "nameTemplate": "{defKey}[{defName}]",
+      "headers": [
+        {
+          "freeze": false,
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "freeze": true,
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "freeze": true,
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "freeze": false,
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "freeze": false,
+          "refKey": "uiHint",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "statis_id",
+          "defName": "统计ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "13B505FB-AF21-4EC2-838F-C840C4235A31"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "BD57717B-D251-4926-9CD4-51919F2C727C"
+        },
+        {
+          "defKey": "st_type",
+          "defName": "统计类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "68B957CA-0575-471E-A851-5CBF410C36EB"
+        },
+        {
+          "defKey": "name",
+          "defName": "统计名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "7DDBC0A8-B783-4CCC-A3C0-FC860467B911"
+        },
+        {
+          "defKey": "value",
+          "defName": "统计值",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "57A4A943-266D-4A5E-A292-47EB25BB244F"
         }
       ],
       "correlations": [],
@@ -1647,7 +2146,8 @@
       "defKey": "system",
       "defName": "系统",
       "refEntities": [
-        "3A05BE2E-A4DD-424D-B14E-9916A441CF6D"
+        "3A05BE2E-A4DD-424D-B14E-9916A441CF6D",
+        "07C8A339-DA0E-4D3D-A24D-0ADADBEAFC08"
       ],
       "refViews": [],
       "refDiagrams": [],
@@ -1676,6 +2176,17 @@
       "refDiagrams": [],
       "refDicts": [],
       "id": "E1E6EF10-6913-44A1-A935-C379D4388C96"
+    },
+    {
+      "defKey": "statis",
+      "defName": "统计",
+      "refEntities": [
+        "D28CBEC4-98D9-41D9-8349-F437FE4980E0"
+      ],
+      "refViews": [],
+      "refDiagrams": [],
+      "refDicts": [],
+      "id": "C03B969F-3401-4D53-89DA-02E8FFDBD029"
     }
   ],
   "dataTypeMapping": {