feats

db/.back_文明创办/文明创办-backup-20221227172242.pdma.json → db/.back_文明创办/文明创办-backup-20221228183638.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-27 17:20:04",
+  "updatedTime": "2022-12-28 16:00:46",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3486,6 +3486,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "75B83E1E-5827-4CCC-AC30-31982D1AEDC3"
         },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "EA018F17-8983-4C52-BCE7-F6AEEBCECFB1"
+        },
         {
           "defKey": "location",
           "defName": "定位",
@@ -3675,7 +3692,7 @@
           "id": "FA8794DB-E947-480D-A0D5-6B7E02297481"
         },
         {
-          "defKey": "create_person",
+          "defKey": "create_user",
           "defName": "上报人",
           "comment": "",
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -3692,7 +3709,7 @@
           "id": "0499A27B-0D48-4070-B1DB-1D42293B23F1"
         },
         {
-          "defKey": "person_name",
+          "defKey": "user_name",
           "defName": "上报人名称",
           "comment": "",
           "type": "",
@@ -3709,7 +3726,7 @@
           "id": "CF1082C9-7547-4850-800D-BA7CF84CE1CD"
         },
         {
-          "defKey": "person_duty",
+          "defKey": "user_duty",
           "defName": "上报人身份",
           "comment": "",
           "type": "",
@@ -4437,81 +4454,9 @@
           "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15",
           "id": "98A22AE6-A570-4E5A-B1CE-7F036B692110"
         },
-        {
-          "defKey": "verify_org",
-          "defName": "审批机构",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "refDict": "",
-          "extProps": {},
-          "notes": {},
-          "id": "7F5E3563-8E5F-45A2-9EA7-486C3012CDBB"
-        },
-        {
-          "defKey": "verify_user",
-          "defName": "审批人",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "refDict": "",
-          "extProps": {},
-          "notes": {},
-          "id": "BFEA7C0C-20C1-4EED-96E8-2951E12F25DC"
-        },
-        {
-          "defKey": "verify_user_name",
-          "defName": "审批人名称",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "refDict": "",
-          "extProps": {},
-          "notes": {},
-          "id": "F5048929-1268-4AAB-B2D3-FB06838D7CC2"
-        },
-        {
-          "defKey": "verify_date",
-          "defName": "审批日期",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "refDict": "",
-          "extProps": {},
-          "notes": {},
-          "id": "0CDD216B-585A-4D43-A100-E0F581BAE052"
-        },
         {
           "defKey": "org_id",
-          "defName": "申请机构",
+          "defName": "处理机构",
           "comment": "",
           "type": "",
           "len": "",
@@ -4528,7 +4473,7 @@
         },
         {
           "defKey": "create_user",
-          "defName": "申请人",
+          "defName": "处理人",
           "comment": "",
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "type": "",
@@ -4545,7 +4490,7 @@
         },
         {
           "defKey": "user_name",
-          "defName": "申请人名称",
+          "defName": "处理人名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -4562,7 +4507,7 @@
         },
         {
           "defKey": "create_date",
-          "defName": "申请时间",
+          "defName": "创建时间",
           "comment": "",
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "type": "",
@@ -7643,7 +7588,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
         },
         {
@@ -7734,6 +7679,239 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaOrgIssue"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_org_issue",
+      "defName": "单位问题单",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "org_issue_id",
+          "defName": "单位问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "AA2134D5-EEC2-4B33-9895-0F4CAC686CD7"
+        },
+        {
+          "defKey": "issue_id",
+          "defName": "问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "379DCFDC-F70C-4829-B4D5-E2C8212BB3CC"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
+          "uiHint": ""
+        },
+        {
+          "defKey": "process_status",
+          "defName": "业务单状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
+        },
+        {
+          "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": "7511A036-EC9A-4F2A-8FC9-0D57EAA63575"
+        },
+        {
+          "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": "E4777FE2-3A60-41E1-A747-E489123A38DC"
+        },
+        {
+          "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": "AE79E742-46BD-441E-BC4E-6151E86BDD74"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8160,7 +8338,8 @@
         "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
-        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"
+        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
       ],
       "refViews": [],
       "refDiagrams": [],

