feats

db/.back_文明创办/文明创办-backup-20221230141755.pdma.json → db/.back_文明创办/文明创办-backup-202312152442.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-30 09:34:54",
+  "updatedTime": "2023-1-2 14:06:29",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3674,6 +3674,57 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "94EE1F8F-61A7-4104-B747-4E1C0036CBB8"
         },
+        {
+          "defKey": "apply_type",
+          "defName": "当前申请",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "EA6F4EA5-1BD9-4919-B756-BA0A4949E625"
+        },
+        {
+          "defKey": "apply_id",
+          "defName": "当前申请ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D30F4AC2-D4FE-452A-9A75-4821F0F0BA1E"
+        },
+        {
+          "defKey": "validate_status",
+          "defName": "审核状态",
+          "comment": "0未审核,1审核通过,2审核不通过",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "BB943074-7DA2-4289-8163-8B09341F8C9B"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/.back_文明创办/文明创办-backup-20221230093454.pdma.json → db/.back_文明创办/文明创办-backup-202312205100.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-29 16:25:56",
+  "updatedTime": "2023-1-2 15:24:42",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3674,6 +3674,57 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "94EE1F8F-61A7-4104-B747-4E1C0036CBB8"
         },
+        {
+          "defKey": "apply_type",
+          "defName": "当前申请",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "EA6F4EA5-1BD9-4919-B756-BA0A4949E625"
+        },
+        {
+          "defKey": "apply_id",
+          "defName": "当前申请ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D30F4AC2-D4FE-452A-9A75-4821F0F0BA1E"
+        },
+        {
+          "defKey": "validate_status",
+          "defName": "审核状态",
+          "comment": "0未审核,1审核提交,2审核通过,3审核不通过",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "BB943074-7DA2-4289-8163-8B09341F8C9B"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -7503,7 +7554,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
         },
         {
@@ -7554,7 +7605,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
         },
         {
@@ -7571,7 +7622,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
         },
         {
@@ -7929,6 +7980,210 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_message",
+      "defName": "消息通知",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "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": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "FBCA3E18-1ABB-4B48-8370-9A9FB679B5A7",
+          "uiHint": ""
+        },
+        {
+          "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": "E1646EEB-D7B3-4C90-91B1-C5D45348549C"
+        },
+        {
+          "defKey": "create_user",
+          "defName": "创建人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "210ABBCB-0350-4D79-B4E4-92543A825036"
+        },
+        {
+          "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": "5BCAB4B5-D041-4F14-8AC8-991595EB1EA5"
+        },
+        {
+          "defKey": "update_user",
+          "defName": "更新人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "35545F9B-03E1-4DB3-998C-596AB7F8820F"
+        },
+        {
+          "defKey": "update_date",
+          "defName": "更新时间",
+          "comment": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "14C5219E-6E5E-4B54-A7E6-429EFA934950"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8356,7 +8611,8 @@
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
-        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+        "430EE745-314D-48CE-A20B-ED2C4D79BC92"
       ],
       "refViews": [],
       "refDiagrams": [],

db/.back_文明创办/文明创办-backup-20221229162556.pdma.json → db/.back_文明创办/文明创办-backup-202312205256.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-28 18:37:52",
+  "updatedTime": "2023-1-2 20:51:00",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3674,6 +3674,57 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "94EE1F8F-61A7-4104-B747-4E1C0036CBB8"
         },
+        {
+          "defKey": "apply_type",
+          "defName": "当前申请",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "EA6F4EA5-1BD9-4919-B756-BA0A4949E625"
+        },
+        {
+          "defKey": "apply_id",
+          "defName": "当前申请ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D30F4AC2-D4FE-452A-9A75-4821F0F0BA1E"
+        },
+        {
+          "defKey": "validate_status",
+          "defName": "审核状态",
+          "comment": "0未审核,1审核提交,2审核通过,3审核不通过",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "BB943074-7DA2-4289-8163-8B09341F8C9B"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -7503,7 +7554,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
         },
         {
@@ -7554,7 +7605,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
         },
         {
@@ -7571,7 +7622,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
         },
         {
@@ -7858,6 +7909,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
         },
+        {
+          "defKey": "result",
+          "defName": "处理结果",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "A9868395-4BC7-464D-8BA5-07EFEB6CDF6E"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -7912,6 +7980,261 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_message",
+      "defName": "消息通知",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "id",
+          "defName": "ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
+        },
+        {
+          "defKey": "title",
+          "defName": "消息标题",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "CBA249ED-8EBD-4352-843D-7F6593CFE0CA"
+        },
+        {
+          "defKey": "content",
+          "defName": "消息内容",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "C333DA5B-4402-4455-BC1A-156E0F7171CE"
+        },
+        {
+          "defKey": "target_type",
+          "defName": "关联内容",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "402577E1-743E-42F4-976B-984FEEBAF594"
+        },
+        {
+          "defKey": "target_id",
+          "defName": "关联内容ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "D67DAC89-0B94-42B6-AB35-C048092E53BC"
+        },
+        {
+          "defKey": "receive_user",
+          "defName": "接收人员",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "BA7C44C3-6332-4808-B8A1-9CA4A0230B8C"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "FBCA3E18-1ABB-4B48-8370-9A9FB679B5A7",
+          "uiHint": ""
+        },
+        {
+          "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": "E1646EEB-D7B3-4C90-91B1-C5D45348549C"
+        },
+        {
+          "defKey": "create_user",
+          "defName": "创建人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "210ABBCB-0350-4D79-B4E4-92543A825036"
+        },
+        {
+          "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": "5BCAB4B5-D041-4F14-8AC8-991595EB1EA5"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8339,7 +8662,8 @@
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
-        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+        "430EE745-314D-48CE-A20B-ED2C4D79BC92"
       ],
       "refViews": [],
       "refDiagrams": [],

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-30 14:17:55",
+  "updatedTime": "2023-1-2 20:52:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3708,6 +3708,23 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "D30F4AC2-D4FE-452A-9A75-4821F0F0BA1E"
         },
