dev1.0

db/.back_文明创办/文明创办-backup-2023131183934.pdma.json → db/.back_文明创办/文明创办-backup-202323142950.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-31 18:39:19",
+  "updatedTime": "2023-1-31 18:39:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -8636,9 +8636,32 @@
       "id": "78C3BB38-9B37-445B-A311-168B4682FE5E",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TsStatData"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ts_stat_data",
       "defName": "常用统计",
@@ -8757,7 +8780,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "1",
+          "defaultValue": "",
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
@@ -8774,7 +8797,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "0",
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",

db/.back_文明创办/文明创办-backup-202318151439.pdma.json → db/.back_文明创办/文明创办-backup-202323151753.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-8 15:14:32",
+  "updatedTime": "2023-2-3 14:29:50",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1204,6 +1204,23 @@
           "uiHint": "",
           "id": "C3E43687-58A1-4E99-AE11-085F9B6688D7"
         },
+        {
+          "defKey": "is_user",
+          "defName": "是否系统用户",
+          "comment": "0市民,1系统用户",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
@@ -3193,7 +3210,7 @@
           "id": "CC5551B8-C645-4192-9A06-E5820C6F3357"
         },
         {
-          "defKey": "conent",
+          "defKey": "content",
           "defName": "正文",
           "comment": "",
           "type": "TEXT",
@@ -5639,7 +5656,7 @@
       "env": {
         "base": {
           "nameSpace": "com.example.civilizedcity",
-          "codeRoot": "TdQuestion"
+          "codeRoot": "TdLocQuestion"
         },
         "template": {
           "JavaMybatisPlus": {
@@ -6291,6 +6308,23 @@
           "domain": "",
           "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
         },
+        {
+          "defKey": "fill_unit",
+          "defName": "填空题单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "C81DEB4C-049A-4D1D-B506-21C920AE4286"
+        },
         {
           "defKey": "stand",
           "defName": "评分标准",
@@ -6904,9 +6938,32 @@
       "id": "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaFeedback"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_feedback",
       "defName": "反馈表",
@@ -6989,7 +7046,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -7031,6 +7088,39 @@
           "domain": "",
           "id": "2B36F8F1-9C06-434F-B4D5-0A28D587BA24"
         },
+        {
+          "defKey": "location",
+          "defName": "定位",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "2D8D31C7-FD0E-48DB-9538-FCF3B79E93AB"
+        },
+        {
+          "defKey": "addr",
+          "defName": "具体位置",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "215DDE0F-97A2-4DBC-99D5-31C8AF2768E9"
+        },
         {
           "defKey": "person_id",
           "defName": "反馈人ID",
@@ -7085,18 +7175,18 @@
         {
           "defKey": "verify_status",
           "defName": "审核状态",
-          "comment": "0未审,1通过,2驳回",
+          "comment": "null未审,pass通过,reject驳回",
           "type": "",
           "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "0",
+          "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "90567F1C-10F8-4BB2-9F32-B92B7077091B"
         },
         {
@@ -7116,6 +7206,23 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "2DD06082-1A99-45ED-A4FC-2A09B4674DCB"
         },
+        {
+          "defKey": "verify_date",
+          "defName": "审核日期",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "3F742306-C7EA-4CB8-BF0C-12E62CE0BC4B"
+        },
         {
           "defKey": "issue_id",
           "defName": "关联问题单",
@@ -7375,6 +7482,23 @@
           "domain": "",
           "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
         },
+        {
+          "defKey": "report_issue",
+          "defName": "上报问题",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "18CF14DD-048B-4743-81D9-0D6428EDBF54"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",
@@ -7943,6 +8067,23 @@
           "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
           "uiHint": ""
         },
+        {
+          "defKey": "process_node",
+          "defName": "流程节点",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "refDict": "",
+          "extProps": {},
+          "id": "A3EEF4DF-16EC-405B-921C-9F0E41363200"
+        },
         {
           "defKey": "process_status",
           "defName": "业务单状态",
@@ -8332,6 +8473,373 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "38420D50-01AB-4E31-84D3-20192D26E25F",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckStand"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_check_stand",
+      "defName": "测评标准",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "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": "statnd_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": "219A66C3-6D3F-4F1E-A572-9E5294556142"
+        },
+        {
+          "defKey": "content",
+          "defName": "测评标准",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "",
+          "id": "30776463-B5E8-44DB-B5B6-45817A48E59F",
+          "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": "20019E0F-5BA3-4E82-B296-5E31564BCAED"
+        },
+        {
+          "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": "2F888196-3939-4DB3-8C53-CB615790D436"
+        },
+        {
+          "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": "DED8CFDE-66A8-4460-A94A-2AAA1D169C5D"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
+    },
+    {
+      "id": "78C3BB38-9B37-445B-A311-168B4682FE5E",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TsStatData"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ts_stat_data",
+      "defName": "常用统计",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "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": "stat_no",
+          "defName": "序号",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "E7763878-4C25-476F-8C26-56BF7E0A9F35"
+        },
+        {
+          "defKey": "stat_type",
+          "defName": "统计类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "49707BF9-E174-4ABA-8527-2C6A0996FE43",
+          "uiHint": ""
+        },
+        {
+          "defKey": "name",
+          "defName": "指标名称",
+          "comment": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "22B03E6C-E6FD-4D4F-855B-87E5F8EF79BF"
+        },
+        {
+          "defKey": "value",
+          "defName": "统计值",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "5DC510CC-D45C-42D4-AEED-5AD9130E0D88"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8760,12 +9268,24 @@
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
         "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
-        "430EE745-314D-48CE-A20B-ED2C4D79BC92"
+        "430EE745-314D-48CE-A20B-ED2C4D79BC92",
+        "38420D50-01AB-4E31-84D3-20192D26E25F"
       ],
       "refViews": [],
       "refDiagrams": [],
       "refDicts": [],
       "id": "96B34919-1A2F-4E7A-87B9-0330F40F7DF2"
+    },
+    {
+      "defKey": "stat",
+      "defName": "查询统计",
+      "refEntities": [
+        "78C3BB38-9B37-445B-A311-168B4682FE5E"
+      ],
+      "refViews": [],
+      "refDiagrams": [],
+      "refDicts": [],
+      "id": "49C90869-CA44-48D0-A675-ECCB8853A412"
     }
   ],
   "dataTypeMapping": {

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-31 18:39:34",
+  "updatedTime": "2023-2-3 15:17:53",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3640,6 +3640,23 @@
           "notes": {},
           "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
         },
+        {
+          "defKey": "end_date",
+          "defName": "办结日期",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "82C054A9-86DD-4905-B241-92C1467C68A4"
+        },
         {
           "defKey": "org_id",
           "defName": "责任单位",
@@ -7206,6 +7223,23 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "2DD06082-1A99-45ED-A4FC-2A09B4674DCB"
         },
+        {
+          "defKey": "verify_date",
+          "defName": "审核日期",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "3F742306-C7EA-4CB8-BF0C-12E62CE0BC4B"
+        },
         {
           "defKey": "issue_id",
           "defName": "关联问题单",
@@ -8050,6 +8084,23 @@
           "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
           "uiHint": ""
         },
+        {
+          "defKey": "process_node",
+          "defName": "流程节点",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "refDict": "",
+          "extProps": {},
+          "id": "A3EEF4DF-16EC-405B-921C-9F0E41363200"
+        },
         {
           "defKey": "process_status",
           "defName": "业务单状态",
@@ -8636,9 +8687,32 @@
       "id": "78C3BB38-9B37-445B-A311-168B4682FE5E",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TsStatData"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ts_stat_data",
       "defName": "常用统计",

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

@@ -8,7 +8,9 @@ public class Constants {
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
 
-    // 操作员身份
+    /**
+     * 人员身份
+     */
     // 督察员
     public final static String DUTY_INSPECTOR = "inspector";
     // 管理员
@@ -22,77 +24,66 @@ public class Constants {
     // 市民
     public final static String DUTY_CITIZEN = "citizen";
 
+
+    /**
+     * 资源类型
+     */
     // 问题单
-    public final static String ATTACH_SOURCE_ISSUE = "issue";
+    public final static String SOURCE_ISSUE = "issue";
     // 市民上报
-    public final static String ATTACH_SOURCE_FEEDBACK = "feedback";
+    public final static String SOURCE_FEEDBACK = "feedback";
+    // 督察员上报
+    public final static String SOURCE_INSPECTOR = "inspector";
     // 单位问题单
-    public final static String ATTACH_SOURCE_ORG_ISSUE = "org-issue";
+    public final static String SOURCE_ORG_ISSUE = "org-issue";
     // 测评答案
-    public final static String ATTACH_SOURCE_CHECK_ANSWER = "check-answer";
-
-    // 督察员上报
-    public final static String ISSUE_SOURCE_INSPECTOR = "inspector";
-    // 市民上报
-    public final static String ISSUE_SOURCE_FEEDBACK = "feedback";
+    public final static String SOURCE_CHECK_ANSWER = "check-answer";
     // 模拟测评
-    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";
-    // 通过
-    public final static String PROCESS_STATUS_PASS = "pass";
-    // 未通过
-    public final static String PROCESS_STATUS_REJECT = "reject";
-    // 逾期
-    public final static String PROCESS_STATUS_EXPIRED = "expired";
-
-
-    // 流程起始: 待交办
-    public final static String PROCESS_START = "start";
-    // 流程: 被打回 - 市民提交 - 算办结
-//    public final static String PROCESS_REJECT = "reject";
-
+    public final static String SOURCE_CHECK = "check";
     // 审核
-    public final static String PROCESS_VERIFY = "verify";
+    public final static String SOURCE_APPLY = "apply";
+
+    /**
+     * 流程节点
+     */
+    // 待交办
+    public final static String PROCESS_START = "00";
     // 交办
-    public final static String PROCESS_ASSIGNED = "assigned";
+    public final static String PROCESS_ASSIGNED = "01";
+    // 办结
+    public final static String PROCESS_END = "02";
+    // 驳回申请
+    public final static String PROCESS_APPLY_REJECT = "0101";
     // 延期申请
-    public final static String PROCESS_ORG_DELAY_APPLY = "org_delay-apply";
-    // 延期审核
-    public final static String PROCESS_DELAY_VERIFY = "delay-verify";
-    // 单位交办
-    public final static String PROCESS_ORG_ASSIGNED = "org_assigned";
+    public final static String PROCESS_APPLY_DELAY = "0102";
     // 单位审核
-    public final static String PROCESS_ORG_VERIFY = "org_verify";
+    public final static String PROCESS_APPLY_VERIFY = "0103";
     // 办结申请
-    public final static String PROCESS_ORG_FINISH_APPLY = "org_finish-apply";
-    // 办结审核
-    public final static String PROCESS_FINISH_VERIFY = "finish-verify";
+    public final static String PROCESS_APPLY_END = "0104";
 
+    /**
+     * 审核结果
+     */
+    // 未审核
+    public final static String APPLY_READY = "ready";
+    // 审核通过
+    public final static String APPLY_PASS = "pass";
+    // 审核驳回
+    public final static String APPLY_REJECT = "reject";
 
-    // 流程结束: 已办结
-    public final static String PROCESS_END = "end";
-
-    // 问题单
-    public final static String MESSAGE_TARGET_ISSUE = "issue";
-    // 申请流程
-    public final static String MESSAGE_TARGET_APPLY = "apply";
-
+    /**
+     * 调查问卷
+     */
+    // 实地调查
+    public final static String CHECK_OF_LOC = "loc";
     // 调查问卷
-    public final static String CHECK_OF_LOC = "loc"; // 实地调查
-    public final static String CHECK_OF_SURVEY = "survey"; // 调查问卷
+    public final static String CHECK_OF_SURVEY = "survey";
 
-    // 题型
-    public final static String QU_OF_FILL = "fill"; // 填空题
-    public final static String QU_OF_RADIO = "radio"; // 选择题
+    /**
+     * 问题题型
+     */
+    // 填空题
+    public final static String QU_OF_FILL = "fill";
+    // 选择题
+    public final static String QU_OF_RADIO = "radio";
 }

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

@@ -66,7 +66,7 @@ public class TaCheckAnswerItemController extends BaseController {
 
         if (null != result && result.size() > 0) {
             for(TaCheckAnswerItem item : result) {
-                List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_CHECK_ANSWER, item.getItemId());
+                List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_CHECK_ANSWER, item.getItemId());
                 item.setAttachList(attachList);
             }
         }

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

@@ -47,7 +47,7 @@ public class TaFeedbackController extends BaseController {
     @GetMapping("/taFeedback/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         TaFeedback taFeedback = taFeedbackService.getById(id);
-        List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_FEEDBACK, taFeedback.getFeedbackId());
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_FEEDBACK, taFeedback.getFeedbackId());
         taFeedback.setAttachList(attachList);
         return ResponseBean.success(taFeedback);
     }

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

@@ -7,14 +7,10 @@ import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.event.MessagEvent;
-import com.example.civilizedcity.service.SysUserDutyService;
 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;
@@ -42,7 +38,7 @@ public class TaIssueApplyController extends BaseController {
     private TaIssueService taIssueService;
 
     @Autowired
-    private SysUserDutyService sysUserDutyService;
+    private TaOrgIssueService taOrgIssueService;
 
     @Autowired
     ApplicationEventPublisher applicationEventPublisher;
@@ -50,7 +46,7 @@ public class TaIssueApplyController extends BaseController {
     /**
      * 通过ID查询单条数据
      *
-     * @param applyId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -61,7 +57,8 @@ public class TaIssueApplyController extends BaseController {
     /**
      * 通过ISSUE_ID查询单条数据
      *
-     * @param applyId 主键
+     * @param issueId 问题单ID
+     * @param applyType 申请类型
      * @return 实例对象
      */
     @ApiOperation("通过ISSUE_ID查询单条数据")
@@ -120,7 +117,16 @@ public class TaIssueApplyController extends BaseController {
     @ApiOperation("申请流程")
     @PostMapping("/taIssueApply")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaIssueApply taIssueApply) throws Exception {
-        taIssueApplyService.createNewApply(taIssueApply, currentUser());
+        if (null == taIssueApply.getIssueId()) {
+            throw new Exception("校验问题单出错");
+        }
+
+        SysUser sysUser = currentUser();
+        if (null == taOrgIssueService.getByIssueAndOrg(taIssueApply.getIssueId(), sysUser.getOrgId())) {
+            throw new Exception("未找到交办单位问题单");
+        }
+
+        taIssueApplyService.createNewApply(taIssueApply, sysUser);
         return ResponseBean.success(taIssueApply);
     }
 
@@ -141,7 +147,7 @@ public class TaIssueApplyController extends BaseController {
         }
 
         // 如果是审核驳回
-        if (StringUtils.isEmpty(taIssueApply.getVerifyDesc()) && Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
+        if (StringUtils.isEmpty(taIssueApply.getVerifyDesc()) && Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
             return ResponseBean.error("请填写驳回理由");
         }
 
@@ -149,47 +155,19 @@ public class TaIssueApplyController extends BaseController {
         taIssueApply.setApplyId(id);
         taIssueApplyService.verify(taIssueApply, sysUser, origin);
 
-        origin.setVerifyStatus(taIssueApply.getVerifyStatus());
-        origin.setVerifyDesc(taIssueApply.getVerifyDesc());
-        origin.setVerifyOrg(sysUser.getOrgId());
-        origin.setVerifyUser(sysUser.getUserId());
-        origin.setVerifyUserName(sysUser.getName());
-        origin.setVerifyDate(LocalDateTime.now());
-
-        taIssueApplyService.updateById(origin);
-
-        //
-        taIssueService.updateApply(taIssueApply.getIssueId(), null, null);
-
-        // 如果是销单申请
-        if (Constants.APPLY_END.equals(origin.getApplyType())) {
-            if (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus())) {
-                // 如果通过
-                taIssueService.updateEnd(sysUser, taIssueApply.getOrgId(), taIssueApply.getIssueId());
-            }
-        }
-
-//        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);
-//        }
-
-
-        applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
-
         return ResponseBean.success(origin);
     }
 
-    /**
-     * 通过主键删除数据
-     *
-     * @param applyId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taIssueApply/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
-        taIssueApplyService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param id 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/taIssueApply/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
+//        taIssueApplyService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

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

@@ -2,6 +2,7 @@ package com.example.civilizedcity.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
@@ -51,7 +52,7 @@ public class TaIssueController extends BaseController {
     /**
      * 通过ID查询单条数据
      *
-     * @param issueId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -59,7 +60,7 @@ public class TaIssueController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
 
         TaIssue taIssue = taIssueService.getById(id);
-        List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_ISSUE, taIssue.getIssueId().toString());
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_ISSUE, taIssue.getIssueId().toString());
         taIssue.setAttachList(attachList);
 
         return ResponseBean.success(taIssue);
@@ -89,28 +90,15 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-//        Boolean mine = true;
-//        Integer validateStatus = null;
-//        if (isRooter) {
-//            mine = false;
-//        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
-//            mine = true;
-//        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
-//            mine = false;
-//            validateStatus = 0;
-//        } else {
-//            return ResponseBean.error("暂无权限查询数据");
-//        }
-
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
-            queryWrapper.eq("process_node", bizStatus);
+            queryWrapper.likeRight("process_node", bizStatus);
         } else if (Constants.PROCESS_ASSIGNED.equals(bizStatus)) {
             // 已交办
-            queryWrapper.eq("process_node", bizStatus);
+            queryWrapper.likeRight("process_node", bizStatus);
         } else if (Constants.PROCESS_END.equals(bizStatus)) {
             // 已办结
             queryWrapper.eq("process_node", bizStatus);
@@ -120,8 +108,8 @@ public class TaIssueController extends BaseController {
             queryWrapper.le("expire_date", DateUtils.today());
         } else if ("reject".equals(bizStatus)) {
             // 已打回
-            queryWrapper.ne("process_node", Constants.PROCESS_END);
-            queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
+            queryWrapper.eq("process_node", Constants.PROCESS_APPLY_REJECT);
+            queryWrapper.eq("process_status", Constants.APPLY_PASS);
         }
 
         // 督察员
@@ -132,8 +120,8 @@ public class TaIssueController extends BaseController {
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
         queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
-        queryWrapper.eq(Constants.ISSUE_SOURCE_FEEDBACK.equals(sourceType), "source_type", "feedback");
-        queryWrapper.ne(Constants.ISSUE_SOURCE_INSPECTOR.equals(sourceType), "source_type", "feedback");
+        queryWrapper.eq(Constants.SOURCE_FEEDBACK.equals(sourceType), "source_type", Constants.SOURCE_FEEDBACK);
+        queryWrapper.ne(!Constants.SOURCE_FEEDBACK.equals(sourceType), "source_type", Constants.SOURCE_FEEDBACK);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
@@ -150,46 +138,14 @@ public class TaIssueController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taIssue")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaIssue taIssue) throws Exception {
-        SysUser user = currentUser();
+        // 督察员上报专用
 
-        taIssue.setIssueId(null);
-        taIssue.setOrgId(null); // 暂时没有责任单位
-        taIssue.setProcessNode(Constants.PROCESS_START);
-        taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
-        taIssue.setProcessNum(1);
-        taIssue.setSourceType(Constants.ISSUE_SOURCE_INSPECTOR);
-        taIssue.setStatus(Constants.STATUS_NORMAL);
-        taIssue.setCreateUser(user.getUserId());
-        taIssue.setUserName(user.getName());
-        taIssue.setCreateDate(LocalDateTime.now());
-        taIssueService.save(taIssue);
-
-        // 保存文件
-        List<TaAttach> attachList = taIssue.getAttachList();
-        if (null != attachList && attachList.size() > 0) {
-            for (TaAttach item : attachList) {
-                item.setAttachId(null);
-                item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
-                item.setOwnerId(taIssue.getIssueId().toString());
-                item.setStatus(Constants.STATUS_NORMAL);
-                item.setCreateDate(LocalDateTime.now());
-            }
+        if (null == taIssue.getAttachList() || taIssue.getAttachList().size() == 0) {
+            return ResponseBean.error("请上传照片");
         }
 
-        taAttachService.saveBatch(attachList);
-
-        // 流程开始
-        TaIssueProcess process = new TaIssueProcess();
-        process.setIssueId(taIssue.getIssueId());
-        process.setOrgId(user.getOrgId());
-        process.setProcessNode(Constants.PROCESS_START);
-        process.setProcessStatus(Constants.PROCESS_STATUS_READY);
-        process.setStatus(Constants.STATUS_NORMAL);
-        process.setCreateUser(user.getUserId());
-        process.setUserName(user.getName());
-        process.setCreateDate(LocalDateTime.now());
-        taIssueProcessService.save(process);
-
+        SysUser user = currentUser();
+        taIssueService.createNew(taIssue, user);
         return ResponseBean.success(taIssue);
     }
 
@@ -214,40 +170,14 @@ 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);
-
-        // 保存文件
-        List<Integer> idList = new ArrayList<>();
-        for (TaAttach item : attachList) {
-            item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
-            item.setOwnerId(taIssue.getIssueId().toString());
-            item.setStatus(Constants.STATUS_NORMAL);
-            item.setCreateDate(LocalDateTime.now());
-
-            if (null == item.getAttachId()) {
-                taAttachService.save(item);
-            } else {
-                taAttachService.updateById(item);
-            }
-            idList.add(item.getAttachId());
-        }
-
-        // 删除部分文件
-        taAttachService.deleteNotIn(idList, Constants.ATTACH_SOURCE_ISSUE, id.toString());
-
-        return ResponseBean.success(taIssue);
+        taIssueService.updateIssue(taIssue, origin);
+        return ResponseBean.success(origin);
     }
 
     /**
      * 通过主键删除数据
      *
-     * @param issueId 主键
+     * @param id 主键
      * @return 是否成功
      */
     @SaCheckPermission("manager")

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

@@ -6,19 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
 
-import java.time.LocalDateTime;
-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;
@@ -43,13 +38,10 @@ public class TaIssueProcessController extends BaseController {
     @Autowired
     private TaOrgIssueService taOrgIssueService;
 
-    @Autowired
-    ApplicationEventPublisher applicationEventPublisher;
-
     /**
      * 通过ID查询单条数据
      *
-     * @param processId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -98,52 +90,6 @@ public class TaIssueProcessController extends BaseController {
         return taIssue;
     }
 
-    private void updateUser(TaIssueProcess taIssueProcess, SysUser sysUser) {
-        taIssueProcess.setOrgId(sysUser.getOrgId());
-        taIssueProcess.setCreateUser(sysUser.getUserId());
-        taIssueProcess.setUserName(sysUser.getName());
-        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
-        taIssueProcess.setCreateDate(LocalDateTime.now());
-    }
-
-    private void updateIssue(TaIssue taIssue, TaIssueProcess taIssueProcess) {
-        taIssue.setProcessNode(taIssueProcess.getProcessNode());
-        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);
-//    }
-
     /**
      * 交办
      *
@@ -156,10 +102,8 @@ public class TaIssueProcessController extends BaseController {
     public ResponseBean assigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
         TaIssue taIssue = checkIssue(taIssueProcess);
 
-        if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
+        if (StringUtils.isEmpty(taIssueProcess.getNextOrg())) {
             return ResponseBean.error("请指定交办单位");
-        } else {
-            taIssue.setOrgId(taIssueProcess.getOrgId());
         }
         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
             return ResponseBean.error("请设置截止日期");
@@ -167,32 +111,21 @@ public class TaIssueProcessController extends BaseController {
             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, sysUser);
-
+        taOrgIssueService.createNewIssue(taIssue, taIssueProcess, sysUser);
         return ResponseBean.success(taIssueProcess);
     }
 
     /**
-     * 驳回
+     * 管理员驳回问题单
      *
      * @param taIssueProcess 实例对象
      * @return 实例对象
      */
-    @SaCheckPermission("org_user")
-    @ApiOperation("驳回")
+    @SaCheckPermission("manager")
+    @ApiOperation("管理员驳回问题单")
     @PostMapping("/taIssueProcess/reject")
     public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
         TaIssue taIssue = checkIssue(taIssueProcess);
@@ -201,261 +134,8 @@ public class TaIssueProcessController extends BaseController {
             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/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);
-
+        // 管理员驳回问题单
+        taIssueService.reject(taIssue, taIssueProcess, currentUser());
         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 processId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taIssueProcess/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
-        taIssueProcessService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
 }

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

@@ -39,7 +39,7 @@ public class TaOrgIssueController extends BaseController {
     /** 
      * 通过ID查询单条数据 
      *
-     * @param orgIssueId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -63,7 +63,7 @@ public class TaOrgIssueController extends BaseController {
 
          TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);
          if (null != taOrgIssue) {
-             List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
+             List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
              taOrgIssue.setAttachList(attachList);
          }
 
@@ -91,43 +91,45 @@ public class TaOrgIssueController extends BaseController {
         return ResponseBean.success(result);
     }
     
-    /** 
-     * 新增数据
-     *
-     * @param taOrgIssue 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/taOrgIssue")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue) throws Exception {
-        taOrgIssueService.save(taOrgIssue);
-        return ResponseBean.success(taOrgIssue);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param taOrgIssue 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/taOrgIssue/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-        taOrgIssueService.updateById(taOrgIssue);
-        return ResponseBean.success(taOrgIssue);
-    }
-    
-    /** 
-     * 通过主键删除数据
-     *
-     * @param orgIssueId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taOrgIssue/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        taOrgIssueService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 新增数据
+//     *
+//     * @param taOrgIssue 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/taOrgIssue")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue) throws Exception {
+//        taOrgIssueService.save(taOrgIssue);
+//        return ResponseBean.success(taOrgIssue);
+//    }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param taOrgIssue 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/taOrgIssue/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue,
+//                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+//        taOrgIssue.setOrgIssueId(id);
+//
+//        taOrgIssueService.updateById(taOrgIssue);
+//        return ResponseBean.success(taOrgIssue);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param id 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/taOrgIssue/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+//        taOrgIssueService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

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

@@ -56,6 +56,9 @@ public class TaFeedback implements Serializable,Cloneable{
     /** 审核意见 */
     @ApiModelProperty(name = "审核意见",notes = "")
     private String verifyDesc ;
+     /** 审核日期 */
+     @ApiModelProperty(name = "审核日期",notes = "")
+     private LocalDateTime verifyDate ;
     /** 关联问题单 */
     @ApiModelProperty(name = "关联问题单",notes = "")
     private String issueId ;

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

@@ -63,6 +63,9 @@ public class TaIssue implements Serializable,Cloneable{
        /** 截止时间;YYYY-MM-DD */
        @ApiModelProperty(name = "截止时间",notes = "YYYY-MM-DD")
        private String expireDate ;
+     /** 办结时间 */
+     @ApiModelProperty(name = "办结时间",notes = "")
+     private LocalDateTime endDate ;
       /** 交办次数 */
       @ApiModelProperty(name = "交办次数",notes = "")
       private Integer processNum ;

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

@@ -35,6 +35,9 @@ public class TaOrgIssue implements Serializable,Cloneable{
     /** 机构ID */
     @ApiModelProperty(name = "机构ID",notes = "")
     private String orgId ;
+     /** 流程节点 */
+     @ApiModelProperty(name = "流程节点",notes = "")
+     private String processNode ;
     /** 业务单状态 */
     @ApiModelProperty(name = "业务单状态",notes = "")
     private String processStatus ;

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

@@ -16,4 +16,8 @@ import java.util.List;
 public interface TaAttachMapper  extends BaseMapper<TaAttach>{
 
      List<TaAttach> getListBy(@Param("ownerType") String ownerType,@Param("ownerId") String ownerId);
- }
+
+    long deleteNotIn(@Param("idList") List<Integer> idList,
+                     @Param("ownerType") String ownerType,
+                     @Param("ownerId") String ownerId);
+}

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

@@ -27,5 +27,5 @@ public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
     IPage<TaIssue> getPageBy(IPage<TaIssue> pg,
                              @Param("personId") String personId,
                              @Param("processList") List<String> processList,
-                             @Param("verifyStatus") String verifyStatus);
+                             @Param("processStatus") String processStatus);
 }

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

@@ -3,6 +3,7 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.vo.StatVo;
 
@@ -24,4 +25,10 @@ public interface TaIssueService extends IBaseService<TaIssue> {
      List<StatVo> statMaIndex(SysUser user, TaPerson person, String duty);
 
     void updateEnd(SysUser sysUser, String orgId, Integer issueId);
+
+    void createNew(TaIssue taIssue, SysUser user) throws Exception;
+
+    void updateIssue(TaIssue taIssue, TaIssue origin) throws Exception;
+
+    void reject(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser user) throws Exception;
 }

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

@@ -15,5 +15,7 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
 
-     void createNewIssue(TaIssue taIssue, SysUser sysUser);
+     void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
+
+     TaOrgIssue getByIssueAndOrg(Integer issueId, String orgId);
  }

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

@@ -25,12 +25,6 @@ public class TaAttachServiceImpl extends BaseServiceImpl<TaAttachMapper, TaAttac
 
     @Override
     public boolean deleteNotIn(List<Integer> idList, String ownerType, String ownerId) {
-
-        QueryWrapper<TaAttach> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("owner_type", ownerType);
-        queryWrapper.eq("owner_id", ownerId);
-        queryWrapper.notIn("attach_id", idList);
-
-        return remove(queryWrapper);
+        return baseMapper.deleteNotIn(idList, ownerType, ownerId) > 0;
     }
 }

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

@@ -174,7 +174,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             // 保存附件
             if (null != item.getAttachList()) {
                 for (TaAttach taAttach : item.getAttachList()) {
-                    taAttach.setOwnerType(Constants.ATTACH_SOURCE_CHECK_ANSWER);
+                    taAttach.setOwnerType(Constants.SOURCE_CHECK_ANSWER);
                     taAttach.setOwnerId(item.getItemId());
                     taAttach.setStatus(Constants.STATUS_NORMAL);
                     taAttach.setCreateUser(taCheckAnswer.getCreateUser());

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

@@ -3,16 +3,10 @@ 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.TaAttach;
-import com.example.civilizedcity.entity.TaIssue;
-import com.example.civilizedcity.entity.TaPerson;
-import com.example.civilizedcity.mapper.TaAttachMapper;
-import com.example.civilizedcity.mapper.TaIssueMapper;
-import com.example.civilizedcity.mapper.TaPersonMapper;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaFeedback;
-import com.example.civilizedcity.mapper.TaFeedbackMapper;
 import com.example.civilizedcity.service.TaFeedbackService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,6 +32,9 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
     @Autowired
     TaAttachMapper taAttachMapper;
 
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception {
@@ -71,20 +68,21 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
 
         taIssue.setOrgId(null); // 暂时没有责任单位
         taIssue.setProcessNode(Constants.PROCESS_START);
-        taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
-        taIssue.setProcessNum(1);
-        taIssue.setSourceType(Constants.ISSUE_SOURCE_FEEDBACK);
+        taIssue.setProcessStatus(Constants.APPLY_READY); // 需要审核
+        taIssue.setProcessNum(0);
+        taIssue.setSourceType(Constants.SOURCE_FEEDBACK);
         taIssue.setStatus(Constants.STATUS_NORMAL);
         taIssue.setCreateUser(taFeedback.getPersonId());
-        taIssue.setUserName(taFeedback.getName());
+        taIssue.setUserName(StringUtils.isEmpty(taFeedback.getName()) ? "市民" : taFeedback.getName());
         taIssue.setCreateDate(LocalDateTime.now());
         taIssueMapper.insert(taIssue);
+
         // 保存文件
         List<TaAttach> attachList = taFeedback.getAttachList();
         if (null != attachList && attachList.size() > 0) {
             for (TaAttach item : attachList) {
                 item.setAttachId(null);
-                item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
+                item.setOwnerType(Constants.SOURCE_ISSUE);
                 item.setOwnerId(taIssue.getIssueId().toString());
                 item.setStatus(Constants.STATUS_NORMAL);
                 item.setCreateDate(LocalDateTime.now());
@@ -98,19 +96,30 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
         if (null != attachList && attachList.size() > 0) {
             for (TaAttach item : attachList) {
                 item.setAttachId(null);
-                item.setOwnerType(Constants.ATTACH_SOURCE_FEEDBACK);
+                item.setOwnerType(Constants.SOURCE_FEEDBACK);
                 item.setOwnerId(taFeedback.getFeedbackId());
                 taAttachMapper.insert(item);
             }
         }
 
+        // 流程节点
+        TaIssueProcess process = new TaIssueProcess();
+        process.setIssueId(taIssue.getIssueId());
+        process.setOrgId(null); // 市民没有 org
+        process.setProcessNode(Constants.PROCESS_START);
+        process.setProcessStatus(Constants.APPLY_READY);
+        process.setStatus(Constants.STATUS_NORMAL);
+        process.setCreateUser(taPerson.getPersonId());
+        process.setUserName(StringUtils.isEmpty(taFeedback.getName()) ? "市民" : taPerson.getName());
+        process.setCreateDate(LocalDateTime.now());
+        taIssueProcessMapper.insert(process);
     }
 
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus) {
 
         List<String> processList = new ArrayList<>();
-        String verifyStatus = null;
+        String processStatus = null;
 
         // 未处理
         if (Constants.PROCESS_START.equals(bizStatus)) {
@@ -124,10 +133,11 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
         }
 
         // 已打回
-        if (Constants.APPLY_STATUS_REJECT.equals(bizStatus)) {
-            verifyStatus = Constants.APPLY_STATUS_REJECT;
+        if (Constants.APPLY_REJECT.equals(bizStatus)) {
+            processList.add(Constants.PROCESS_END);
+            processStatus = Constants.APPLY_REJECT;
         }
 
-        return baseMapper.getPageBy(pg, personId, processList, verifyStatus);
+        return baseMapper.getPageBy(pg, personId, processList, processStatus);
     }
 }

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

@@ -4,17 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.TaIssue;
-import com.example.civilizedcity.entity.TaOrgIssue;
+import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.event.MessagEvent;
-import com.example.civilizedcity.mapper.TaIssueMapper;
-import com.example.civilizedcity.mapper.TaOrgIssueMapper;
+import com.example.civilizedcity.mapper.*;
 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;
 import com.example.civilizedcity.service.TaIssueApplyService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,40 +30,50 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     @Autowired
     TaOrgIssueMapper taOrgIssueMapper;
 
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
+    @Autowired
+    TaFeedbackMapper taFeedbackMapper;
+
     @Autowired
     ApplicationEventPublisher applicationEventPublisher;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception {
-
-        if (null == taIssueApply.getIssueId()) {
-            throw new Exception("校验问题单出错");
-        }
-
-        if (!Constants.ROOT_ORG.equals(sysUser.getOrgId())) {
-            // 如果是责任单位打的申请
-            TaOrgIssue taOrgIssue = taOrgIssueMapper.getByIssueAndOrg(taIssueApply.getIssueId(), sysUser.getOrgId());
-            if (null == taOrgIssue) {
-                throw new Exception("未找到交办单位问题单");
-            }
-
-            taOrgIssueMapper.updateById(taOrgIssue);
-        }
-
+        // 1. 先生成申请记录
         taIssueApply.setApplyId(null);
         taIssueApply.setCreateUser(sysUser.getUserId());
         taIssueApply.setCreateUserName(sysUser.getName());
         taIssueApply.setOrgId(sysUser.getOrgId());
         taIssueApply.setCreateDate(LocalDateTime.now());
-
         save(taIssueApply);
 
-        taIssueMapper.updateApply(taIssueApply.getIssueId(), taIssueApply.getApplyType(), taIssueApply.getApplyId());
-
-
-//        if (Constants.APPLY_VERIFY.equals(taIssueApply.getApplyType())) {
-//            taIssueMapper.updateValidateStatus(taIssueApply.getIssueId(), Constants.VERIFY_SUBMIT);
-//        }
+        // 2. 更新主记录
+        TaIssue taIssue = taIssueMapper.selectById(taIssueApply.getIssueId());
+        taIssue.setProcessNode(taIssueApply.getApplyType());
+        taIssue.setProcessStatus(Constants.APPLY_READY);
+        taIssue.setApplyType(taIssueApply.getApplyType());
+        taIssue.setApplyId(taIssueApply.getApplyId());
+        taIssueMapper.updateById(taIssue);
+
+        // 3. 更新单位记录
+        TaOrgIssue taOrgIssue = taOrgIssueMapper.getByIssueAndOrg(taIssueApply.getIssueId(), taIssueApply.getOrgId());
+        taOrgIssue.setProcessNode(taIssue.getProcessNode());
+        taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
+        taOrgIssueMapper.updateById(taOrgIssue);
+
+        // 4. 生成流程节点
+        TaIssueProcess taIssueProcess = new TaIssueProcess();
+        taIssueProcess.setIssueId(taIssue.getIssueId());
+        taIssueProcess.setOrgId(taIssueApply.getOrgId());
+        taIssueProcess.setProcessNode(taIssue.getProcessNode());
+        taIssueProcess.setProcessStatus(taIssue.getProcessStatus());
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
 
         applicationEventPublisher.publishEvent(new MessagEvent(this, taIssueApply));
     }
@@ -81,69 +86,133 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void verify(TaIssueApply taIssueApply, SysUser sysUser, TaIssueApply origin) throws Exception {
-        // 先更新审核信息
+        // 1. 更新审核信息
         origin.setVerifyStatus(taIssueApply.getVerifyStatus());
         origin.setVerifyDesc(taIssueApply.getVerifyDesc());
         origin.setVerifyOrg(sysUser.getOrgId());
         origin.setVerifyUser(sysUser.getUserId());
         origin.setVerifyUserName(sysUser.getName());
         origin.setVerifyDate(LocalDateTime.now());
-        updateById(origin);
-
-        // 再判断审核类型
+        updateById(origin); // 至此 origin 里面是最新的信息
+
+        // 2. 生成流程记录
+        TaIssueProcess taIssueProcess = new TaIssueProcess();
+        taIssueProcess.setIssueId(origin.getIssueId());
+        taIssueProcess.setOrgId(origin.getOrgId());
+        taIssueProcess.setProcessNode(origin.getApplyType());
+        taIssueProcess.setProcessStatus(origin.getVerifyStatus());
+        taIssueProcess.setProcessResult(origin.getVerifyDesc());
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+
+        // 3. 更新单位问题表
+        TaOrgIssue taOrgIssue = taOrgIssueMapper.getByIssueAndOrg(origin.getIssueId(), origin.getOrgId());
+        taOrgIssue.setProcessStatus(origin.getVerifyStatus());
+
+        // 4. 更正问题主表
+        TaIssue taIssue = taIssueMapper.selectById(taIssueApply.getIssueId());
         switch (origin.getApplyType()) {
-            case Constants.APPLY_VERIFY:
+            case Constants.PROCESS_APPLY_VERIFY:
                 // 问题单审核
-                verifyIssue();
+                verifyIssue(origin, taIssue, taOrgIssue);
                 break;
-            case Constants.APPLY_REJECT:
+            case Constants.PROCESS_APPLY_REJECT:
                 // 问题单驳回
-                verifyReject();
+                verifyReject(origin, taIssue, taOrgIssue);
                 break;
-            case Constants.APPLY_DELAY:
+            case Constants.PROCESS_APPLY_DELAY:
                 // 延期申请
-                verifyDelay(taIssueApply, origin);
+                verifyDelay(origin, taIssue, taOrgIssue);
                 break;
-            case Constants.APPLY_END:
+            case Constants.PROCESS_APPLY_END:
                 // 销单申请
+                verifyEnd(origin, taIssue, taOrgIssue);
                 break;
             default:
                 // 其他
                 break;
         }
 
+        taIssue.setUpdateDate(LocalDateTime.now());
+        taIssue.setUpdateUser(sysUser.getUserId());
+
+        taIssueMapper.updateById(taIssue);
+        taOrgIssueMapper.updateById(taOrgIssue);
+
+//        // 如果是用户随手拍
+//        if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
+//            // 如果是销单了
+//            if (taIssue.getProcessNode().equals(Constants.PROCESS_END)) {
+//            }
+//        }
+
+        applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
     }
 
     // 问题单审核
-    public void verifyIssue() throws Exception {
-        // TODO;
+    public void verifyIssue(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
+        taIssue.setProcessStatus(taIssueApply.getVerifyStatus());
+        //
+        taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
     }
 
     // 驳回审核
-    public void verifyReject() throws Exception {
-        // TODO;
+    public void verifyReject(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
+        if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
+            // 如果审核不通过
+            taIssue.setProcessStatus(Constants.APPLY_REJECT);
+            taIssue.setProcessNum(taIssue.getProcessNum() + 1); // 交办次数 + 1
+
+            // 单位相当于重新开始
+            taOrgIssue.setProcessNode(Constants.PROCESS_START);
+            taOrgIssue.setProcessStatus(taIssue.getProcessStatus()); // 但是状态是审核不通过
+        } else {
+            taIssue.setProcessNode(Constants.PROCESS_START); // 问题单重新开始
+            taIssue.setProcessStatus(Constants.APPLY_PASS);
+//            taIssue.setProcessNum(0); // 交办次数清零
+            taIssue.setOrgId(null); // 没有交办单位
+            taIssue.setExpireDate(null); // 截止时间也没了
+            taIssue.setApplyId(null);
+            taIssue.setApplyType(null);
+
+            // 单位相当于结单了
+            taOrgIssue.setProcessNode(Constants.PROCESS_END);
+            taOrgIssue.setProcessStatus(Constants.APPLY_PASS);
+        }
     }
 
     // 延期审核
-    public void verifyDelay(TaIssueApply taIssueApply, TaIssueApply origin) throws Exception {
-        if (Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
+    public void verifyDelay(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
+        if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
             // 如果审核不通过
-            // TODO;
+            taIssue.setProcessStatus(Constants.APPLY_REJECT);
+            taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
         } else {
-            // 问题单截止日期更新为申请的截止日期
-            // 问题单的申请关联清空
-            UpdateWrapper<TaIssue> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.set("expire_date", taIssueApply.getContent());
-            updateWrapper.set("apply_type", null);
-            updateWrapper.set("apply_id", null);
-            updateWrapper.eq("issue_id", origin.getIssueId());
+            taIssue.setProcessStatus(Constants.APPLY_PASS);
+            taIssue.setExpireDate(taIssueApply.getContent()); // 更新延期日期
 
+            taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
         }
     }
 
-    // 问题单审核
-    public void verifyIssue() throws Exception {
-        // TODO;
+    // 销单审核
+    public void verifyEnd(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
+        if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
+            // 如果审核不通过
+            taIssue.setProcessStatus(Constants.APPLY_REJECT);
+            taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
+        } else {
+            taIssue.setProcessNode(Constants.PROCESS_END);
+            taIssue.setProcessStatus(Constants.APPLY_PASS);
+            taIssue.setEndDate(LocalDateTime.now());
+            taIssue.setApplyId(null);
+            taIssue.setApplyType(null);
+
+            taOrgIssue.setProcessNode(Constants.PROCESS_END);
+            taOrgIssue.setProcessStatus(Constants.APPLY_PASS);
+        }
     }
 
 

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

@@ -2,18 +2,15 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.entity.TaIssueProcess;
-import com.example.civilizedcity.entity.TaPerson;
-import com.example.civilizedcity.mapper.TaFeedbackMapper;
-import com.example.civilizedcity.mapper.TaIssueProcessMapper;
-import com.example.civilizedcity.mapper.TaOrgIssueMapper;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.event.MessagEvent;
+import com.example.civilizedcity.mapper.*;
 import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaIssue;
-import com.example.civilizedcity.mapper.TaIssueMapper;
 import com.example.civilizedcity.service.TaIssueService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -39,6 +36,12 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     @Autowired
     TaIssueProcessMapper taIssueProcessMapper;
 
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
+
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
         if (null == orgId) {
@@ -130,6 +133,120 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
 
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void createNew(TaIssue taIssue, SysUser user) throws Exception {
+        taIssue.setIssueId(null);
+        taIssue.setOrgId(null); // 暂时没有责任单位
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessStatus(Constants.APPLY_READY); // 督察员上报需要审核
+        taIssue.setProcessNum(0);   // 交办次数
+        taIssue.setSourceType(Constants.SOURCE_INSPECTOR);
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreateUser(user.getUserId());
+        taIssue.setUserName(user.getName());
+        taIssue.setCreateDate(LocalDateTime.now());
+        save(taIssue);
+
+        // 保存文件
+        List<TaAttach> attachList = taIssue.getAttachList();
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.SOURCE_ISSUE);
+                item.setOwnerId(taIssue.getIssueId().toString());
+                item.setStatus(Constants.STATUS_NORMAL);
+                item.setCreateDate(LocalDateTime.now());
+                taAttachMapper.insert(item);
+            }
+        }
+
+        // 流程开始
+        TaIssueProcess process = new TaIssueProcess();
+        process.setIssueId(taIssue.getIssueId());
+        process.setOrgId(user.getOrgId());
+        process.setProcessNode(taIssue.getProcessNode());
+        process.setProcessStatus(taIssue.getProcessStatus());
+        process.setStatus(Constants.STATUS_NORMAL);
+        process.setCreateUser(user.getUserId());
+        process.setUserName(user.getName());
+        process.setCreateDate(LocalDateTime.now());
+        taIssueProcessMapper.insert(process);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateIssue(TaIssue taIssue, TaIssue origin) throws Exception {
+        // 更新的时候只允许非业务流程字段
+        origin.setTitle(taIssue.getTitle());
+        origin.setTypeId(taIssue.getTypeId());
+        origin.setTypeName(taIssue.getTypeName());
+        origin.setLocId(taIssue.getLocId());
+        origin.setLocName(taIssue.getLocName());
+        origin.setLocation(taIssue.getLocation());
+        origin.setAddr(taIssue.getAddr());
+        origin.setContent(taIssue.getContent());
+        updateById(origin);
+
+        // 保存文件
+        List<TaAttach> attachList = taIssue.getAttachList();
+        List<Integer> idList = new ArrayList<>();
+        for (TaAttach item : attachList) {
+            item.setOwnerType(Constants.SOURCE_ISSUE);
+            item.setOwnerId(taIssue.getIssueId().toString());
+            item.setStatus(Constants.STATUS_NORMAL);
+            item.setCreateDate(LocalDateTime.now());
+
+            if (null == item.getAttachId()) {
+                taAttachMapper.insert(item);
+            } else {
+                taAttachMapper.updateById(item);
+            }
+            idList.add(item.getAttachId());
+        }
+
+        // 删除部分文件
+        taAttachMapper.deleteNotIn(idList, Constants.SOURCE_ISSUE, origin.getIssueId().toString());
+        origin.setAttachList(attachList);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void reject(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser user) throws Exception {
+        // 问题单
+        if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
+            // 如果问题单是市民提的
+            taIssue.setProcessNode(Constants.PROCESS_END);
+            TaFeedback taFeedback = taFeedbackMapper.selectById(taIssue.getSourceTarget());
+            if (null == taFeedback) {
+                throw new Exception("未找到市民随手拍记录");
+            }
+
+            taFeedback.setVerifyStatus(Constants.APPLY_REJECT);
+            taFeedback.setVerifyDesc(taIssueProcess.getProcessResult());
+            taFeedback.setVerifyDate(LocalDateTime.now());
+            taFeedbackMapper.updateById(taFeedback);
+        } else {
+            taIssue.setProcessNode(Constants.PROCESS_START);
+        }
+        taIssue.setProcessStatus(Constants.APPLY_REJECT); // 驳回
+        taIssue.setUpdateUser(user.getUserId());
+        taIssue.setUpdateDate(LocalDateTime.now());
+        baseMapper.updateById(taIssue);
+
+        // 流程记录
+        taIssueProcess.setProcessId(null);
+        taIssueProcess.setProcessNode(taIssue.getProcessNode());
+        taIssueProcess.setProcessStatus(taIssue.getProcessStatus());
+        taIssueProcess.setCreateUser(user.getUserId());
+        taIssueProcess.setUserName(user.getName());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcessMapper.insert(taIssueProcess);
+
+        // 发送消息
+        applicationEventPublisher.publishEvent(new MessagEvent(this, taIssue));
+    }
+
     Integer getStatValueBy(Object v, Integer def) {
         if (null == v) return def;
         return Integer.valueOf(v.toString());

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

@@ -31,20 +31,20 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
         TaMessage taMessage = new TaMessage();
 
         // 问题单驳回
-        if (Constants.PROCESS_START.equals(taIssue.getProcessNode()) && Constants.PROCESS_STATUS_REJECT.equals(taIssue.getProcessStatus())) {
+        if (Constants.APPLY_REJECT.equals(taIssue.getProcessStatus())) {
             taMessage.setMsgType("issue-reject");
             taMessage.setTitle("问题单被驳回");
-            taMessage.setTargetType(Constants.MESSAGE_TARGET_ISSUE);
+            taMessage.setTargetType(Constants.SOURCE_ISSUE);
             taMessage.setTargetId(taIssue.getIssueId().toString());
             taMessage.setStatus(Constants.STATUS_NORMAL);
             taMessage.setCreateDate(LocalDateTime.now());
 
-            if (Constants.ISSUE_SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
+            if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
                 // 如果是市民上报
-                // TODO
+                // 不发消息
             }
 
-            if (Constants.ISSUE_SOURCE_INSPECTOR.equals(taIssue.getSourceType())) {
+            if (Constants.SOURCE_INSPECTOR.equals(taIssue.getSourceType())) {
                 // 如果是督察员上报
                 taMessage.setOrgId(Constants.ROOT_ORG);
                 taMessage.setReceiveUser(taIssue.getCreateUser());
@@ -60,7 +60,7 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
     public void sendMessage(TaIssueApply taIssueApply) {
         boolean isApply = null == taIssueApply.getVerifyDate();
         TaMessage taMessage = new TaMessage();
-        taMessage.setTargetType(Constants.MESSAGE_TARGET_APPLY);
+        taMessage.setTargetType(Constants.SOURCE_APPLY);
         taMessage.setTargetId(taIssueApply.getApplyId().toString());
         taMessage.setStatus(Constants.STATUS_NORMAL);
         taMessage.setCreateDate(LocalDateTime.now());
@@ -69,25 +69,25 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
             taMessage.setMsgType("apply-" + taIssueApply.getApplyType());
 
             switch (taIssueApply.getApplyType()) {
-                case Constants.APPLY_DELAY:
+                case Constants.PROCESS_APPLY_DELAY:
                     taMessage.setTitle("延期申请");
                     taMessage.setContent("延期至: " + taIssueApply.getContent());
                     taMessage.setReceiveUser(null);
                     taMessage.setOrgId(Constants.ROOT_ORG);
                     break;
-                case Constants.APPLY_REJECT:
+                case Constants.PROCESS_APPLY_REJECT:
                     taMessage.setTitle("驳回申请");
                     taMessage.setContent(null);
                     taMessage.setReceiveUser(null);
                     taMessage.setOrgId(Constants.ROOT_ORG);
                     break;
-                case Constants.APPLY_VERIFY:
+                case Constants.PROCESS_APPLY_VERIFY:
                     taMessage.setTitle("审核申请");
                     taMessage.setContent(null);
                     taMessage.setReceiveUser(null);
                     taMessage.setOrgId(taIssueApply.getOrgId());
                     break;
-                case Constants.APPLY_END:
+                case Constants.PROCESS_APPLY_END:
                     taMessage.setTitle("消单申请");
                     taMessage.setContent(null);
                     taMessage.setReceiveUser(null);
@@ -101,21 +101,21 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
             }
         } else {
             taMessage.setMsgType("verify-" + taIssueApply.getApplyType());
-            taMessage.setContent("审核结果: " + (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过"));
+            taMessage.setContent("审核结果: " + (Constants.APPLY_PASS.equals(taIssueApply.getVerifyStatus()) ? "通过" : "不通过"));
             taMessage.setReceiveUser(null);
             taMessage.setOrgId(taIssueApply.getOrgId());
 
             switch (taIssueApply.getApplyType()) {
-                case Constants.APPLY_DELAY:
+                case Constants.PROCESS_APPLY_DELAY:
                     taMessage.setTitle("延期审核");
                     break;
-                case Constants.APPLY_REJECT:
+                case Constants.PROCESS_APPLY_REJECT:
                     taMessage.setTitle("驳回审核");
                     break;
-                case Constants.APPLY_VERIFY:
+                case Constants.PROCESS_APPLY_VERIFY:
                     taMessage.setTitle("问题单审核");
                     break;
-                case Constants.APPLY_END:
+                case Constants.PROCESS_APPLY_END:
                     taMessage.setTitle("办结审核");
                     break;
                 default:

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

@@ -3,13 +3,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.StringUtils;
-import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.entity.TaIssue;
-import com.example.civilizedcity.entity.TaIssueProcess;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.mapper.TaFeedbackMapper;
+import com.example.civilizedcity.mapper.TaIssueMapper;
+import com.example.civilizedcity.mapper.TaIssueProcessMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.service.TaOrgIssueService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -22,6 +24,15 @@ import java.time.LocalDateTime;
 @Service
 public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaOrgIssue> implements TaOrgIssueService {
 
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
+    @Autowired
+    TaFeedbackMapper taFeedbackMapper;
+
     @Override
     public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus) {
 
@@ -39,16 +50,52 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         return baseMapper.getIssuePageBy(pg, orgId, sourceType, processNode, isExpire);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public void createNewIssue(TaIssue taIssue, SysUser sysUser) {
+    public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception {
+        if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
+            // 如果是市民提的问题单
+            TaFeedback taFeedback = taFeedbackMapper.selectById(taIssue.getSourceTarget());
+            if (null == taFeedback) {
+                throw new Exception("未找到市民随手拍记录");
+            }
+
+            taFeedback.setVerifyDate(LocalDateTime.now());
+            taFeedback.setVerifyStatus(Constants.APPLY_PASS);
+            taFeedbackMapper.updateById(taFeedback);
+        }
+
+        // 1. 先修改主记录信息
+        taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssue.setProcessStatus(Constants.APPLY_PASS);
+        taIssue.setOrgId(taIssueProcess.getNextOrg());
+        taIssue.setExpireDate(taIssueProcess.getExpireDate());
+        taIssue.setProcessNum(taIssue.getProcessNum() + 1); // 交办次数
+        taIssueMapper.updateById(taIssue);
+
+        // 2. 新增机构问题单
         TaOrgIssue taOrgIssue = new TaOrgIssue();
         taOrgIssue.setIssueId(taIssue.getIssueId());
         taOrgIssue.setOrgId(taIssue.getOrgId());
-        taOrgIssue.setProcessStatus(Constants.PROCESS_START);
+        taOrgIssue.setProcessNode(Constants.PROCESS_START);
+        taOrgIssue.setProcessStatus(Constants.APPLY_READY); // 状态是未审核
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
         taOrgIssue.setCreateDate(LocalDateTime.now());
         taOrgIssue.setCreateUser(sysUser.getUserId());
-
         save(taOrgIssue);
+
+        // 3. 保存流程节点记录
+        taIssueProcess.setProcessId(null);
+        taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssueProcess.setProcessStatus(Constants.APPLY_PASS);
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+    }
+
+    @Override
+    public TaOrgIssue getByIssueAndOrg(Integer issueId, String orgId) {
+        return baseMapper.getByIssueAndOrg(issueId, orgId);
     }
 }

src/main/resources/mapper/TaAttachMapper.xml

@@ -2,6 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaAttachMapper">
+    <delete id="deleteNotIn">
+        DELETE
+            t
+        FROM
+            ta_attach
+        WHERE
+            t.owner_type = #{ownerType}
+          AND t.owner_id = #{ownerId}
+          AND t.id NOT IN
+        <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </delete>
 
     <select id="getListBy" resultType="com.example.civilizedcity.entity.TaAttach">
         SELECT

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -15,10 +15,10 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         SELECT
-            sum(IF(s.process_node = 'start', 1, 0)) as unassigned_num,
-            sum(IF(s.process_node = 'assigned', 1, 0)) as assigned_num,
-            sum(IF(s.process_node = 'end', 1, 0)) as end_num,
-            sum(IF(t.verify_status = 'reject', 1, 0)) as reject_num
+            sum(IF(s.process_node = '01', 1, 0)) as unassigned_num,
+            sum(IF(s.process_node LIKE '02%', 1, 0)) as assigned_num,
+            sum(IF(s.process_node = '03', 1, 0)) as end_num,
+            sum(IF(t.verify_status = 'reject' AND s.process_node = '03', 1, 0)) as reject_num
         FROM
             ta_feedback t
                 JOIN ta_issue s ON t.issue_id = s.issue_id
@@ -38,13 +38,13 @@
               AND t.person_id = #{personId}
           </if>
           <if test="processList != null">
-              AND s.process_node IN
-              <foreach item="item" collection="processList" separator="," open="(" close=")">
-                  #{item}
+              AND
+              <foreach item="item" collection="processList" separator=" OR " open="(" close=")">
+                  s.process_node LIKE CONCAT(#{item}, '%')
               </foreach>
           </if>
-        <if test="null != verifyStatus and verifyStatus != ''">
-          AND t.verify_status = #{verifyStatus}
+        <if test="null != processStatus and processStatus != ''">
+          AND s.process_status = #{processStatus}
         </if>
           AND t.`status` &gt; -1
           AND s.`status` &gt; -1

src/main/resources/mapper/TaIssueMapper.xml

@@ -57,9 +57,9 @@
     <select id="statMaIndex" resultType="java.util.Map">
         SELECT
             count(*) as published_num,
-            sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
-            sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,
-            sum(IF(t.process_node = 'end', 1, 0)) as end_num
+            sum(IF(t.process_node = '01', 1, 0)) as unassigned_num,
+            sum(IF(t.process_node LIKE '02%', 1, 0)) as assigned_num,
+            sum(IF(t.process_node = '03', 1, 0)) as end_num
         FROM
             ta_issue t
         WHERE 1 = 1
@@ -71,9 +71,9 @@
     <select id="statIssueOrg" resultType="java.util.Map">
         SELECT
             UUID_SHORT( ) AS id,
-            IFNULL( SUM( IF ( t.process_node = 'end', t.process_num, 0 ) ), 0 ) AS endNum,
-            IFNULL( SUM( IF ( t.process_node = 'assigned', t.process_num, 0 ) ), 0 ) AS assignedNum,
-            IFNULL( SUM( IF ( t.expire_date &lt;= NOW( ), t.process_num, 0 ) ), 0 ) AS expireNum
+            IFNULL( SUM( IF ( t.process_node = '03', t.process_num, 0 ) ), 0 ) AS endNum,
+            IFNULL( SUM( IF ( t.process_node LIKE '02%', t.process_num, 0 ) ), 0 ) AS assignedNum,
+            IFNULL( SUM( IF ( t.expire_date &lt;= NOW( ) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
         FROM
             ta_issue t
         WHERE

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -33,10 +33,10 @@
               AND t.source_type in ('check', 'inspector')
           </if>
           <if test="processNode != null and processNode != ''">
-            AND t.process_node = #{processNode}
+            AND t.process_node LIKE CONCAT(#{processNode}, '%')
           </if>
           <if test="isExpire != null and isExpire">
-            AND t.process_node != 'end'
+            AND t.process_node != '03'
             AND t.expire_date &lt;= now( )
           </if>
             AND t.`status` &gt; -1
@@ -56,8 +56,8 @@
     <select id="statMaIndex" resultType="java.util.Map">
         select
             SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
-            SUM(s.process_node == 'end', 1, 0) as end_num,
-            SUM(s.process_node != 'end', 1, 0) as doing_num
+            SUM(s.process_node = '03', 1, 0) as end_num,
+            SUM(s.process_node != '03', 1, 0) as doing_num
         from ta_org_issue t
                  INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
         where t.org_id = #{orgId}