db/.back_文明创办/文明创办-backup-20221227172004.pdma.json → db/.back_文明创办/文明创办-backup-20221228183752.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-27 16:13:27",
+  "updatedTime": "2022-12-28 18:36:38",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3486,6 +3486,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "75B83E1E-5827-4CCC-AC30-31982D1AEDC3"
         },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "EA018F17-8983-4C52-BCE7-F6AEEBCECFB1"
+        },
         {
           "defKey": "location",
           "defName": "定位",
@@ -3675,7 +3692,7 @@
           "id": "FA8794DB-E947-480D-A0D5-6B7E02297481"
         },
         {
-          "defKey": "create_person",
+          "defKey": "create_user",
           "defName": "上报人",
           "comment": "",
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -3692,7 +3709,7 @@
           "id": "0499A27B-0D48-4070-B1DB-1D42293B23F1"
         },
         {
-          "defKey": "person_name",
+          "defKey": "user_name",
           "defName": "上报人名称",
           "comment": "",
           "type": "",
@@ -3709,7 +3726,7 @@
           "id": "CF1082C9-7547-4850-800D-BA7CF84CE1CD"
         },
         {
-          "defKey": "person_duty",
+          "defKey": "user_duty",
           "defName": "上报人身份",
           "comment": "",
           "type": "",
@@ -4352,23 +4369,6 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
         },
-        {
-          "defKey": "org_id",
-          "defName": "处理机构",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
-          "uiHint": ""
-        },
         {
           "defKey": "next_org",
           "defName": "指定机构",
@@ -4455,21 +4455,21 @@
           "id": "98A22AE6-A570-4E5A-B1CE-7F036B692110"
         },
         {
-          "defKey": "status",
-          "defName": "状态",
+          "defKey": "org_id",
+          "defName": "处理机构",
           "comment": "",
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "type": "",
           "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "1",
-          "hideInGraph": true,
+          "defaultValue": "",
+          "hideInGraph": false,
           "refDict": "",
-          "uiHint": "",
-          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
+          "uiHint": ""
         },
         {
           "defKey": "create_user",
@@ -4521,6 +4521,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "DC8BABA9-B796-462E-A242-C92E3BF071C8"
+        },
+        {
+          "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": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
         }
       ],
       "correlations": [],
@@ -7571,7 +7588,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
         },
         {
@@ -7662,6 +7679,239 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaOrgIssue"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_org_issue",
+      "defName": "单位问题单",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "org_issue_id",
+          "defName": "单位问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "AA2134D5-EEC2-4B33-9895-0F4CAC686CD7"
+        },
+        {
+          "defKey": "issue_id",
+          "defName": "问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "379DCFDC-F70C-4829-B4D5-E2C8212BB3CC"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
+          "uiHint": ""
+        },
+        {
+          "defKey": "process_status",
+          "defName": "业务单状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
+        },
+        {
+          "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": "7511A036-EC9A-4F2A-8FC9-0D57EAA63575"
+        },
+        {
+          "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": "E4777FE2-3A60-41E1-A747-E489123A38DC"
+        },
+        {
+          "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": "AE79E742-46BD-441E-BC4E-6151E86BDD74"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8088,7 +8338,8 @@
         "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
-        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"
+        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
       ],
       "refViews": [],
       "refDiagrams": [],

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

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-27 17:22:42",
+  "updatedTime": "2022-12-28 18:37:52",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3486,6 +3486,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "75B83E1E-5827-4CCC-AC30-31982D1AEDC3"
         },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "EA018F17-8983-4C52-BCE7-F6AEEBCECFB1"