+        {
+          "defKey": "validate_status",
+          "defName": "审核状态",
+          "comment": "0未审核,1审核提交,2审核通过,3审核不通过",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "BB943074-7DA2-4289-8163-8B09341F8C9B"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -7963,6 +7980,261 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_message",
+      "defName": "消息通知",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "msg_id",
+          "defName": "ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
+        },
+        {
+          "defKey": "title",
+          "defName": "消息标题",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "CBA249ED-8EBD-4352-843D-7F6593CFE0CA"
+        },
+        {
+          "defKey": "content",
+          "defName": "消息内容",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "C333DA5B-4402-4455-BC1A-156E0F7171CE"
+        },
+        {
+          "defKey": "target_type",
+          "defName": "关联内容",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "402577E1-743E-42F4-976B-984FEEBAF594"
+        },
+        {
+          "defKey": "target_id",
+          "defName": "关联内容ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "D67DAC89-0B94-42B6-AB35-C048092E53BC"
+        },
+        {
+          "defKey": "receive_user",
+          "defName": "接收人员",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "BA7C44C3-6332-4808-B8A1-9CA4A0230B8C"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "FBCA3E18-1ABB-4B48-8370-9A9FB679B5A7",
+          "uiHint": ""
+        },
+        {
+          "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": "E1646EEB-D7B3-4C90-91B1-C5D45348549C"
+        },
+        {
+          "defKey": "create_user",
+          "defName": "创建人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "210ABBCB-0350-4D79-B4E4-92543A825036"
+        },
+        {
+          "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": "5BCAB4B5-D041-4F14-8AC8-991595EB1EA5"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8390,7 +8662,8 @@
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
-        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+        "430EE745-314D-48CE-A20B-ED2C4D79BC92"
       ],
       "refViews": [],
       "refDiagrams": [],

src/main/java/com/example/civilizedcity/CivilizedCityApplication.java