+        },
         {
           "defKey": "location",
           "defName": "定位",
@@ -3675,7 +3692,7 @@
           "id": "FA8794DB-E947-480D-A0D5-6B7E02297481"
         },
         {
-          "defKey": "create_person",
+          "defKey": "create_user",
           "defName": "上报人",
           "comment": "",
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -3692,7 +3709,7 @@
           "id": "0499A27B-0D48-4070-B1DB-1D42293B23F1"
         },
         {
-          "defKey": "person_name",
+          "defKey": "user_name",
           "defName": "上报人名称",
           "comment": "",
           "type": "",
@@ -3709,7 +3726,7 @@
           "id": "CF1082C9-7547-4850-800D-BA7CF84CE1CD"
         },
         {
-          "defKey": "person_duty",
+          "defKey": "user_duty",
           "defName": "上报人身份",
           "comment": "",
           "type": "",
@@ -4349,7 +4366,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
         },
         {
@@ -4450,7 +4467,7 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
           "uiHint": ""
         },
@@ -7571,7 +7588,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
         },
         {
@@ -7662,6 +7679,239 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaOrgIssue"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_org_issue",
+      "defName": "单位问题单",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "org_issue_id",
+          "defName": "单位问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "AA2134D5-EEC2-4B33-9895-0F4CAC686CD7"
+        },
+        {
+          "defKey": "issue_id",
+          "defName": "问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "379DCFDC-F70C-4829-B4D5-E2C8212BB3CC"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
+          "uiHint": ""
+        },
+        {
+          "defKey": "process_status",
+          "defName": "业务单状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
+        },
+        {
+          "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": "7511A036-EC9A-4F2A-8FC9-0D57EAA63575"
+        },
+        {
+          "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": "E4777FE2-3A60-41E1-A747-E489123A38DC"
+        },
+        {
+          "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": "AE79E742-46BD-441E-BC4E-6151E86BDD74"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8088,7 +8338,8 @@
         "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
-        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"
+        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
       ],
       "refViews": [],
       "refDiagrams": [],

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-28 08:28:08",
+  "updatedTime": "2022-12-29 16:25:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3486,6 +3486,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "75B83E1E-5827-4CCC-AC30-31982D1AEDC3"
         },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "EA018F17-8983-4C52-BCE7-F6AEEBCECFB1"
+        },
         {
           "defKey": "location",
           "defName": "定位",
@@ -3675,7 +3692,7 @@
           "id": "FA8794DB-E947-480D-A0D5-6B7E02297481"
         },
         {
-          "defKey": "create_person",
+          "defKey": "create_user",
           "defName": "上报人",
           "comment": "",
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -3692,7 +3709,7 @@
           "id": "0499A27B-0D48-4070-B1DB-1D42293B23F1"
         },
         {
-          "defKey": "person_name",
+          "defKey": "user_name",
           "defName": "上报人名称",
           "comment": "",
           "type": "",
@@ -3709,7 +3726,7 @@
           "id": "CF1082C9-7547-4850-800D-BA7CF84CE1CD"
         },
         {
-          "defKey": "person_duty",
+          "defKey": "user_duty",
           "defName": "上报人身份",
           "comment": "",
           "type": "",
@@ -4349,7 +4366,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
         },
         {
@@ -4450,7 +4467,7 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
           "uiHint": ""
         },
@@ -7662,6 +7679,256 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "5BEE62BD-F04C-49E8-A65A-32A11B093E7B",
+      "env": {
+        "base": {
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaOrgIssue"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "ta_org_issue",
+      "defName": "单位问题单",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "org_issue_id",
+          "defName": "单位问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "AA2134D5-EEC2-4B33-9895-0F4CAC686CD7"
+        },
+        {
+          "defKey": "issue_id",
+          "defName": "问题单ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "379DCFDC-F70C-4829-B4D5-E2C8212BB3CC"
+        },
+        {
+          "defKey": "org_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "649F17F6-D2C1-4AAD-B913-ED39F26E4AF4",
+          "uiHint": ""
+        },
+        {
+          "defKey": "process_status",
+          "defName": "业务单状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "6FD54E7F-E054-403B-83AB-9309AE4B2B72"
+        },
+        {
+          "defKey": "result",
+          "defName": "处理结果",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "A9868395-4BC7-464D-8BA5-07EFEB6CDF6E"
+        },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "7511A036-EC9A-4F2A-8FC9-0D57EAA63575"
+        },
+        {
+          "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": "E4777FE2-3A60-41E1-A747-E489123A38DC"
+        },
+        {
+          "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": "AE79E742-46BD-441E-BC4E-6151E86BDD74"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8088,7 +8355,8 @@
         "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
-        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"
+        "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
+        "5BEE62BD-F04C-49E8-A65A-32A11B093E7B"
       ],
       "refViews": [],
       "refDiagrams": [],

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

@@ -14,6 +14,8 @@ public class Constants {
 
     // 问题单
     public final static String ATTACH_SOURCE_ISSUE = "issue";
+    // 单位问题单
+    public final static String ATTACH_SOURCE_ORG_ISSUE = "org-issue";
 
     // 督察员上报
     public final static String ISSUE_SOURCE_INSPECTOR = "inspector";

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

@@ -1,13 +1,16 @@
 package com.example.civilizedcity.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.DateUtils;
 import com.example.civilizedcity.common.ResponseBean;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 import com.example.civilizedcity.entity.SysUser;
@@ -23,8 +26,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.service.TaIssueService;
 
- /**
+/**
  * 问题表;(ta_issue)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -32,7 +36,7 @@ import com.example.civilizedcity.service.TaIssueService;
 @RestController
 @RequestMapping("/")
 public class TaIssueController extends BaseController {
-    
+
     @Autowired
     private TaIssueService taIssueService;
 
@@ -41,9 +45,9 @@ public class TaIssueController extends BaseController {
 
     @Autowired
     private TaIssueProcessService taIssueProcessService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param issueId 主键
      * @return 实例对象
@@ -51,33 +55,62 @@ public class TaIssueController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taIssue/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
-        return ResponseBean.success(taIssueService.getById(id));
+
+        TaIssue taIssue = taIssueService.getById(id);
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_ISSUE, taIssue.getIssueId().toString());
+        taIssue.setAttachList(attachList);
+
+        return ResponseBean.success(taIssue);
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taIssue")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+                             @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine) throws Exception {
 
         SysUser sysUser = currentUser();
         String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
 
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaIssue> result = taIssueService.getPageBy(pg, orgId);
-        
+        QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
+
+        if (Constants.PROCESS_START.equals(bizStatus)) {
+            // 待交办
+            queryWrapper.eq("process_node", bizStatus);
+        } else if (Constants.PROCESS_ASSIGNED.equals(bizStatus)) {
+            // 已交办
+            queryWrapper.eq("process_node", bizStatus);
+        } else if (Constants.PROCESS_END.equals(bizStatus)) {
+            // 已办结
+            queryWrapper.eq("process_node", bizStatus);
+        } else if ("expired".equals(bizStatus)) {
+            // 已逾期
+            queryWrapper.ne("process_node", Constants.PROCESS_END);
+            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(mine, "create_user", sysUser.getUserId());
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taIssue 实例对象
@@ -95,8 +128,8 @@ public class TaIssueController extends BaseController {
         taIssue.setProcessNum(1);
         taIssue.setSourceType(Constants.ISSUE_SOURCE_INSPECTOR);
         taIssue.setStatus(Constants.STATUS_NORMAL);
-        taIssue.setCreatePerson(user.getUserId());
-        taIssue.setPersonName(user.getName());
+        taIssue.setCreateUser(user.getUserId());
+        taIssue.setUserName(user.getName());
         taIssue.setCreateDate(LocalDateTime.now());
         taIssueService.save(taIssue);
 
@@ -128,8 +161,8 @@ public class TaIssueController extends BaseController {
 
         return ResponseBean.success(taIssue);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taIssue 实例对象
@@ -138,21 +171,65 @@ public class TaIssueController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taIssue/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaIssue taIssue,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+
+        TaIssue origin = taIssueService.getById(id);
+        if (null == origin || origin.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到原始问题单");
+        }
+
+        List<TaAttach> attachList = taIssue.getAttachList();
+        if (null == attachList || attachList.size() == 0) {
+            return ResponseBean.error("拍照或者视频没有上传");
+        }
+
+        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);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param issueId 主键
      * @return 是否成功
      */
+    @SaCheckPermission("manager")
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taIssue/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        taIssueService.removeLogicById(id);
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+//        taIssueService.removeLogicById(id);
+
+        TaIssue taIssue = taIssueService.getById(id);
+        if (null == taIssue || taIssue.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到问题");
+        }
+
+        taIssue.setUpdateUser(currentUser().getUserId());
+        taIssue.setUpdateDate(LocalDateTime.now());
+        taIssue.setStatus(Constants.STATUS_DELETE);
+
+        taIssueService.updateById(taIssue);
         return ResponseBean.success("success");
     }
 }

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