@@ -2,7 +2,11 @@ package com.example.civilizedcity;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+@EnableAsync
+@EnableTransactionManagement
 @SpringBootApplication
 public class CivilizedCityApplication {
 

src/main/java/com/example/civilizedcity/common/Constants.java

@@ -12,6 +12,21 @@ public class Constants {
     public final static String CHECK_ITEM_LOC = "loc";  // 实例调研
     public final static String CHECK_ITEM_SURVEY = "survey";  // 问卷调研
 
+
+    // 操作员身份
+    // 督察员
+    public final static String DUTY_INSPECTOR = "inspector";
+    // 管理员
+    public final static String DUTY_MANAGER = "manager";
+    // 单位人员
+    public final static String DUTY_ORG_USER = "org_user";
+    // 单位管理员
+    public final static String DUTY_ORG_MANAGER = "org_manager";
+    // 查询员
+    public final static String DUTY_QUERY_PERSON = "query_person";
+    // 市民
+    public final static String DUTY_CITIZEN = "citizen";
+
     // 问题单
     public final static String ATTACH_SOURCE_ISSUE = "issue";
     // 单位问题单
@@ -24,6 +39,14 @@ public class Constants {
     // 模拟测评
     public final static String ISSUE_SOURCE_CHECK = "check";
 
+    // 提交审核
+//    public final static String APPLY_VERIFY = "verify";
+    public final static String APPLY_STATUS_PASS = "pass"; // 通过
+    public final static String APPLY_STATUS_REJECT = "reject"; // 驳回
+    public final static String APPLY_DELAY = "delay"; // 延期申请
+    public final static String APPLY_REJECT = "reject"; // 驳回申请
+    public final static String APPLY_VERIFY = "verify"; // 审核申请
+    public final static String APPLY_END = "end"; // 办结申请
 
     // 待处理
     public final static String PROCESS_STATUS_READY = "ready";
@@ -59,4 +82,9 @@ public class Constants {
 
     // 流程结束: 已办结
     public final static String PROCESS_END = "end";
+
+    // 问题单
+    public final static String MESSAGE_TARGET_ISSUE = "issue";
+    // 申请流程
+    public final static String MESSAGE_TARGET_APPLY = "apply";
 }

src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java

@@ -12,6 +12,7 @@ import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.service.TaIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,6 +35,9 @@ public class TaIssueApplyController extends BaseController {
     @Autowired
     private TaIssueApplyService taIssueApplyService;
 
+    @Autowired
+    private TaIssueService taIssueService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -125,6 +129,13 @@ public class TaIssueApplyController extends BaseController {
 
         SysUser sysUser = currentUser();
 
+//        // 如果是问题单审核
+//        if (Constants.APPLY_VERIFY.equals(origin.getApplyType())) {
+//            if (StringUtils.isEmpty(taIssueApply.getVerifyDesc()) && Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
+//                return ResponseBean.error("请填写驳回理由");
+//            }
+//        }
+
         origin.setVerifyStatus(taIssueApply.getVerifyStatus());
         origin.setVerifyDesc(taIssueApply.getVerifyDesc());
         origin.setVerifyOrg(sysUser.getOrgId());
@@ -133,6 +144,15 @@ public class TaIssueApplyController extends BaseController {
         origin.setVerifyDate(LocalDateTime.now());
 
         taIssueApplyService.updateById(origin);
+
+        // 清空当前申请 - 表示申请流程已走完
+        taIssueService.updateApply(taIssueApply.getIssueId(), null, null);
+
+//        if (Constants.APPLY_VERIFY.equals(origin.getApplyType())) {
+//            int validateStatus = Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus()) ? Constants.VERIFY_REJECT : Constants.VERIFY_PASS;
+//            taIssueService.updateValidateStatus(taIssueApply.getIssueId(), validateStatus);
+//        }
+
         return ResponseBean.success(origin);
     }
 

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -16,11 +16,13 @@ import java.util.List;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaAttach;
 import com.example.civilizedcity.entity.TaIssueProcess;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.TaAttachService;
 import com.example.civilizedcity.service.TaIssueProcessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaIssue;
@@ -46,6 +48,9 @@ public class TaIssueController extends BaseController {
     @Autowired
     private TaIssueProcessService taIssueProcessService;
 
+    @Autowired
+    private SysUserDutyService sysUserDutyService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -75,12 +80,28 @@ public class TaIssueController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
-                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
-                             @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine) throws Exception {
+                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
 
         SysUser sysUser = currentUser();
         String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
 
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        if (dutyList == null || dutyList.size() < 1) {
+            return ResponseBean.error("暂无权限查询数据");
+        }
+
+        Boolean mine = false;
+        Integer validateStatus = null;
+        if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+            mine = true;
+        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
+            mine = true;
+            validateStatus = 0;
+        } else {
+            return ResponseBean.error("暂无权限查询数据");
+        }
+
+
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
 
@@ -103,9 +124,17 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
+        if (mine && null != validateStatus) {
+            Integer vst = validateStatus;
+            queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", vst));
+        } else if (mine) {
+            queryWrapper.eq(mine, "create_user", sysUser.getUserId());
+        } else if (null != validateStatus) {
+            queryWrapper.gt(null != validateStatus, "validate_status", validateStatus);
+        }
+
         queryWrapper.eq(Constants.ISSUE_SOURCE_FEEDBACK.equals(sourceType), "source_type", "feedback");
         queryWrapper.ne(Constants.ISSUE_SOURCE_INSPECTOR.equals(sourceType), "source_type", "feedback");
-        queryWrapper.eq(mine, "create_user", sysUser.getUserId());
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
@@ -186,6 +215,11 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("拍照或者视频没有上传");
         }
 
+        // 清空负状态
+        if (Constants.PROCESS_STATUS_REJECT.equals(origin.getProcessStatus())) {
+            taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        }
+
         taIssue.setIssueId(id);
         taIssueService.updateById(taIssue);
 

src/main/java/com/example/civilizedcity/controller/TaIssueProcessController.java

@@ -11,17 +11,21 @@ import java.util.List;
 
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.service.TaIssueService;
+import com.example.civilizedcity.service.TaOrgIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.service.TaIssueProcessService;
 
- /**
+/**
  * 问题处理;(ta_issue_process)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -29,15 +33,21 @@ import com.example.civilizedcity.service.TaIssueProcessService;
 @RestController
 @RequestMapping("/")
 public class TaIssueProcessController extends BaseController {
-    
+
     @Autowired
     private TaIssueProcessService taIssueProcessService;
 
     @Autowired
     private TaIssueService taIssueService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private TaOrgIssueService taOrgIssueService;
+
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param processId 主键
      * @return 实例对象
@@ -47,24 +57,26 @@ public class TaIssueProcessController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(taIssueProcessService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taIssueProcess")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单ID") @RequestParam(value = "issueId") Integer issueId) throws Exception {
+
         IPage<TaIssueProcess> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaIssueProcess> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaIssueProcess> result = taIssueProcessService.page(pg);
-        
+        QueryWrapper<TaIssueProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("issue_id", issueId);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaIssueProcess> result = taIssueProcessService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
 
@@ -82,10 +94,6 @@ public class TaIssueProcessController extends BaseController {
             throw new Exception("当前问题已办结");
         }
 
-        if (Constants.ISSUE_SOURCE_CHECK.equals(taIssue.getSourceType())) {
-            throw new Exception("模拟测评问题不需要审核");
-        }
-
         return taIssue;
     }
 
@@ -102,17 +110,246 @@ public class TaIssueProcessController extends BaseController {
         taIssue.setProcessStatus(taIssueProcess.getProcessStatus());
         taIssueService.updateById(taIssue);
     }
-    
+
+//    /**
+//     * 审核
+//     *
+//     * @param taIssueProcess 实例对象
+//     * @return 实例对象
+//     */
+//    @SaCheckPermission("manager")
+//    @ApiOperation("审核")
+//    @PostMapping("/taIssueProcess/verify")
+//    public ResponseBean verify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+//        TaIssue taIssue = checkIssue(taIssueProcess);
+//
+//        if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
+//            return ResponseBean.error("请设置审批是否通过");
+//        }
+//
+//        if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+//            // 审核未通过
+//            if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+//                return ResponseBean.error("请填写未通过原因");
+//            }
+//        }
+//
+//        updateUser(taIssueProcess, currentUser());
+//        taIssueProcess.setProcessNode(Constants.PROCESS_VERIFY);
+//        taIssueProcessService.save(taIssueProcess);
+//
+//        updateIssue(taIssue, taIssueProcess);
+//
+//        return ResponseBean.success(taIssueProcess);
+//    }
+
+    /**
+     * 交办
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("manager")
+    @ApiOperation("交办")
+    @PostMapping("/taIssueProcess/assigned")
+    public ResponseBean assigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
+            return ResponseBean.error("请指定交办单位");
+        }
+        if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
+            return ResponseBean.error("请设置截止日期");
+        } else {
+            if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
+                return ResponseBean.error("请设置有效的截止日期");
+            }
+
+            taIssue.setExpireDate(taIssueProcess.getExpireDate());
+        }
+
+        SysUser sysUser = currentUser();
+
+        updateUser(taIssueProcess, sysUser);
+        taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        taOrgIssueService.createNewIssue(taIssue, taIssueProcess, sysUser);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
+     * 驳回
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_user")
+    @ApiOperation("驳回")
+    @PostMapping("/taIssueProcess/reject")
+    public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+            return ResponseBean.error("请填写未驳回原因");
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setProcessNode(Constants.PROCESS_START);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        // 发送消息
+        applicationEventPublisher.publishEvent(new MessagEvent(this, taIssue));
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
+     * 单位驳回
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_user")
+    @ApiOperation("单位驳回")
+    @PostMapping("/taIssueProcess/org/reject")
+    public ResponseBean orgReject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+        if (null == prevProcess) {
+            return ResponseBean.error("未找到上级流程");
+        }
+
+        if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+            return ResponseBean.error("请填写未驳回原因");
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setNextOrg(prevProcess.getOrgId());
+        taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
+     * 延期申请
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_user")
+    @ApiOperation("延期申请")
+    @PostMapping("/taIssueProcess/org/delay/apply")
+    public ResponseBean delayApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
+            return ResponseBean.error("请设置延期日期");
+        } else {
+            if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
+                return ResponseBean.error("请设置有效的延期日期");
+            }
+        }
+
+        TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+        if (null == prevProcess) {
+            return ResponseBean.error("未找到上级流程");
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setNextOrg(prevProcess.getOrgId());
+        taIssueProcess.setProcessNode(Constants.PROCESS_ORG_DELAY_APPLY);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
     /**
-     * 审核
+     * 延期审核
      *
      * @param taIssueProcess 实例对象
      * @return 实例对象
      */
     @SaCheckPermission("manager")
-    @ApiOperation("审核")
-    @PostMapping("/taIssueProcess/verify")
-    public ResponseBean verify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+    @ApiOperation("延期审核")
+    @PostMapping("/taIssueProcess/delay/verify")
+    public ResponseBean delayVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+        if (null == prevProcess) {
+            return ResponseBean.error("未找到上级流程");
+        }
+
+        if (!Constants.PROCESS_ORG_DELAY_APPLY.equals(prevProcess.getProcessNode())) {
+            return ResponseBean.error("上级流程验证不正确");
+        }
+
+        if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+            // 审核未通过
+            if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                return ResponseBean.error("请填写未通过原因");
+            }
+        } else {
+            taIssue.setExpireDate(prevProcess.getExpireDate());
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setNextOrg(prevProcess.getOrgId());
+        taIssueProcess.setProcessNode(Constants.PROCESS_DELAY_VERIFY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
+     * 单位交办
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_user")
+    @ApiOperation("单位交办")
+    @PostMapping("/taIssueProcess/org/assigned")
+    public ResponseBean orgAssigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setProcessNode(Constants.PROCESS_ORG_ASSIGNED);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
+     * 单位审核
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_manager")
+    @ApiOperation("单位审核")
+    @PostMapping("/taIssueProcess/org/verify")
+    public ResponseBean orgVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
         TaIssue taIssue = checkIssue(taIssueProcess);
 
         if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
@@ -127,7 +364,7 @@ public class TaIssueProcessController extends BaseController {
         }
 
         updateUser(taIssueProcess, currentUser());
-        taIssueProcess.setProcessNode(Constants.PROCESS_VERIFY);
+        taIssueProcess.setProcessNode(Constants.PROCESS_ORG_VERIFY);
         taIssueProcessService.save(taIssueProcess);
 
         updateIssue(taIssue, taIssueProcess);
@@ -135,301 +372,78 @@ public class TaIssueProcessController extends BaseController {
         return ResponseBean.success(taIssueProcess);
     }
 
-     /**
-      * 交办
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("manager")
-     @ApiOperation("交办")
-     @PostMapping("/taIssueProcess/assigned")
-     public ResponseBean assigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         if (StringUtils.isEmpty(taIssueProcess.getNextOrg())) {
-             return ResponseBean.error("请指定责任单位");
-         }
-         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
-             return ResponseBean.error("请设置截止日期");
-         } else {
-             if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
-                 return ResponseBean.error("请设置有效的截止日期");
-             }
-
-             taIssue.setExpireDate(taIssueProcess.getExpireDate());
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 驳回
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_user")
-     @ApiOperation("驳回")
-     @PostMapping("/taIssueProcess/reject")
-     public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
-             return ResponseBean.error("请填写未驳回原因");
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 单位驳回
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_user")
-     @ApiOperation("单位驳回")
-     @PostMapping("/taIssueProcess/org/reject")
-     public ResponseBean orgReject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
-         if (null == prevProcess) {
-             return ResponseBean.error("未找到上级流程");
-         }
-
-         if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
-             return ResponseBean.error("请填写未驳回原因");
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setNextOrg(prevProcess.getOrgId());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 延期申请
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_user")
-     @ApiOperation("延期申请")
-     @PostMapping("/taIssueProcess/org/delay/apply")
-     public ResponseBean delayApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
-             return ResponseBean.error("请设置延期日期");
-         } else {
-             if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
-                 return ResponseBean.error("请设置有效的延期日期");
-             }
-         }
-
-         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
-         if (null == prevProcess) {
-             return ResponseBean.error("未找到上级流程");
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setNextOrg(prevProcess.getOrgId());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_DELAY_APPLY);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 延期审核
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("manager")
-     @ApiOperation("延期审核")
-     @PostMapping("/taIssueProcess/delay/verify")
-     public ResponseBean delayVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
-         if (null == prevProcess) {
-             return ResponseBean.error("未找到上级流程");
-         }
-
-         if (!Constants.PROCESS_ORG_DELAY_APPLY.equals(prevProcess.getProcessNode())) {
-             return ResponseBean.error("上级流程验证不正确");
-         }
-
-         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
-             // 审核未通过
-             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
-                 return ResponseBean.error("请填写未通过原因");
-             }
-         } else {
-             taIssue.setExpireDate(prevProcess.getExpireDate());
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setNextOrg(prevProcess.getOrgId());
-         taIssueProcess.setProcessNode(Constants.PROCESS_DELAY_VERIFY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 单位交办
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_user")
-     @ApiOperation("单位交办")
-     @PostMapping("/taIssueProcess/org/assigned")
-     public ResponseBean orgAssigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_ASSIGNED);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 单位审核
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_manager")
-     @ApiOperation("单位审核")
-     @PostMapping("/taIssueProcess/org/verify")
-     public ResponseBean orgVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
-             return ResponseBean.error("请设置审批是否通过");
-         }
-
-         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
-             // 审核未通过
-             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
-                 return ResponseBean.error("请填写未通过原因");
-             }
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_VERIFY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-     /**
-      * 办结申请
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("org_user")
-     @ApiOperation("办结申请")
-     @PostMapping("/taIssueProcess/org/finish/apply")
-     public ResponseBean finishApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcess.setNextOrg(Constants.ROOT_ORG);
-         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_FINISH_APPLY);
-         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
-         taIssueProcessService.save(taIssueProcess);
-
-         updateIssue(taIssue, taIssueProcess);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-
-
-     /**
-      * 办结审核
-      *
-      * @param taIssueProcess 实例对象
-      * @return 实例对象
-      */
-     @SaCheckPermission("manager")
-     @ApiOperation("办结审核")
-     @PostMapping("/taIssueProcess/finish/verify")
-     public ResponseBean finishVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-         TaIssue taIssue = checkIssue(taIssueProcess);
-
-         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
-         if (null == prevProcess) {
-             return ResponseBean.error("未找到上级流程");
-         }
-
-         if (!Constants.PROCESS_ORG_FINISH_APPLY.equals(prevProcess.getProcessNode())) {
-             return ResponseBean.error("上级流程验证不正确");
-         }
-
-         if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
-             return ResponseBean.error("请设置审批是否通过");
-         }
-
-         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
-             // 审核未通过
-             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
-                 return ResponseBean.error("请填写未通过原因");
-             }
-             taIssueProcess.setNextOrg(prevProcess.getOrgId());
-             taIssueProcess.setProcessNode(Constants.PROCESS_FINISH_VERIFY);
-         } else {
-             // 审核通过, 说明整个流程结束
-             taIssue.setProcessNode(Constants.PROCESS_END);
-             taIssue.setProcessStatus(Constants.PROCESS_STATUS_PASS);
-         }
-
-         updateUser(taIssueProcess, currentUser());
-         taIssueProcessService.save(taIssueProcess);
-
-         taIssue.setOrgId(taIssueProcess.getOrgId());
-         taIssueService.updateById(taIssue);
-
-         return ResponseBean.success(taIssueProcess);
-     }
-    
-    /** 
+    /**
+     * 办结申请
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("org_user")
+    @ApiOperation("办结申请")
+    @PostMapping("/taIssueProcess/org/finish/apply")
+    public ResponseBean finishApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setNextOrg(Constants.ROOT_ORG);
+        taIssueProcess.setProcessNode(Constants.PROCESS_ORG_FINISH_APPLY);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+
+    /**
+     * 办结审核
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+    @SaCheckPermission("manager")
+    @ApiOperation("办结审核")
+    @PostMapping("/taIssueProcess/finish/verify")
+    public ResponseBean finishVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+        if (null == prevProcess) {
+            return ResponseBean.error("未找到上级流程");
+        }
+
+        if (!Constants.PROCESS_ORG_FINISH_APPLY.equals(prevProcess.getProcessNode())) {
+            return ResponseBean.error("上级流程验证不正确");
+        }
+
+        if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
+            return ResponseBean.error("请设置审批是否通过");
+        }
+
+        if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+            // 审核未通过
+            if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                return ResponseBean.error("请填写未通过原因");
+            }
+            taIssueProcess.setNextOrg(prevProcess.getOrgId());
+            taIssueProcess.setProcessNode(Constants.PROCESS_FINISH_VERIFY);
+        } else {
+            // 审核通过, 说明整个流程结束
+            taIssue.setProcessNode(Constants.PROCESS_END);
+            taIssue.setProcessStatus(Constants.PROCESS_STATUS_PASS);
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcessService.save(taIssueProcess);
+
+        taIssue.setOrgId(taIssueProcess.getOrgId());
+        taIssueService.updateById(taIssue);
+
+        return ResponseBean.success(taIssueProcess);
+    }
+
+    /**
      * 通过主键删除数据
      *
      * @param processId 主键
@@ -437,7 +451,7 @@ public class TaIssueProcessController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taIssueProcess/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
         taIssueProcessService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/example/civilizedcity/controller/TaMessageController.java

@@ -0,0 +1,101 @@
+package com.example.civilizedcity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.ResponseBean;
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.example.civilizedcity.entity.TaMessage;
+import com.example.civilizedcity.service.TaMessageService;
+
+ /**
+ * 消息通知;(ta_message)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-2
+ */
+@Api(tags = "消息通知对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaMessageController extends BaseController {
+    
+    @Autowired
+    private TaMessageService taMessageService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param msgId 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taMessage/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        return ResponseBean.success(taMessageService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taMessage")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+        
+        IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
+        // QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
+        // queryWrapper.orderByDesc("create_date");
+        IPage<TaMessage> result = taMessageService.page(pg);
+        
+        return ResponseBean.success(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param taMessage 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/taMessage")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaMessage taMessage) throws Exception {
+        taMessageService.save(taMessage);
+        return ResponseBean.success(taMessage);
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param taMessage 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/taMessage/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaMessage taMessage,
+                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+        taMessageService.updateById(taMessage);
+        return ResponseBean.success(taMessage);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param msgId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taMessage/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+        taMessageService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
+}

src/main/java/com/example/civilizedcity/controller/TaOrgIssueController.java

@@ -59,7 +59,7 @@ public class TaOrgIssueController extends BaseController {
 
          QueryWrapper<TaOrgIssue> queryWrapper = new QueryWrapper<>();
          queryWrapper.eq("issue_id", issueId);
-         queryWrapper.gt("status", Constants.STATUS_DELETE);
+         queryWrapper.eq("status", Constants.STATUS_NORMAL);
 
          TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);
          if (null != taOrgIssue) {

src/main/java/com/example/civilizedcity/entity/TaIssue.java

@@ -75,6 +75,17 @@ public class TaIssue implements Serializable,Cloneable{
       /** 来源ID */
       @ApiModelProperty(name = "来源ID",notes = "")
       private String sourceTarget ;
+
+       /** 当前申请类型 */
+       @ApiModelProperty(name = "当前申请类型",notes = "")
+       private String applyType ;
+       /** 当前申请ID */
+       @ApiModelProperty(name = "当前申请ID",notes = "")
+       private Integer applyId ;
+
+       /** 审核状态 */
+       @ApiModelProperty(name = "审核状态",notes = "")
+       private Integer validateStatus ;
       /** 状态 */
       @ApiModelProperty(name = "状态",notes = "")
       private Integer status ;

src/main/java/com/example/civilizedcity/entity/TaMessage.java

@@ -0,0 +1,57 @@
+package com.example.civilizedcity.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 消息通知;
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-2
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "消息通知",description = "")
+@TableName("ta_message")
+public class TaMessage implements Serializable,Cloneable{
+    /** ID */
+    @ApiModelProperty(name = "ID",notes = "")
+    @TableId(value = "msg_id", type = IdType.ASSIGN_UUID)
+    private Integer msgId ;
+    /** 消息标题 */
+    @ApiModelProperty(name = "消息标题",notes = "")
+    private String title ;
+    /** 消息内容 */
+    @ApiModelProperty(name = "消息内容",notes = "")
+    private String content ;
+    /** 关联内容 */
+    @ApiModelProperty(name = "关联内容",notes = "")
+    private String targetType ;
+    /** 关联内容ID */
+    @ApiModelProperty(name = "关联内容ID",notes = "")
+    private String targetId ;
+    /** 接收人员 */
+    @ApiModelProperty(name = "接收人员",notes = "")
+    private String receiveUser ;
+    /** 机构ID */
+    @ApiModelProperty(name = "机构ID",notes = "")
+    private String orgId ;
+    /** 状态 */
+    @ApiModelProperty(name = "状态",notes = "")
+    private Integer status ;
+    /** 创建人 */
+    @ApiModelProperty(name = "创建人",notes = "")
+    private String createUser ;
+    /** 创建时间 */
+    @ApiModelProperty(name = "创建时间",notes = "")
+    private LocalDateTime createDate ;
+
+}

src/main/java/com/example/civilizedcity/entity/TaOrgIssue.java

@@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
 public class TaOrgIssue implements Serializable,Cloneable{
     /** 单位问题单ID */
     @ApiModelProperty(name = "单位问题单ID",notes = "")
-    @TableId(value = "org_issue_id", type = IdType.ASSIGN_UUID)
+    @TableId(value = "org_issue_id", type = IdType.AUTO)
     private Integer orgIssueId ;
     /** 问题单ID */
     @ApiModelProperty(name = "问题单ID",notes = "")

src/main/java/com/example/civilizedcity/event/MessagEvent.java

@@ -0,0 +1,29 @@
+package com.example.civilizedcity.event;
+
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaIssueApply;
+import org.springframework.context.ApplicationEvent;
+
+public class MessagEvent extends ApplicationEvent {
+
+    private TaIssueApply taIssueApply = null;
+    private TaIssue taIssue = null;
+
+    public MessagEvent(Object source, TaIssue taIssue) {
+        super(source);
+        this.taIssue = taIssue;
+    }
+
+    public MessagEvent(Object source, TaIssueApply taIssueApply) {
+        super(source);
+        this.taIssueApply = taIssueApply;
+    }
+
+    public TaIssue getTaIssue() {
+        return taIssue;
+    }
+
+    public TaIssueApply getTaIssueApply() {
+        return taIssueApply;
+    }
+}

src/main/java/com/example/civilizedcity/event/listener/MessagEventListener.java

@@ -0,0 +1,24 @@
+package com.example.civilizedcity.event.listener;
+
+import com.example.civilizedcity.event.MessagEvent;
+import com.example.civilizedcity.service.TaMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MessagEventListener implements ApplicationListener<MessagEvent> {
+    @Autowired
+    TaMessageService taMessageService;
+
+    @Override
+    public void onApplicationEvent(MessagEvent event) {
+        if (null != event.getTaIssue()) {
+            taMessageService.sendMessage(event.getTaIssue());
+        }
+
+        if (null != event.getTaIssueApply()) {
+            taMessageService.sendMessage(event.getTaIssueApply());
+        }
+    }
+}

src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java

@@ -21,4 +21,6 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
      int updateApply(@Param("issueId") Integer issueId,
                      @Param("applyType") String applyType,
                      @Param("applyId") Integer applyId);
+
+     int updateValidateStatus(@Param("issueId") Integer issueId, @Param("validateStatus") int validateStatus);
  }

src/main/java/com/example/civilizedcity/mapper/TaMessageMapper.java

@@ -0,0 +1,16 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.example.civilizedcity.entity.TaMessage;
+
+ /**
+ * 消息通知;(ta_message)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-2
+ */
+@Mapper
+public interface TaMessageMapper  extends BaseMapper<TaMessage>{
+    
+}

src/main/java/com/example/civilizedcity/mapper/TaOrgIssueMapper.java

@@ -21,4 +21,6 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
                                    @Param("processNode") String processNode,
                                    @Param("isExpire") Boolean isExpire
      );
+
+     TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
  }

src/main/java/com/example/civilizedcity/service/TaIssueService.java

@@ -12,4 +12,8 @@ import com.example.civilizedcity.entity.TaIssue;
 public interface TaIssueService extends IBaseService<TaIssue> {
 
      IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId);
+
+     void updateValidateStatus(Integer issueId, int validateStatus);
+
+     void updateApply(Integer issueId, String applyType, Integer applyId);
  }