@@ -78,10 +78,6 @@ public class TaIssueProcessController extends BaseController {
             throw new Exception("找不到对应问题");
         }
 
-        if (null == taIssueProcess.getPrevProcess()) {
-            throw new Exception("未找到上级流程");
-        }
-
         if (Constants.PROCESS_END.equals(taIssue.getProcessNode())) {
             throw new Exception("当前问题已办结");
         }
@@ -103,7 +99,7 @@ public class TaIssueProcessController extends BaseController {
 
     private void updateIssue(TaIssue taIssue, TaIssueProcess taIssueProcess) {
         taIssue.setProcessNode(taIssueProcess.getProcessNode());
-        taIssue.setProcessStatus(taIssueProcess.getProcessNode());
+        taIssue.setProcessStatus(taIssueProcess.getProcessStatus());
         taIssueService.updateById(taIssue);
     }
     
@@ -174,6 +170,32 @@ public class TaIssueProcessController extends BaseController {
          return ResponseBean.success(taIssueProcess);
      }
 
+     /**
+      * 驳回
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_user")
+     @ApiOperation("驳回")
+     @PostMapping("/taIssueProcess/reject")
+     public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+             return ResponseBean.error("请填写未驳回原因");
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
      /**
       * 单位驳回
       *
@@ -183,7 +205,7 @@ public class TaIssueProcessController extends BaseController {
      @SaCheckPermission("org_user")
      @ApiOperation("单位驳回")
      @PostMapping("/taIssueProcess/org/reject")
-     public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+     public ResponseBean orgReject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
          TaIssue taIssue = checkIssue(taIssueProcess);
 
          TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());

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

@@ -0,0 +1,133 @@
+package com.example.civilizedcity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.ResponseBean;
+import java.util.List;
+
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.service.TaAttachService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.example.civilizedcity.entity.TaOrgIssue;
+import com.example.civilizedcity.service.TaOrgIssueService;
+
+ /**
+ * 单位问题单;(ta_org_issue)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-28
+ */
+@Api(tags = "单位问题单对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaOrgIssueController extends BaseController {
+    
+    @Autowired
+    private TaOrgIssueService taOrgIssueService;
+
+    @Autowired
+    private TaAttachService taAttachService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param orgIssueId 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taOrgIssue/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        return ResponseBean.success(taOrgIssueService.getById(id));
+    }
+     /**
+      * 通过ISSUE_ID查询单条数据
+      *
+      * @param issueId 主键
+      * @return 实例对象
+      */
+     @ApiOperation("通过ISSUE_ID查询单条数据")
+     @GetMapping("/taIssue/{issueId}/orgIssue")
+     public ResponseBean queryByIssueId(@ApiParam("对象ID") @PathVariable Integer issueId) throws Exception {
+
+         QueryWrapper<TaOrgIssue> queryWrapper = new QueryWrapper<>();
+         queryWrapper.eq("issue_id", issueId);
+         queryWrapper.gt("status", Constants.STATUS_DELETE);
+
+         TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);
+         if (null != taOrgIssue) {
+             List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
+             taOrgIssue.setAttachList(attachList);
+         }
+
+         return ResponseBean.success(taOrgIssue);
+     }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taOrgIssue")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
+                             @ApiParam("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus) throws Exception {
+        SysUser sysUser = currentUser();
+
+        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+        IPage<TaIssue> result = taOrgIssueService.getIssuePageBy(pg, sysUser.getOrgId(), sourceType, bizStatus);
+        
+        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");
+    }
+}

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

@@ -42,6 +42,9 @@ public class TaIssue implements Serializable,Cloneable{
       /** 点位ID */
       @ApiModelProperty(name = "点位ID",notes = "")
       private String locId ;
+       /** 点位名称 */
+       @ApiModelProperty(name = "点位名称",notes = "")
+       private String locName ;
       /** 定位 */
       @ApiModelProperty(name = "定位",notes = "")
       private String location ;
@@ -77,13 +80,13 @@ public class TaIssue implements Serializable,Cloneable{
       private Integer status ;
       /** 上报人 */
       @ApiModelProperty(name = "上报人",notes = "")
-      private String createPerson ;
+      private String createUser ;
       /** 上报人名称 */
       @ApiModelProperty(name = "上报人名称",notes = "")
-      private String personName ;
+      private String userName ;
       /** 上报人身份 */
       @ApiModelProperty(name = "上报人身份",notes = "")
-      private String personDuty ;
+      private String userDuty ;
       /** 创建时间 */
       @ApiModelProperty(name = "创建时间",notes = "")
       private LocalDateTime createDate ;

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

@@ -32,7 +32,7 @@ public class TaIssueProcess implements Serializable,Cloneable{
       private Integer issueId ;
        /** 上个流程ID */
        @ApiModelProperty(name = "上个流程ID",notes = "")
-       private String prevProcess ;
+       private Integer prevProcess ;
       /** 处理机构 */
       @ApiModelProperty(name = "处理机构",notes = "")
       private String orgId ;

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

@@ -0,0 +1,58 @@
+package com.example.civilizedcity.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 单位问题单;
+ * @author : http://www.chiner.pro
+ * @date : 2022-12-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "单位问题单",description = "")
+@TableName("ta_org_issue")
+public class TaOrgIssue implements Serializable,Cloneable{
+    /** 单位问题单ID */
+    @ApiModelProperty(name = "单位问题单ID",notes = "")
+    @TableId(value = "org_issue_id", type = IdType.ASSIGN_UUID)
+    private Integer orgIssueId ;
+    /** 问题单ID */
+    @ApiModelProperty(name = "问题单ID",notes = "")
+    private Integer issueId ;
+    /** 机构ID */
+    @ApiModelProperty(name = "机构ID",notes = "")
+    private String orgId ;
+    /** 业务单状态 */
+    @ApiModelProperty(name = "业务单状态",notes = "")
+    private String processStatus ;
+     /** 业务单状态 */
+     @ApiModelProperty(name = "处理结果",notes = "")
+     private String result ;
+    /** 状态 */
+    @ApiModelProperty(name = "状态",notes = "")
+    private Integer status ;
+    /** 创建人 */
+    @ApiModelProperty(name = "创建人",notes = "")
+    private String createUser ;
+    /** 创建时间 */
+    @ApiModelProperty(name = "创建时间",notes = "")
+    private LocalDateTime createDate ;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "文件列表",notes = "")
+    private List<TaAttach> attachList ;
+
+}

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

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaAttach;
 
- /**
+import java.util.List;
+
+/**
  * 附件表;(ta_attach)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface TaAttachMapper  extends BaseMapper<TaAttach>{
-    
-}
+
+     List<TaAttach> getListBy(@Param("ownerType") String ownerType,@Param("ownerId") String ownerId);
+ }

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

@@ -0,0 +1,24 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.entity.TaIssue;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.example.civilizedcity.entity.TaOrgIssue;
+
+ /**
+ * 单位问题单;(ta_org_issue)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-28
+ */
+@Mapper
+public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
+
+     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg,
+                                   @Param("orgId") String orgId,
+                                   @Param("sourceType") String sourceType,
+                                   @Param("processNode") String processNode,
+                                   @Param("isExpire") Boolean isExpire
+     );
+ }

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