src/main/java/com/example/civilizedcity/service/TaMessageService.java

@@ -0,0 +1,18 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaIssueApply;
+import com.example.civilizedcity.entity.TaMessage;
+
+ /**
+ * 消息通知;(ta_message)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-2
+ */
+public interface TaMessageService extends IBaseService<TaMessage> {
+
+     void sendMessage(TaIssue taIssue);
+
+     void sendMessage(TaIssueApply taIssueApply);
+ }

src/main/java/com/example/civilizedcity/service/TaOrgIssueService.java

@@ -1,8 +1,9 @@
 package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.entity.TaOrgIssue;
 
  /**
@@ -13,4 +14,6 @@ import com.example.civilizedcity.entity.TaOrgIssue;
 public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
+
+     void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser);
  }

src/main/java/com/example/civilizedcity/service/impl/TaIssueApplyServiceImpl.java

@@ -1,10 +1,15 @@
 package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaOrgIssue;
+import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.mapper.TaIssueMapper;
+import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaIssueApply;
 import com.example.civilizedcity.mapper.TaIssueApplyMapper;
@@ -24,6 +29,12 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     @Autowired
     TaIssueMapper taIssueMapper;
 
+    @Autowired
+    TaOrgIssueMapper taOrgIssueMapper;
+
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
+
     @Override
     public void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception {
 
@@ -31,6 +42,18 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
             throw new Exception("校验问题单出错");
         }
 
+        if (!Constants.ROOT_ORG.equals(sysUser.getOrgId())) {
+            // 如果是责任单位打的申请
+            TaOrgIssue taOrgIssue = taOrgIssueMapper.getByIssueAndOrg(taIssueApply.getIssueId(), sysUser.getOrgId());
+            if (null == taOrgIssue) {
+                throw new Exception("未找到交办单位问题单");
+            }
+
+            // 标记在申请中
+            taOrgIssue.setResult(taIssueApply.getApplyType());
+            taOrgIssueMapper.updateById(taOrgIssue);
+        }
+
         taIssueApply.setApplyId(null);
         taIssueApply.setCreateUser(sysUser.getUserId());
         taIssueApply.setCreateUserName(sysUser.getName());
@@ -40,6 +63,13 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
         save(taIssueApply);
 
         taIssueMapper.updateApply(taIssueApply.getIssueId(), taIssueApply.getApplyType(), taIssueApply.getApplyId());
+
+
+//        if (Constants.APPLY_VERIFY.equals(taIssueApply.getApplyType())) {
+//            taIssueMapper.updateValidateStatus(taIssueApply.getIssueId(), Constants.VERIFY_SUBMIT);
+//        }
+
+        applicationEventPublisher.publishEvent(new MessagEvent(this, taIssueApply));
     }
 
     @Override

src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java

@@ -25,4 +25,14 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
 
         return baseMapper.getPageBy(pg, orgId);
     }
+
+    @Override
+    public void updateValidateStatus(Integer issueId, int validateStatus) {
+        baseMapper.updateValidateStatus(issueId, validateStatus);
+    }
+
+    @Override
+    public void updateApply(Integer issueId, String applyType, Integer applyId) {
+        baseMapper.updateApply(issueId, applyType, applyId);
+    }
 }

src/main/java/com/example/civilizedcity/service/impl/TaMessageServiceImpl.java

@@ -0,0 +1,127 @@
+package com.example.civilizedcity.service.impl;
+
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaIssueApply;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TaMessage;
+import com.example.civilizedcity.mapper.TaMessageMapper;
+import com.example.civilizedcity.service.TaMessageService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+/**
+ * 消息通知;(ta_message)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-2
+ */
+@Service
+public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements TaMessageService {
+
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void sendMessage(TaIssue taIssue) {
+        TaMessage taMessage = new TaMessage();
+
+        // 问题单驳回
+        if (Constants.PROCESS_START.equals(taIssue.getProcessNode()) && Constants.PROCESS_STATUS_REJECT.equals(taIssue.getProcessStatus())) {
+            taMessage.setTitle("问题单被驳回");
+            taMessage.setTargetType(Constants.MESSAGE_TARGET_ISSUE);
+            taMessage.setTargetId(taIssue.getIssueId().toString());
+            taMessage.setStatus(Constants.STATUS_NORMAL);
+            taMessage.setCreateDate(LocalDateTime.now());
+
+            if (Constants.ISSUE_SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
+                // 如果是市民上报
+                // TODO
+            }
+
+            if (Constants.ISSUE_SOURCE_INSPECTOR.equals(taIssue.getSourceType())) {
+                // 如果是督察员上报
+                taMessage.setOrgId(Constants.ROOT_ORG);
+                taMessage.setReceiveUser(taIssue.getCreateUser());
+            }
+
+            save(taMessage);
+        }
+    }
+
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void sendMessage(TaIssueApply taIssueApply) {
+        boolean isApply = null == taIssueApply.getVerifyDate();
+        TaMessage taMessage = new TaMessage();
+        taMessage.setTargetType(Constants.MESSAGE_TARGET_APPLY);
+        taMessage.setTargetId(taIssueApply.getApplyId().toString());
+        taMessage.setStatus(Constants.STATUS_NORMAL);
+        taMessage.setCreateDate(LocalDateTime.now());
+
+        if (isApply) {
+            switch (taIssueApply.getApplyType()) {
+                case Constants.APPLY_DELAY:
+                    taMessage.setTitle("延期申请");
+                    taMessage.setContent("延期至: " + taIssueApply.getContent());
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(Constants.ROOT_ORG);
+                    break;
+                case Constants.APPLY_REJECT:
+                    taMessage.setTitle("驳回申请");
+                    taMessage.setContent(null);
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(Constants.ROOT_ORG);
+                    break;
+                case Constants.APPLY_VERIFY:
+                    taMessage.setTitle("审核申请");
+                    taMessage.setContent(null);
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(taIssueApply.getOrgId());
+                    break;
+                case Constants.APPLY_END:
+                    taMessage.setTitle("消单申请");
+                    taMessage.setContent(null);
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(Constants.ROOT_ORG);
+                    break;
+                default:
+                    taMessage.setTitle("未知申请");
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(null);
+                    break;
+            }
+        } else {
+            taMessage.setContent("审核结果: " + (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过"));
+            taMessage.setReceiveUser(null);
+            taMessage.setOrgId(taIssueApply.getOrgId());
+
+            switch (taIssueApply.getApplyType()) {
+                case Constants.APPLY_DELAY:
+                    taMessage.setTitle("延期审核");
+                    break;
+                case Constants.APPLY_REJECT:
+                    taMessage.setTitle("驳回审核");
+                    break;
+                case Constants.APPLY_VERIFY:
+                    taMessage.setTitle("问题单审核");
+                    break;
+                case Constants.APPLY_END:
+                    taMessage.setTitle("办结审核");
+                    break;
+                default:
+                    taMessage.setTitle("未知审核");
+                    taMessage.setReceiveUser(null);
+                    taMessage.setOrgId(null);
+                    break;
+            }
+        }
+
+        save(taMessage);
+    }
+}

src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java

@@ -1,14 +1,18 @@
 package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.civilizedcity.entity.TaIssueProcess;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.service.TaOrgIssueService;
 
+import java.time.LocalDateTime;
+
 /**
  * 单位问题单;(ta_org_issue)表服务实现类
  *
@@ -34,4 +38,17 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
 
         return baseMapper.getIssuePageBy(pg, orgId, sourceType, processNode, isExpire);
     }
+
+    @Override
+    public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) {
+        TaOrgIssue taOrgIssue = new TaOrgIssue();
+        taOrgIssue.setIssueId(taIssue.getIssueId());
+        taOrgIssue.setOrgId(taIssueProcess.getOrgId());
+        taOrgIssue.setProcessStatus(Constants.PROCESS_START);
+        taOrgIssue.setStatus(Constants.STATUS_NORMAL);
+        taOrgIssue.setCreateDate(LocalDateTime.now());
+        taOrgIssue.setCreateUser(sysUser.getUserId());
+
+        save(taOrgIssue);
+    }
 }

src/main/resources/mapper/TaIssueMapper.xml

@@ -9,6 +9,12 @@
         WHERE
             t.issue_id = #{issueId}
     </update>
+    <update id="updateValidateStatus">
+        UPDATE ta_issue t
+        SET t.validate_status = #{validateStatus}
+        WHERE
+            t.issue_id = #{issueId}
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT

src/main/resources/mapper/TaMessageMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.example.civilizedcity.mapper.TaMessageMapper">
+    
+</mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -36,4 +36,14 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="getByIssueAndOrg" resultType="com.example.civilizedcity.entity.TaOrgIssue">
+        SELECT
+            *
+        FROM
+            ta_org_issue t
+        WHERE
+            t.issue_id = #{issueId}
+          AND t.org_id = #{orgId}
+          AND t.`status` = 1
+    </select>
 </mapper>