@@ -3,11 +3,16 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaAttach;
 
- /**
+import java.util.List;
+
+/**
  * 附件表;(ta_attach)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 public interface TaAttachService extends IBaseService<TaAttach> {
-    
+
+     List<TaAttach> getListBy(String ownerType, String ownerId);
+
+    boolean deleteNotIn(List<Integer> idList, String ownerType, String ownerId);
 }

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

@@ -0,0 +1,16 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaOrgIssue;
+
+ /**
+ * 单位问题单;(ta_org_issue)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-28
+ */
+public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
+
+     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
+ }

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

@@ -1,16 +1,36 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaAttach;
 import com.example.civilizedcity.mapper.TaAttachMapper;
 import com.example.civilizedcity.service.TaAttachService;
- /**
+
+import java.util.List;
+
+/**
  * 附件表;(ta_attach)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class TaAttachServiceImpl extends BaseServiceImpl<TaAttachMapper, TaAttach> implements TaAttachService {
-    
+
+    @Override
+    public List<TaAttach> getListBy(String ownerType, String ownerId) {
+        return baseMapper.getListBy(ownerType, ownerId);
+    }
+
+    @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);
+    }
 }

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

@@ -0,0 +1,37 @@
+package com.example.civilizedcity.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaIssue;
+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;
+
+/**
+ * 单位问题单;(ta_org_issue)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-12-28
+ */
+@Service
+public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaOrgIssue> implements TaOrgIssueService {
+
+    @Override
+    public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus) {
+
+        String processNode = null;
+        Boolean isExpire = false;
+
+        if (!StringUtils.isEmpty(bizStatus)) {
+            if ("expire".equals(bizStatus)) {
+                isExpire = true;
+            } else {
+                processNode = bizStatus;
+            }
+        }
+
+        return baseMapper.getIssuePageBy(pg, orgId, sourceType, processNode, isExpire);
+    }
+}

src/main/resources/mapper/TaAttachMapper.xml

@@ -2,5 +2,17 @@
 <!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">
-    
+
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaAttach">
+        SELECT
+            *
+        FROM
+            ta_attach t
+        WHERE
+            t.owner_type = #{ownerType}
+          AND t.owner_id = #{ownerId}
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date ASC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.example.civilizedcity.mapper.TaOrgIssueMapper">
+
+    <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
+        SELECT
+            *
+        FROM
+            ta_issue t
+        WHERE
+            EXISTS (
+                SELECT
+                *
+                FROM
+                ta_org_issue s
+                WHERE
+                s.issue_id = t.issue_id
+                AND s.org_id = #{orgId}
+                AND s.`status` &gt; -1
+            )
+          <if test="sourceType != null and sourceType == 'feedback'">
+              AND t.source_type = 'feedback'
+          </if>
+          <if test="sourceType != null and sourceType != 'feedback'">
+              AND t.source_type in ('check', 'inspector')
+          </if>
+          <if test="processNode != null and processNode != ''">
+            AND t.process_node = #{processNode}
+          </if>
+          <if test="isExpire != null and isExpire">
+            AND t.process_node != 'end'
+            AND t.expire_date &lt;= now( )
+          </if>
+            AND t.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
+</mapper>