Your Name преди 2 години
родител
ревизия
84ac83800c

db/.back_文明创办/文明创办-backup-20221226221940.pdma.json → db/.back_文明创办/文明创办-backup-20221227172004.pdma.json Целия файл

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.2.0",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2022-12-26 21:49:26",
7
+  "updatedTime": "2022-12-27 16:13:27",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -3608,7 +3608,7 @@
3608 3608
         },
3609 3609
         {
3610 3610
           "defKey": "org_id",
3611
-          "defName": "当前处理单位",
3611
+          "defName": "责任单位",
3612 3612
           "comment": "",
3613 3613
           "type": "",
3614 3614
           "len": "",
@@ -4335,6 +4335,23 @@
4335 4335
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4336 4336
           "id": "AFC8B3AA-0A3C-483A-9CDA-556CDC9D2ABE"
4337 4337
         },
4338
+        {
4339
+          "defKey": "prev_process",
4340
+          "defName": "上个流程ID",
4341
+          "comment": "",
4342
+          "type": "",
4343
+          "len": "",
4344
+          "scale": "",
4345
+          "primaryKey": false,
4346
+          "notNull": false,
4347
+          "autoIncrement": false,
4348
+          "defaultValue": "",
4349
+          "hideInGraph": false,
4350
+          "refDict": "",
4351
+          "extProps": {},
4352
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4353
+          "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
4354
+        },
4338 4355
         {
4339 4356
           "defKey": "org_id",
4340 4357
           "defName": "处理机构",
@@ -4348,7 +4365,7 @@
4348 4365
           "defaultValue": "",
4349 4366
           "hideInGraph": false,
4350 4367
           "refDict": "",
4351
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
4368
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4352 4369
           "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4353 4370
           "uiHint": ""
4354 4371
         },
@@ -7259,6 +7276,392 @@
7259 7276
       ],
7260 7277
       "correlations": [],
7261 7278
       "indexes": []
7279
+    },
7280
+    {
7281
+      "id": "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7282
+      "env": {
7283
+        "base": {
7284
+          "nameSpace": "com.example.civilizedcity",
7285
+          "codeRoot": "TaIssueApply"
7286
+        },
7287
+        "template": {
7288
+          "JavaMybatisPlus": {
7289
+            "Controller": {
7290
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
7291
+              "enable": true
7292
+            },
7293
+            "Service": {
7294
+              "suffix": "service/{{=it.codeRoot}}Service.java",
7295
+              "enable": true
7296
+            },
7297
+            "ServiceImpl": {
7298
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
7299
+              "enable": true
7300
+            },
7301
+            "Mapper": {
7302
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
7303
+              "enable": true
7304
+            },
7305
+            "Mapper.xml": {
7306
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
7307
+              "enable": true
7308
+            },
7309
+            "Entity": {
7310
+              "suffix": "entity/{{=it.codeRoot}}.java",
7311
+              "enable": true
7312
+            }
7313
+          }
7314
+        },
7315
+        "custom": {}
7316
+      },
7317
+      "defKey": "ta_issue_apply",
7318
+      "defName": "问题处理申请",
7319
+      "comment": "",
7320
+      "properties": {},
7321
+      "nameTemplate": "{defKey}[{defName}]",
7322
+      "notes": {},
7323
+      "headers": [
7324
+        {
7325
+          "refKey": "hideInGraph",
7326
+          "hideInGraph": true
7327
+        },
7328
+        {
7329
+          "refKey": "defKey",
7330
+          "hideInGraph": false
7331
+        },
7332
+        {
7333
+          "refKey": "defName",
7334
+          "hideInGraph": false
7335
+        },
7336
+        {
7337
+          "refKey": "primaryKey",
7338
+          "hideInGraph": false
7339
+        },
7340
+        {
7341
+          "refKey": "notNull",
7342
+          "hideInGraph": true
7343
+        },
7344
+        {
7345
+          "refKey": "autoIncrement",
7346
+          "hideInGraph": true
7347
+        },
7348
+        {
7349
+          "refKey": "domain",
7350
+          "hideInGraph": true
7351
+        },
7352
+        {
7353
+          "refKey": "type",
7354
+          "hideInGraph": false
7355
+        },
7356
+        {
7357
+          "refKey": "len",
7358
+          "hideInGraph": false
7359
+        },
7360
+        {
7361
+          "refKey": "scale",
7362
+          "hideInGraph": false
7363
+        },
7364
+        {
7365
+          "refKey": "comment",
7366
+          "hideInGraph": true
7367
+        },
7368
+        {
7369
+          "refKey": "refDict",
7370
+          "hideInGraph": true
7371
+        },
7372
+        {
7373
+          "refKey": "defaultValue",
7374
+          "hideInGraph": true
7375
+        },
7376
+        {
7377
+          "refKey": "isStandard",
7378
+          "hideInGraph": false
7379
+        },
7380
+        {
7381
+          "refKey": "uiHint",
7382
+          "hideInGraph": true
7383
+        },
7384
+        {
7385
+          "refKey": "extProps",
7386
+          "hideInGraph": true
7387
+        }
7388
+      ],
7389
+      "fields": [
7390
+        {
7391
+          "defKey": "apply_id",
7392
+          "defName": "申请ID",
7393
+          "comment": "",
7394
+          "type": "",
7395
+          "len": "",
7396
+          "scale": "",
7397
+          "primaryKey": true,
7398
+          "notNull": true,
7399
+          "autoIncrement": true,
7400
+          "defaultValue": "",
7401
+          "hideInGraph": true,
7402
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7403
+          "refDict": "",
7404
+          "uiHint": "",
7405
+          "id": "9E9FC486-B4BD-4D23-BE5A-B37897E18C0D"
7406
+        },
7407
+        {
7408
+          "defKey": "issue_id",
7409
+          "defName": "问题ID",
7410
+          "comment": "",
7411
+          "type": "",
7412
+          "len": "",
7413
+          "scale": "",
7414
+          "primaryKey": false,
7415
+          "notNull": false,
7416
+          "autoIncrement": false,
7417
+          "defaultValue": "",
7418
+          "hideInGraph": false,
7419
+          "refDict": "",
7420
+          "extProps": {},
7421
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7422
+          "id": "A360A69A-AACF-4AEC-8E2B-3B0F59C656AD"
7423
+        },
7424
+        {
7425
+          "defKey": "apply_type",
7426
+          "defName": "申请类型",
7427
+          "comment": "",
7428
+          "type": "",
7429
+          "len": "",
7430
+          "scale": "",
7431
+          "primaryKey": false,
7432
+          "notNull": false,
7433
+          "autoIncrement": false,
7434
+          "defaultValue": "",
7435
+          "hideInGraph": false,
7436
+          "refDict": "",
7437
+          "extProps": {},
7438
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
7439
+          "id": "096988D2-CAC7-4E30-BBCE-5824847A4131"
7440
+        },
7441
+        {
7442
+          "defKey": "content",
7443
+          "defName": "申请内容",
7444
+          "comment": "",
7445
+          "type": "",
7446
+          "len": "",
7447
+          "scale": "",
7448
+          "primaryKey": false,
7449
+          "notNull": false,
7450
+          "autoIncrement": false,
7451
+          "defaultValue": "",
7452
+          "hideInGraph": false,
7453
+          "refDict": "",
7454
+          "extProps": {},
7455
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7456
+          "id": "3E7DAA2F-E366-43C6-9E96-12444F90EFFE"
7457
+        },
7458
+        {
7459
+          "defKey": "remark",
7460
+          "defName": "申请理由",
7461
+          "comment": "",
7462
+          "type": "",
7463
+          "len": "",
7464
+          "scale": "",
7465
+          "primaryKey": false,
7466
+          "notNull": false,
7467
+          "autoIncrement": false,
7468
+          "defaultValue": "",
7469
+          "hideInGraph": false,
7470
+          "refDict": "",
7471
+          "extProps": {},
7472
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7473
+          "id": "E6EC1EBE-A5D1-4B81-B445-4A390BEBB8B4"
7474
+        },
7475
+        {
7476
+          "defKey": "verify_status",
7477
+          "defName": "审批结果",
7478
+          "comment": "",
7479
+          "type": "",
7480
+          "len": "",
7481
+          "scale": "",
7482
+          "primaryKey": false,
7483
+          "notNull": false,
7484
+          "autoIncrement": false,
7485
+          "defaultValue": "",
7486
+          "hideInGraph": false,
7487
+          "refDict": "",
7488
+          "extProps": {},
7489
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7490
+          "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
7491
+        },
7492
+        {
7493
+          "defKey": "verify_desc",
7494
+          "defName": "审批说明",
7495
+          "comment": "",
7496
+          "type": "",
7497
+          "len": "",
7498
+          "scale": "",
7499
+          "primaryKey": false,
7500
+          "notNull": false,
7501
+          "autoIncrement": false,
7502
+          "defaultValue": "",
7503
+          "hideInGraph": false,
7504
+          "refDict": "",
7505
+          "extProps": {},
7506
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7507
+          "id": "2A0985FE-1246-4339-9C9E-7E03FF53B3F2"
7508
+        },
7509
+        {
7510
+          "defKey": "verify_org",
7511
+          "defName": "审批机构",
7512
+          "comment": "",
7513
+          "type": "",
7514
+          "len": "",
7515
+          "scale": "",
7516
+          "primaryKey": false,
7517
+          "notNull": false,
7518
+          "autoIncrement": false,
7519
+          "defaultValue": "",
7520
+          "hideInGraph": false,
7521
+          "refDict": "",
7522
+          "extProps": {},
7523
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7524
+          "id": "D4975D51-9F16-4432-AA26-8306223315FC"
7525
+        },
7526
+        {
7527
+          "defKey": "verify_user",
7528
+          "defName": "审批人",
7529
+          "comment": "",
7530
+          "type": "",
7531
+          "len": "",
7532
+          "scale": "",
7533
+          "primaryKey": false,
7534
+          "notNull": false,
7535
+          "autoIncrement": false,
7536
+          "defaultValue": "",
7537
+          "hideInGraph": false,
7538
+          "refDict": "",
7539
+          "extProps": {},
7540
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7541
+          "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
7542
+        },
7543
+        {
7544
+          "defKey": "verify_user_name",
7545
+          "defName": "审批人名称",
7546
+          "comment": "",
7547
+          "type": "",
7548
+          "len": "",
7549
+          "scale": "",
7550
+          "primaryKey": false,
7551
+          "notNull": false,
7552
+          "autoIncrement": false,
7553
+          "defaultValue": "",
7554
+          "hideInGraph": false,
7555
+          "refDict": "",
7556
+          "extProps": {},
7557
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7558
+          "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
7559
+        },
7560
+        {
7561
+          "defKey": "verify_date",
7562
+          "defName": "审批日期",
7563
+          "comment": "",
7564
+          "type": "",
7565
+          "len": "",
7566
+          "scale": "",
7567
+          "primaryKey": false,
7568
+          "notNull": false,
7569
+          "autoIncrement": false,
7570
+          "defaultValue": "",
7571
+          "hideInGraph": false,
7572
+          "refDict": "",
7573
+          "extProps": {},
7574
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7575
+          "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
7576
+        },
7577
+        {
7578
+          "defKey": "status",
7579
+          "defName": "状态",
7580
+          "comment": "",
7581
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7582
+          "type": "",
7583
+          "len": "",
7584
+          "scale": "",
7585
+          "primaryKey": false,
7586
+          "notNull": false,
7587
+          "autoIncrement": false,
7588
+          "defaultValue": "1",
7589
+          "hideInGraph": true,
7590
+          "refDict": "",
7591
+          "uiHint": "",
7592
+          "id": "2A004F15-3F14-4246-A0CF-40FAEC550488"
7593
+        },
7594
+        {
7595
+          "defKey": "org_id",
7596
+          "defName": "申请机构",
7597
+          "comment": "",
7598
+          "type": "",
7599
+          "len": "",
7600
+          "scale": "",
7601
+          "primaryKey": false,
7602
+          "notNull": false,
7603
+          "autoIncrement": false,
7604
+          "defaultValue": "",
7605
+          "hideInGraph": false,
7606
+          "refDict": "",
7607
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7608
+          "id": "6E82502D-6F40-4D1E-A6D8-31729A80FA26",
7609
+          "uiHint": ""
7610
+        },
7611
+        {
7612
+          "defKey": "create_user",
7613
+          "defName": "申请人",
7614
+          "comment": "",
7615
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7616
+          "type": "",
7617
+          "len": "",
7618
+          "scale": "",
7619
+          "primaryKey": false,
7620
+          "notNull": false,
7621
+          "autoIncrement": false,
7622
+          "defaultValue": "",
7623
+          "hideInGraph": true,
7624
+          "refDict": "",
7625
+          "uiHint": "",
7626
+          "id": "54384CCC-1DCE-4963-A2E0-2688174E6CE7"
7627
+        },
7628
+        {
7629
+          "defKey": "create_user_name",
7630
+          "defName": "申请人名称",
7631
+          "comment": "",
7632
+          "type": "",
7633
+          "len": "",
7634
+          "scale": "",
7635
+          "primaryKey": false,
7636
+          "notNull": false,
7637
+          "autoIncrement": false,
7638
+          "defaultValue": "",
7639
+          "hideInGraph": false,
7640
+          "refDict": "",
7641
+          "extProps": {},
7642
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7643
+          "id": "3F282C6B-0092-44D4-AE16-098BFE56C890"
7644
+        },
7645
+        {
7646
+          "defKey": "create_date",
7647
+          "defName": "申请时间",
7648
+          "comment": "",
7649
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
7650
+          "type": "",
7651
+          "len": "",
7652
+          "scale": "",
7653
+          "primaryKey": false,
7654
+          "notNull": false,
7655
+          "autoIncrement": false,
7656
+          "defaultValue": "CURRENT_TIMESTAMP",
7657
+          "hideInGraph": true,
7658
+          "refDict": "",
7659
+          "uiHint": "",
7660
+          "id": "24B04823-5C80-4F84-8970-2C71C0883847"
7661
+        }
7662
+      ],
7663
+      "correlations": [],
7664
+      "indexes": []
7262 7665
     }
7263 7666
   ],
7264 7667
   "views": [],
@@ -7676,6 +8079,7 @@
7676 8079
         "C9F5C24F-D781-4581-8EBA-9E45B04F04F8",
7677 8080
         "888D6DF2-6108-4858-A7EC-B15B665C3F26",
7678 8081
         "19B75EC5-28E6-409A-93B9-E87CE8E1FBE6",
8082
+        "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7679 8083
         "B65EFCBA-EA4D-4EA6-AAF8-00205A474251",
7680 8084
         "EAEDEC6F-A840-41DF-A693-FA13AF8A5F9B",
7681 8085
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",

db/.back_文明创办/文明创办-backup-20221226214926.pdma.json → db/.back_文明创办/文明创办-backup-20221227172242.pdma.json Целия файл

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.2.0",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2022-12-25 17:03:14",
7
+  "updatedTime": "2022-12-27 17:20:04",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -3588,9 +3588,27 @@
3588 3588
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
3589 3589
           "id": "0C4AEF3B-E3BB-4C7F-9943-F579E6A3CEEE"
3590 3590
         },
3591
+        {
3592
+          "defKey": "expire_date",
3593
+          "defName": "截止时间",
3594
+          "comment": "YYYY-MM-DD",
3595
+          "type": "",
3596
+          "len": "",
3597
+          "scale": "",
3598
+          "primaryKey": false,
3599
+          "notNull": false,
3600
+          "autoIncrement": false,
3601
+          "defaultValue": "",
3602
+          "hideInGraph": false,
3603
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
3604
+          "refDict": "",
3605
+          "extProps": {},
3606
+          "notes": {},
3607
+          "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
3608
+        },
3591 3609
         {
3592 3610
           "defKey": "org_id",
3593
-          "defName": "当前处理单位",
3611
+          "defName": "责任单位",
3594 3612
           "comment": "",
3595 3613
           "type": "",
3596 3614
           "len": "",
@@ -4318,8 +4336,8 @@
4318 4336
           "id": "AFC8B3AA-0A3C-483A-9CDA-556CDC9D2ABE"
4319 4337
         },
4320 4338
         {
4321
-          "defKey": "org_id",
4322
-          "defName": "处理机构",
4339
+          "defKey": "prev_process",
4340
+          "defName": "上个流程ID",
4323 4341
           "comment": "",
4324 4342
           "type": "",
4325 4343
           "len": "",
@@ -4330,9 +4348,9 @@
4330 4348
           "defaultValue": "",
4331 4349
           "hideInGraph": false,
4332 4350
           "refDict": "",
4333
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
4334
-          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4335
-          "uiHint": ""
4351
+          "extProps": {},
4352
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4353
+          "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
4336 4354
         },
4337 4355
         {
4338 4356
           "defKey": "next_org",
@@ -4420,25 +4438,97 @@
4420 4438
           "id": "98A22AE6-A570-4E5A-B1CE-7F036B692110"
4421 4439
         },
4422 4440
         {
4423
-          "defKey": "status",
4424
-          "defName": "状态",
4441
+          "defKey": "verify_org",
4442
+          "defName": "审批机构",
4425 4443
           "comment": "",
4426
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4427 4444
           "type": "",
4428 4445
           "len": "",
4429 4446
           "scale": "",
4430 4447
           "primaryKey": false,
4431 4448
           "notNull": false,
4432 4449
           "autoIncrement": false,
4433
-          "defaultValue": "1",
4434
-          "hideInGraph": true,
4450
+          "defaultValue": "",
4451
+          "hideInGraph": false,
4452
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
4435 4453
           "refDict": "",
4436
-          "uiHint": "",
4437
-          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4454
+          "extProps": {},
4455
+          "notes": {},
4456
+          "id": "7F5E3563-8E5F-45A2-9EA7-486C3012CDBB"
4457
+        },
4458
+        {
4459
+          "defKey": "verify_user",
4460
+          "defName": "审批人",
4461
+          "comment": "",
4462
+          "type": "",
4463
+          "len": "",
4464
+          "scale": "",
4465
+          "primaryKey": false,
4466
+          "notNull": false,
4467
+          "autoIncrement": false,
4468
+          "defaultValue": "",
4469
+          "hideInGraph": false,
4470
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4471
+          "refDict": "",
4472
+          "extProps": {},
4473
+          "notes": {},
4474
+          "id": "BFEA7C0C-20C1-4EED-96E8-2951E12F25DC"
4475
+        },
4476
+        {
4477
+          "defKey": "verify_user_name",
4478
+          "defName": "审批人名称",
4479
+          "comment": "",
4480
+          "type": "",
4481
+          "len": "",
4482
+          "scale": "",
4483
+          "primaryKey": false,
4484
+          "notNull": false,
4485
+          "autoIncrement": false,
4486
+          "defaultValue": "",
4487
+          "hideInGraph": false,
4488
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4489
+          "refDict": "",
4490
+          "extProps": {},
4491
+          "notes": {},
4492
+          "id": "F5048929-1268-4AAB-B2D3-FB06838D7CC2"
4493
+        },
4494
+        {
4495
+          "defKey": "verify_date",
4496
+          "defName": "审批日期",
4497
+          "comment": "",
4498
+          "type": "",
4499
+          "len": "",
4500
+          "scale": "",
4501
+          "primaryKey": false,
4502
+          "notNull": false,
4503
+          "autoIncrement": false,
4504
+          "defaultValue": "",
4505
+          "hideInGraph": false,
4506
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4507
+          "refDict": "",
4508
+          "extProps": {},
4509
+          "notes": {},
4510
+          "id": "0CDD216B-585A-4D43-A100-E0F581BAE052"
4511
+        },
4512
+        {
4513
+          "defKey": "org_id",
4514
+          "defName": "申请机构",
4515
+          "comment": "",
4516
+          "type": "",
4517
+          "len": "",
4518
+          "scale": "",
4519
+          "primaryKey": false,
4520
+          "notNull": false,
4521
+          "autoIncrement": false,
4522
+          "defaultValue": "",
4523
+          "hideInGraph": false,
4524
+          "refDict": "",
4525
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4526
+          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4527
+          "uiHint": ""
4438 4528
         },
4439 4529
         {
4440 4530
           "defKey": "create_user",
4441
-          "defName": "处理人",
4531
+          "defName": "申请人",
4442 4532
           "comment": "",
4443 4533
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
4444 4534
           "type": "",
@@ -4455,7 +4545,7 @@
4455 4545
         },
4456 4546
         {
4457 4547
           "defKey": "user_name",
4458
-          "defName": "处理人名称",
4548
+          "defName": "申请人名称",
4459 4549
           "comment": "",
4460 4550
           "type": "",
4461 4551
           "len": "",
@@ -4472,7 +4562,7 @@
4472 4562
         },
4473 4563
         {
4474 4564
           "defKey": "create_date",
4475
-          "defName": "创建时间",
4565
+          "defName": "申请时间",
4476 4566
           "comment": "",
4477 4567
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
4478 4568
           "type": "",
@@ -4486,6 +4576,23 @@
4486 4576
           "refDict": "",
4487 4577
           "uiHint": "",
4488 4578
           "id": "DC8BABA9-B796-462E-A242-C92E3BF071C8"
4579
+        },
4580
+        {
4581
+          "defKey": "status",
4582
+          "defName": "状态",
4583
+          "comment": "",
4584
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4585
+          "type": "",
4586
+          "len": "",
4587
+          "scale": "",
4588
+          "primaryKey": false,
4589
+          "notNull": false,
4590
+          "autoIncrement": false,
4591
+          "defaultValue": "1",
4592
+          "hideInGraph": true,
4593
+          "refDict": "",
4594
+          "uiHint": "",
4595
+          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4489 4596
         }
4490 4597
       ],
4491 4598
       "correlations": [],
@@ -7241,6 +7348,392 @@
7241 7348
       ],
7242 7349
       "correlations": [],
7243 7350
       "indexes": []
7351
+    },
7352
+    {
7353
+      "id": "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7354
+      "env": {
7355
+        "base": {
7356
+          "nameSpace": "com.example.civilizedcity",
7357
+          "codeRoot": "TaIssueApply"
7358
+        },
7359
+        "template": {
7360
+          "JavaMybatisPlus": {
7361
+            "Controller": {
7362
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
7363
+              "enable": true
7364
+            },
7365
+            "Service": {
7366
+              "suffix": "service/{{=it.codeRoot}}Service.java",
7367
+              "enable": true
7368
+            },
7369
+            "ServiceImpl": {
7370
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
7371
+              "enable": true
7372
+            },
7373
+            "Mapper": {
7374
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
7375
+              "enable": true
7376
+            },
7377
+            "Mapper.xml": {
7378
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
7379
+              "enable": true
7380
+            },
7381
+            "Entity": {
7382
+              "suffix": "entity/{{=it.codeRoot}}.java",
7383
+              "enable": true
7384
+            }
7385
+          }
7386
+        },
7387
+        "custom": {}
7388
+      },
7389
+      "defKey": "ta_issue_apply",
7390
+      "defName": "问题处理申请",
7391
+      "comment": "",
7392
+      "properties": {},
7393
+      "nameTemplate": "{defKey}[{defName}]",
7394
+      "notes": {},
7395
+      "headers": [
7396
+        {
7397
+          "refKey": "hideInGraph",
7398
+          "hideInGraph": true
7399
+        },
7400
+        {
7401
+          "refKey": "defKey",
7402
+          "hideInGraph": false
7403
+        },
7404
+        {
7405
+          "refKey": "defName",
7406
+          "hideInGraph": false
7407
+        },
7408
+        {
7409
+          "refKey": "primaryKey",
7410
+          "hideInGraph": false
7411
+        },
7412
+        {
7413
+          "refKey": "notNull",
7414
+          "hideInGraph": true
7415
+        },
7416
+        {
7417
+          "refKey": "autoIncrement",
7418
+          "hideInGraph": true
7419
+        },
7420
+        {
7421
+          "refKey": "domain",
7422
+          "hideInGraph": true
7423
+        },
7424
+        {
7425
+          "refKey": "type",
7426
+          "hideInGraph": false
7427
+        },
7428
+        {
7429
+          "refKey": "len",
7430
+          "hideInGraph": false
7431
+        },
7432
+        {
7433
+          "refKey": "scale",
7434
+          "hideInGraph": false
7435
+        },
7436
+        {
7437
+          "refKey": "comment",
7438
+          "hideInGraph": true
7439
+        },
7440
+        {
7441
+          "refKey": "refDict",
7442
+          "hideInGraph": true
7443
+        },
7444
+        {
7445
+          "refKey": "defaultValue",
7446
+          "hideInGraph": true
7447
+        },
7448
+        {
7449
+          "refKey": "isStandard",
7450
+          "hideInGraph": false
7451
+        },
7452
+        {
7453
+          "refKey": "uiHint",
7454
+          "hideInGraph": true
7455
+        },
7456
+        {
7457
+          "refKey": "extProps",
7458
+          "hideInGraph": true
7459
+        }
7460
+      ],
7461
+      "fields": [
7462
+        {
7463
+          "defKey": "apply_id",
7464
+          "defName": "申请ID",
7465
+          "comment": "",
7466
+          "type": "",
7467
+          "len": "",
7468
+          "scale": "",
7469
+          "primaryKey": true,
7470
+          "notNull": true,
7471
+          "autoIncrement": true,
7472
+          "defaultValue": "",
7473
+          "hideInGraph": true,
7474
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7475
+          "refDict": "",
7476
+          "uiHint": "",
7477
+          "id": "9E9FC486-B4BD-4D23-BE5A-B37897E18C0D"
7478
+        },
7479
+        {
7480
+          "defKey": "issue_id",
7481
+          "defName": "问题ID",
7482
+          "comment": "",
7483
+          "type": "",
7484
+          "len": "",
7485
+          "scale": "",
7486
+          "primaryKey": false,
7487
+          "notNull": false,
7488
+          "autoIncrement": false,
7489
+          "defaultValue": "",
7490
+          "hideInGraph": false,
7491
+          "refDict": "",
7492
+          "extProps": {},
7493
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7494
+          "id": "A360A69A-AACF-4AEC-8E2B-3B0F59C656AD"
7495
+        },
7496
+        {
7497
+          "defKey": "apply_type",
7498
+          "defName": "申请类型",
7499
+          "comment": "",
7500
+          "type": "",
7501
+          "len": "",
7502
+          "scale": "",
7503
+          "primaryKey": false,
7504
+          "notNull": false,
7505
+          "autoIncrement": false,
7506
+          "defaultValue": "",
7507
+          "hideInGraph": false,
7508
+          "refDict": "",
7509
+          "extProps": {},
7510
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
7511
+          "id": "096988D2-CAC7-4E30-BBCE-5824847A4131"
7512
+        },
7513
+        {
7514
+          "defKey": "content",
7515
+          "defName": "申请内容",
7516
+          "comment": "",
7517
+          "type": "",
7518
+          "len": "",
7519
+          "scale": "",
7520
+          "primaryKey": false,
7521
+          "notNull": false,
7522
+          "autoIncrement": false,
7523
+          "defaultValue": "",
7524
+          "hideInGraph": false,
7525
+          "refDict": "",
7526
+          "extProps": {},
7527
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7528
+          "id": "3E7DAA2F-E366-43C6-9E96-12444F90EFFE"
7529
+        },
7530
+        {
7531
+          "defKey": "remark",
7532
+          "defName": "申请理由",
7533
+          "comment": "",
7534
+          "type": "",
7535
+          "len": "",
7536
+          "scale": "",
7537
+          "primaryKey": false,
7538
+          "notNull": false,
7539
+          "autoIncrement": false,
7540
+          "defaultValue": "",
7541
+          "hideInGraph": false,
7542
+          "refDict": "",
7543
+          "extProps": {},
7544
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7545
+          "id": "E6EC1EBE-A5D1-4B81-B445-4A390BEBB8B4"
7546
+        },
7547
+        {
7548
+          "defKey": "verify_status",
7549
+          "defName": "审批结果",
7550
+          "comment": "",
7551
+          "type": "",
7552
+          "len": "",
7553
+          "scale": "",
7554
+          "primaryKey": false,
7555
+          "notNull": false,
7556
+          "autoIncrement": false,
7557
+          "defaultValue": "",
7558
+          "hideInGraph": false,
7559
+          "refDict": "",
7560
+          "extProps": {},
7561
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7562
+          "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
7563
+        },
7564
+        {
7565
+          "defKey": "verify_desc",
7566
+          "defName": "审批说明",
7567
+          "comment": "",
7568
+          "type": "",
7569
+          "len": "",
7570
+          "scale": "",
7571
+          "primaryKey": false,
7572
+          "notNull": false,
7573
+          "autoIncrement": false,
7574
+          "defaultValue": "",
7575
+          "hideInGraph": false,
7576
+          "refDict": "",
7577
+          "extProps": {},
7578
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7579
+          "id": "2A0985FE-1246-4339-9C9E-7E03FF53B3F2"
7580
+        },
7581
+        {
7582
+          "defKey": "verify_org",
7583
+          "defName": "审批机构",
7584
+          "comment": "",
7585
+          "type": "",
7586
+          "len": "",
7587
+          "scale": "",
7588
+          "primaryKey": false,
7589
+          "notNull": false,
7590
+          "autoIncrement": false,
7591
+          "defaultValue": "",
7592
+          "hideInGraph": false,
7593
+          "refDict": "",
7594
+          "extProps": {},
7595
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7596
+          "id": "D4975D51-9F16-4432-AA26-8306223315FC"
7597
+        },
7598
+        {
7599
+          "defKey": "verify_user",
7600
+          "defName": "审批人",
7601
+          "comment": "",
7602
+          "type": "",
7603
+          "len": "",
7604
+          "scale": "",
7605
+          "primaryKey": false,
7606
+          "notNull": false,
7607
+          "autoIncrement": false,
7608
+          "defaultValue": "",
7609
+          "hideInGraph": false,
7610
+          "refDict": "",
7611
+          "extProps": {},
7612
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7613
+          "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
7614
+        },
7615
+        {
7616
+          "defKey": "verify_user_name",
7617
+          "defName": "审批人名称",
7618
+          "comment": "",
7619
+          "type": "",
7620
+          "len": "",
7621
+          "scale": "",
7622
+          "primaryKey": false,
7623
+          "notNull": false,
7624
+          "autoIncrement": false,
7625
+          "defaultValue": "",
7626
+          "hideInGraph": false,
7627
+          "refDict": "",
7628
+          "extProps": {},
7629
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7630
+          "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
7631
+        },
7632
+        {
7633
+          "defKey": "verify_date",
7634
+          "defName": "审批日期",
7635
+          "comment": "",
7636
+          "type": "",
7637
+          "len": "",
7638
+          "scale": "",
7639
+          "primaryKey": false,
7640
+          "notNull": false,
7641
+          "autoIncrement": false,
7642
+          "defaultValue": "",
7643
+          "hideInGraph": false,
7644
+          "refDict": "",
7645
+          "extProps": {},
7646
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7647
+          "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
7648
+        },
7649
+        {
7650
+          "defKey": "status",
7651
+          "defName": "状态",
7652
+          "comment": "",
7653
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7654
+          "type": "",
7655
+          "len": "",
7656
+          "scale": "",
7657
+          "primaryKey": false,
7658
+          "notNull": false,
7659
+          "autoIncrement": false,
7660
+          "defaultValue": "1",
7661
+          "hideInGraph": true,
7662
+          "refDict": "",
7663
+          "uiHint": "",
7664
+          "id": "2A004F15-3F14-4246-A0CF-40FAEC550488"
7665
+        },
7666
+        {
7667
+          "defKey": "org_id",
7668
+          "defName": "申请机构",
7669
+          "comment": "",
7670
+          "type": "",
7671
+          "len": "",
7672
+          "scale": "",
7673
+          "primaryKey": false,
7674
+          "notNull": false,
7675
+          "autoIncrement": false,
7676
+          "defaultValue": "",
7677
+          "hideInGraph": false,
7678
+          "refDict": "",
7679
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7680
+          "id": "6E82502D-6F40-4D1E-A6D8-31729A80FA26",
7681
+          "uiHint": ""
7682
+        },
7683
+        {
7684
+          "defKey": "create_user",
7685
+          "defName": "申请人",
7686
+          "comment": "",
7687
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7688
+          "type": "",
7689
+          "len": "",
7690
+          "scale": "",
7691
+          "primaryKey": false,
7692
+          "notNull": false,
7693
+          "autoIncrement": false,
7694
+          "defaultValue": "",
7695
+          "hideInGraph": true,
7696
+          "refDict": "",
7697
+          "uiHint": "",
7698
+          "id": "54384CCC-1DCE-4963-A2E0-2688174E6CE7"
7699
+        },
7700
+        {
7701
+          "defKey": "create_user_name",
7702
+          "defName": "申请人名称",
7703
+          "comment": "",
7704
+          "type": "",
7705
+          "len": "",
7706
+          "scale": "",
7707
+          "primaryKey": false,
7708
+          "notNull": false,
7709
+          "autoIncrement": false,
7710
+          "defaultValue": "",
7711
+          "hideInGraph": false,
7712
+          "refDict": "",
7713
+          "extProps": {},
7714
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7715
+          "id": "3F282C6B-0092-44D4-AE16-098BFE56C890"
7716
+        },
7717
+        {
7718
+          "defKey": "create_date",
7719
+          "defName": "申请时间",
7720
+          "comment": "",
7721
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
7722
+          "type": "",
7723
+          "len": "",
7724
+          "scale": "",
7725
+          "primaryKey": false,
7726
+          "notNull": false,
7727
+          "autoIncrement": false,
7728
+          "defaultValue": "CURRENT_TIMESTAMP",
7729
+          "hideInGraph": true,
7730
+          "refDict": "",
7731
+          "uiHint": "",
7732
+          "id": "24B04823-5C80-4F84-8970-2C71C0883847"
7733
+        }
7734
+      ],
7735
+      "correlations": [],
7736
+      "indexes": []
7244 7737
     }
7245 7738
   ],
7246 7739
   "views": [],
@@ -7658,6 +8151,7 @@
7658 8151
         "C9F5C24F-D781-4581-8EBA-9E45B04F04F8",
7659 8152
         "888D6DF2-6108-4858-A7EC-B15B665C3F26",
7660 8153
         "19B75EC5-28E6-409A-93B9-E87CE8E1FBE6",
8154
+        "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7661 8155
         "B65EFCBA-EA4D-4EA6-AAF8-00205A474251",
7662 8156
         "EAEDEC6F-A840-41DF-A693-FA13AF8A5F9B",
7663 8157
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",

db/.back_文明创办/文明创办-backup-20221225170314.pdma.json → db/.back_文明创办/文明创办-backup-20221228082808.pdma.json Целия файл

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.2.0",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2022-12-25 17:03:12",
7
+  "updatedTime": "2022-12-27 17:22:42",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -3588,9 +3588,27 @@
3588 3588
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
3589 3589
           "id": "0C4AEF3B-E3BB-4C7F-9943-F579E6A3CEEE"
3590 3590
         },
3591
+        {
3592
+          "defKey": "expire_date",
3593
+          "defName": "截止时间",
3594
+          "comment": "YYYY-MM-DD",
3595
+          "type": "",
3596
+          "len": "",
3597
+          "scale": "",
3598
+          "primaryKey": false,
3599
+          "notNull": false,
3600
+          "autoIncrement": false,
3601
+          "defaultValue": "",
3602
+          "hideInGraph": false,
3603
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
3604
+          "refDict": "",
3605
+          "extProps": {},
3606
+          "notes": {},
3607
+          "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
3608
+        },
3591 3609
         {
3592 3610
           "defKey": "org_id",
3593
-          "defName": "当前处理单位",
3611
+          "defName": "责任单位",
3594 3612
           "comment": "",
3595 3613
           "type": "",
3596 3614
           "len": "",
@@ -4318,8 +4336,8 @@
4318 4336
           "id": "AFC8B3AA-0A3C-483A-9CDA-556CDC9D2ABE"
4319 4337
         },
4320 4338
         {
4321
-          "defKey": "org_id",
4322
-          "defName": "处理机构",
4339
+          "defKey": "prev_process",
4340
+          "defName": "上个流程ID",
4323 4341
           "comment": "",
4324 4342
           "type": "",
4325 4343
           "len": "",
@@ -4330,9 +4348,9 @@
4330 4348
           "defaultValue": "",
4331 4349
           "hideInGraph": false,
4332 4350
           "refDict": "",
4333
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
4334
-          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4335
-          "uiHint": ""
4351
+          "extProps": {},
4352
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4353
+          "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
4336 4354
         },
4337 4355
         {
4338 4356
           "defKey": "next_org",
@@ -4420,21 +4438,21 @@
4420 4438
           "id": "98A22AE6-A570-4E5A-B1CE-7F036B692110"
4421 4439
         },
4422 4440
         {
4423
-          "defKey": "status",
4424
-          "defName": "状态",
4441
+          "defKey": "org_id",
4442
+          "defName": "处理机构",
4425 4443
           "comment": "",
4426
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4427 4444
           "type": "",
4428 4445
           "len": "",
4429 4446
           "scale": "",
4430 4447
           "primaryKey": false,
4431 4448
           "notNull": false,
4432 4449
           "autoIncrement": false,
4433
-          "defaultValue": "1",
4434
-          "hideInGraph": true,
4450
+          "defaultValue": "",
4451
+          "hideInGraph": false,
4435 4452
           "refDict": "",
4436
-          "uiHint": "",
4437
-          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4453
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4454
+          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4455
+          "uiHint": ""
4438 4456
         },
4439 4457
         {
4440 4458
           "defKey": "create_user",
@@ -4486,6 +4504,23 @@
4486 4504
           "refDict": "",
4487 4505
           "uiHint": "",
4488 4506
           "id": "DC8BABA9-B796-462E-A242-C92E3BF071C8"
4507
+        },
4508
+        {
4509
+          "defKey": "status",
4510
+          "defName": "状态",
4511
+          "comment": "",
4512
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4513
+          "type": "",
4514
+          "len": "",
4515
+          "scale": "",
4516
+          "primaryKey": false,
4517
+          "notNull": false,
4518
+          "autoIncrement": false,
4519
+          "defaultValue": "1",
4520
+          "hideInGraph": true,
4521
+          "refDict": "",
4522
+          "uiHint": "",
4523
+          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4489 4524
         }
4490 4525
       ],
4491 4526
       "correlations": [],
@@ -7241,6 +7276,392 @@
7241 7276
       ],
7242 7277
       "correlations": [],
7243 7278
       "indexes": []
7279
+    },
7280
+    {
7281
+      "id": "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7282
+      "env": {
7283
+        "base": {
7284
+          "nameSpace": "com.example.civilizedcity",
7285
+          "codeRoot": "TaIssueApply"
7286
+        },
7287
+        "template": {
7288
+          "JavaMybatisPlus": {
7289
+            "Controller": {
7290
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
7291
+              "enable": true
7292
+            },
7293
+            "Service": {
7294
+              "suffix": "service/{{=it.codeRoot}}Service.java",
7295
+              "enable": true
7296
+            },
7297
+            "ServiceImpl": {
7298
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
7299
+              "enable": true
7300
+            },
7301
+            "Mapper": {
7302
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
7303
+              "enable": true
7304
+            },
7305
+            "Mapper.xml": {
7306
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
7307
+              "enable": true
7308
+            },
7309
+            "Entity": {
7310
+              "suffix": "entity/{{=it.codeRoot}}.java",
7311
+              "enable": true
7312
+            }
7313
+          }
7314
+        },
7315
+        "custom": {}
7316
+      },
7317
+      "defKey": "ta_issue_apply",
7318
+      "defName": "问题处理申请",
7319
+      "comment": "",
7320
+      "properties": {},
7321
+      "nameTemplate": "{defKey}[{defName}]",
7322
+      "notes": {},
7323
+      "headers": [
7324
+        {
7325
+          "refKey": "hideInGraph",
7326
+          "hideInGraph": true
7327
+        },
7328
+        {
7329
+          "refKey": "defKey",
7330
+          "hideInGraph": false
7331
+        },
7332
+        {
7333
+          "refKey": "defName",
7334
+          "hideInGraph": false
7335
+        },
7336
+        {
7337
+          "refKey": "primaryKey",
7338
+          "hideInGraph": false
7339
+        },
7340
+        {
7341
+          "refKey": "notNull",
7342
+          "hideInGraph": true
7343
+        },
7344
+        {
7345
+          "refKey": "autoIncrement",
7346
+          "hideInGraph": true
7347
+        },
7348
+        {
7349
+          "refKey": "domain",
7350
+          "hideInGraph": true
7351
+        },
7352
+        {
7353
+          "refKey": "type",
7354
+          "hideInGraph": false
7355
+        },
7356
+        {
7357
+          "refKey": "len",
7358
+          "hideInGraph": false
7359
+        },
7360
+        {
7361
+          "refKey": "scale",
7362
+          "hideInGraph": false
7363
+        },
7364
+        {
7365
+          "refKey": "comment",
7366
+          "hideInGraph": true
7367
+        },
7368
+        {
7369
+          "refKey": "refDict",
7370
+          "hideInGraph": true
7371
+        },
7372
+        {
7373
+          "refKey": "defaultValue",
7374
+          "hideInGraph": true
7375
+        },
7376
+        {
7377
+          "refKey": "isStandard",
7378
+          "hideInGraph": false
7379
+        },
7380
+        {
7381
+          "refKey": "uiHint",
7382
+          "hideInGraph": true
7383
+        },
7384
+        {
7385
+          "refKey": "extProps",
7386
+          "hideInGraph": true
7387
+        }
7388
+      ],
7389
+      "fields": [
7390
+        {
7391
+          "defKey": "apply_id",
7392
+          "defName": "申请ID",
7393
+          "comment": "",
7394
+          "type": "",
7395
+          "len": "",
7396
+          "scale": "",
7397
+          "primaryKey": true,
7398
+          "notNull": true,
7399
+          "autoIncrement": true,
7400
+          "defaultValue": "",
7401
+          "hideInGraph": true,
7402
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7403
+          "refDict": "",
7404
+          "uiHint": "",
7405
+          "id": "9E9FC486-B4BD-4D23-BE5A-B37897E18C0D"
7406
+        },
7407
+        {
7408
+          "defKey": "issue_id",
7409
+          "defName": "问题ID",
7410
+          "comment": "",
7411
+          "type": "",
7412
+          "len": "",
7413
+          "scale": "",
7414
+          "primaryKey": false,
7415
+          "notNull": false,
7416
+          "autoIncrement": false,
7417
+          "defaultValue": "",
7418
+          "hideInGraph": false,
7419
+          "refDict": "",
7420
+          "extProps": {},
7421
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7422
+          "id": "A360A69A-AACF-4AEC-8E2B-3B0F59C656AD"
7423
+        },
7424
+        {
7425
+          "defKey": "apply_type",
7426
+          "defName": "申请类型",
7427
+          "comment": "",
7428
+          "type": "",
7429
+          "len": "",
7430
+          "scale": "",
7431
+          "primaryKey": false,
7432
+          "notNull": false,
7433
+          "autoIncrement": false,
7434
+          "defaultValue": "",
7435
+          "hideInGraph": false,
7436
+          "refDict": "",
7437
+          "extProps": {},
7438
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
7439
+          "id": "096988D2-CAC7-4E30-BBCE-5824847A4131"
7440
+        },
7441
+        {
7442
+          "defKey": "content",
7443
+          "defName": "申请内容",
7444
+          "comment": "",
7445
+          "type": "",
7446
+          "len": "",
7447
+          "scale": "",
7448
+          "primaryKey": false,
7449
+          "notNull": false,
7450
+          "autoIncrement": false,
7451
+          "defaultValue": "",
7452
+          "hideInGraph": false,
7453
+          "refDict": "",
7454
+          "extProps": {},
7455
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7456
+          "id": "3E7DAA2F-E366-43C6-9E96-12444F90EFFE"
7457
+        },
7458
+        {
7459
+          "defKey": "remark",
7460
+          "defName": "申请理由",
7461
+          "comment": "",
7462
+          "type": "",
7463
+          "len": "",
7464
+          "scale": "",
7465
+          "primaryKey": false,
7466
+          "notNull": false,
7467
+          "autoIncrement": false,
7468
+          "defaultValue": "",
7469
+          "hideInGraph": false,
7470
+          "refDict": "",
7471
+          "extProps": {},
7472
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7473
+          "id": "E6EC1EBE-A5D1-4B81-B445-4A390BEBB8B4"
7474
+        },
7475
+        {
7476
+          "defKey": "verify_status",
7477
+          "defName": "审批结果",
7478
+          "comment": "",
7479
+          "type": "",
7480
+          "len": "",
7481
+          "scale": "",
7482
+          "primaryKey": false,
7483
+          "notNull": false,
7484
+          "autoIncrement": false,
7485
+          "defaultValue": "",
7486
+          "hideInGraph": false,
7487
+          "refDict": "",
7488
+          "extProps": {},
7489
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7490
+          "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
7491
+        },
7492
+        {
7493
+          "defKey": "verify_desc",
7494
+          "defName": "审批说明",
7495
+          "comment": "",
7496
+          "type": "",
7497
+          "len": "",
7498
+          "scale": "",
7499
+          "primaryKey": false,
7500
+          "notNull": false,
7501
+          "autoIncrement": false,
7502
+          "defaultValue": "",
7503
+          "hideInGraph": false,
7504
+          "refDict": "",
7505
+          "extProps": {},
7506
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7507
+          "id": "2A0985FE-1246-4339-9C9E-7E03FF53B3F2"
7508
+        },
7509
+        {
7510
+          "defKey": "verify_org",
7511
+          "defName": "审批机构",
7512
+          "comment": "",
7513
+          "type": "",
7514
+          "len": "",
7515
+          "scale": "",
7516
+          "primaryKey": false,
7517
+          "notNull": false,
7518
+          "autoIncrement": false,
7519
+          "defaultValue": "",
7520
+          "hideInGraph": false,
7521
+          "refDict": "",
7522
+          "extProps": {},
7523
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7524
+          "id": "D4975D51-9F16-4432-AA26-8306223315FC"
7525
+        },
7526
+        {
7527
+          "defKey": "verify_user",
7528
+          "defName": "审批人",
7529
+          "comment": "",
7530
+          "type": "",
7531
+          "len": "",
7532
+          "scale": "",
7533
+          "primaryKey": false,
7534
+          "notNull": false,
7535
+          "autoIncrement": false,
7536
+          "defaultValue": "",
7537
+          "hideInGraph": false,
7538
+          "refDict": "",
7539
+          "extProps": {},
7540
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7541
+          "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
7542
+        },
7543
+        {
7544
+          "defKey": "verify_user_name",
7545
+          "defName": "审批人名称",
7546
+          "comment": "",
7547
+          "type": "",
7548
+          "len": "",
7549
+          "scale": "",
7550
+          "primaryKey": false,
7551
+          "notNull": false,
7552
+          "autoIncrement": false,
7553
+          "defaultValue": "",
7554
+          "hideInGraph": false,
7555
+          "refDict": "",
7556
+          "extProps": {},
7557
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7558
+          "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
7559
+        },
7560
+        {
7561
+          "defKey": "verify_date",
7562
+          "defName": "审批日期",
7563
+          "comment": "",
7564
+          "type": "",
7565
+          "len": "",
7566
+          "scale": "",
7567
+          "primaryKey": false,
7568
+          "notNull": false,
7569
+          "autoIncrement": false,
7570
+          "defaultValue": "",
7571
+          "hideInGraph": false,
7572
+          "refDict": "",
7573
+          "extProps": {},
7574
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7575
+          "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
7576
+        },
7577
+        {
7578
+          "defKey": "status",
7579
+          "defName": "状态",
7580
+          "comment": "",
7581
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7582
+          "type": "",
7583
+          "len": "",
7584
+          "scale": "",
7585
+          "primaryKey": false,
7586
+          "notNull": false,
7587
+          "autoIncrement": false,
7588
+          "defaultValue": "1",
7589
+          "hideInGraph": true,
7590
+          "refDict": "",
7591
+          "uiHint": "",
7592
+          "id": "2A004F15-3F14-4246-A0CF-40FAEC550488"
7593
+        },
7594
+        {
7595
+          "defKey": "org_id",
7596
+          "defName": "申请机构",
7597
+          "comment": "",
7598
+          "type": "",
7599
+          "len": "",
7600
+          "scale": "",
7601
+          "primaryKey": false,
7602
+          "notNull": false,
7603
+          "autoIncrement": false,
7604
+          "defaultValue": "",
7605
+          "hideInGraph": false,
7606
+          "refDict": "",
7607
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7608
+          "id": "6E82502D-6F40-4D1E-A6D8-31729A80FA26",
7609
+          "uiHint": ""
7610
+        },
7611
+        {
7612
+          "defKey": "create_user",
7613
+          "defName": "申请人",
7614
+          "comment": "",
7615
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7616
+          "type": "",
7617
+          "len": "",
7618
+          "scale": "",
7619
+          "primaryKey": false,
7620
+          "notNull": false,
7621
+          "autoIncrement": false,
7622
+          "defaultValue": "",
7623
+          "hideInGraph": true,
7624
+          "refDict": "",
7625
+          "uiHint": "",
7626
+          "id": "54384CCC-1DCE-4963-A2E0-2688174E6CE7"
7627
+        },
7628
+        {
7629
+          "defKey": "create_user_name",
7630
+          "defName": "申请人名称",
7631
+          "comment": "",
7632
+          "type": "",
7633
+          "len": "",
7634
+          "scale": "",
7635
+          "primaryKey": false,
7636
+          "notNull": false,
7637
+          "autoIncrement": false,
7638
+          "defaultValue": "",
7639
+          "hideInGraph": false,
7640
+          "refDict": "",
7641
+          "extProps": {},
7642
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7643
+          "id": "3F282C6B-0092-44D4-AE16-098BFE56C890"
7644
+        },
7645
+        {
7646
+          "defKey": "create_date",
7647
+          "defName": "申请时间",
7648
+          "comment": "",
7649
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
7650
+          "type": "",
7651
+          "len": "",
7652
+          "scale": "",
7653
+          "primaryKey": false,
7654
+          "notNull": false,
7655
+          "autoIncrement": false,
7656
+          "defaultValue": "CURRENT_TIMESTAMP",
7657
+          "hideInGraph": true,
7658
+          "refDict": "",
7659
+          "uiHint": "",
7660
+          "id": "24B04823-5C80-4F84-8970-2C71C0883847"
7661
+        }
7662
+      ],
7663
+      "correlations": [],
7664
+      "indexes": []
7244 7665
     }
7245 7666
   ],
7246 7667
   "views": [],
@@ -7658,6 +8079,7 @@
7658 8079
         "C9F5C24F-D781-4581-8EBA-9E45B04F04F8",
7659 8080
         "888D6DF2-6108-4858-A7EC-B15B665C3F26",
7660 8081
         "19B75EC5-28E6-409A-93B9-E87CE8E1FBE6",
8082
+        "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7661 8083
         "B65EFCBA-EA4D-4EA6-AAF8-00205A474251",
7662 8084
         "EAEDEC6F-A840-41DF-A693-FA13AF8A5F9B",
7663 8085
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",

+ 413
- 26
db/文明创办.pdma.json Целия файл

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.2.0",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2022-12-26 22:19:40",
7
+  "updatedTime": "2022-12-28 08:28:08",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -3608,7 +3608,7 @@
3608 3608
         },
3609 3609
         {
3610 3610
           "defKey": "org_id",
3611
-          "defName": "当前处理单位",
3611
+          "defName": "责任单位",
3612 3612
           "comment": "",
3613 3613
           "type": "",
3614 3614
           "len": "",
@@ -4352,23 +4352,6 @@
4352 4352
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
4353 4353
           "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
4354 4354
         },
4355
-        {
4356
-          "defKey": "org_id",
4357
-          "defName": "处理机构",
4358
-          "comment": "",
4359
-          "type": "",
4360
-          "len": "",
4361
-          "scale": "",
4362
-          "primaryKey": false,
4363
-          "notNull": false,
4364
-          "autoIncrement": false,
4365
-          "defaultValue": "",
4366
-          "hideInGraph": false,
4367
-          "refDict": "",
4368
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4369
-          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4370
-          "uiHint": ""
4371
-        },
4372 4355
         {
4373 4356
           "defKey": "next_org",
4374 4357
           "defName": "指定机构",
@@ -4455,21 +4438,21 @@
4455 4438
           "id": "98A22AE6-A570-4E5A-B1CE-7F036B692110"
4456 4439
         },
4457 4440
         {
4458
-          "defKey": "status",
4459
-          "defName": "状态",
4441
+          "defKey": "org_id",
4442
+          "defName": "处理机构",
4460 4443
           "comment": "",
4461
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4462 4444
           "type": "",
4463 4445
           "len": "",
4464 4446
           "scale": "",
4465 4447
           "primaryKey": false,
4466 4448
           "notNull": false,
4467 4449
           "autoIncrement": false,
4468
-          "defaultValue": "1",
4469
-          "hideInGraph": true,
4450
+          "defaultValue": "",
4451
+          "hideInGraph": false,
4470 4452
           "refDict": "",
4471
-          "uiHint": "",
4472
-          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4453
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4454
+          "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
4455
+          "uiHint": ""
4473 4456
         },
4474 4457
         {
4475 4458
           "defKey": "create_user",
@@ -4521,6 +4504,23 @@
4521 4504
           "refDict": "",
4522 4505
           "uiHint": "",
4523 4506
           "id": "DC8BABA9-B796-462E-A242-C92E3BF071C8"
4507
+        },
4508
+        {
4509
+          "defKey": "status",
4510
+          "defName": "状态",
4511
+          "comment": "",
4512
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4513
+          "type": "",
4514
+          "len": "",
4515
+          "scale": "",
4516
+          "primaryKey": false,
4517
+          "notNull": false,
4518
+          "autoIncrement": false,
4519
+          "defaultValue": "1",
4520
+          "hideInGraph": true,
4521
+          "refDict": "",
4522
+          "uiHint": "",
4523
+          "id": "7FC503B3-A4AE-4167-81D1-1DDB7F11E9AB"
4524 4524
         }
4525 4525
       ],
4526 4526
       "correlations": [],
@@ -7276,6 +7276,392 @@
7276 7276
       ],
7277 7277
       "correlations": [],
7278 7278
       "indexes": []
7279
+    },
7280
+    {
7281
+      "id": "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7282
+      "env": {
7283
+        "base": {
7284
+          "nameSpace": "com.example.civilizedcity",
7285
+          "codeRoot": "TaIssueApply"
7286
+        },
7287
+        "template": {
7288
+          "JavaMybatisPlus": {
7289
+            "Controller": {
7290
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
7291
+              "enable": true
7292
+            },
7293
+            "Service": {
7294
+              "suffix": "service/{{=it.codeRoot}}Service.java",
7295
+              "enable": true
7296
+            },
7297
+            "ServiceImpl": {
7298
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
7299
+              "enable": true
7300
+            },
7301
+            "Mapper": {
7302
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
7303
+              "enable": true
7304
+            },
7305
+            "Mapper.xml": {
7306
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
7307
+              "enable": true
7308
+            },
7309
+            "Entity": {
7310
+              "suffix": "entity/{{=it.codeRoot}}.java",
7311
+              "enable": true
7312
+            }
7313
+          }
7314
+        },
7315
+        "custom": {}
7316
+      },
7317
+      "defKey": "ta_issue_apply",
7318
+      "defName": "问题处理申请",
7319
+      "comment": "",
7320
+      "properties": {},
7321
+      "nameTemplate": "{defKey}[{defName}]",
7322
+      "notes": {},
7323
+      "headers": [
7324
+        {
7325
+          "refKey": "hideInGraph",
7326
+          "hideInGraph": true
7327
+        },
7328
+        {
7329
+          "refKey": "defKey",
7330
+          "hideInGraph": false
7331
+        },
7332
+        {
7333
+          "refKey": "defName",
7334
+          "hideInGraph": false
7335
+        },
7336
+        {
7337
+          "refKey": "primaryKey",
7338
+          "hideInGraph": false
7339
+        },
7340
+        {
7341
+          "refKey": "notNull",
7342
+          "hideInGraph": true
7343
+        },
7344
+        {
7345
+          "refKey": "autoIncrement",
7346
+          "hideInGraph": true
7347
+        },
7348
+        {
7349
+          "refKey": "domain",
7350
+          "hideInGraph": true
7351
+        },
7352
+        {
7353
+          "refKey": "type",
7354
+          "hideInGraph": false
7355
+        },
7356
+        {
7357
+          "refKey": "len",
7358
+          "hideInGraph": false
7359
+        },
7360
+        {
7361
+          "refKey": "scale",
7362
+          "hideInGraph": false
7363
+        },
7364
+        {
7365
+          "refKey": "comment",
7366
+          "hideInGraph": true
7367
+        },
7368
+        {
7369
+          "refKey": "refDict",
7370
+          "hideInGraph": true
7371
+        },
7372
+        {
7373
+          "refKey": "defaultValue",
7374
+          "hideInGraph": true
7375
+        },
7376
+        {
7377
+          "refKey": "isStandard",
7378
+          "hideInGraph": false
7379
+        },
7380
+        {
7381
+          "refKey": "uiHint",
7382
+          "hideInGraph": true
7383
+        },
7384
+        {
7385
+          "refKey": "extProps",
7386
+          "hideInGraph": true
7387
+        }
7388
+      ],
7389
+      "fields": [
7390
+        {
7391
+          "defKey": "apply_id",
7392
+          "defName": "申请ID",
7393
+          "comment": "",
7394
+          "type": "",
7395
+          "len": "",
7396
+          "scale": "",
7397
+          "primaryKey": true,
7398
+          "notNull": true,
7399
+          "autoIncrement": true,
7400
+          "defaultValue": "",
7401
+          "hideInGraph": true,
7402
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7403
+          "refDict": "",
7404
+          "uiHint": "",
7405
+          "id": "9E9FC486-B4BD-4D23-BE5A-B37897E18C0D"
7406
+        },
7407
+        {
7408
+          "defKey": "issue_id",
7409
+          "defName": "问题ID",
7410
+          "comment": "",
7411
+          "type": "",
7412
+          "len": "",
7413
+          "scale": "",
7414
+          "primaryKey": false,
7415
+          "notNull": false,
7416
+          "autoIncrement": false,
7417
+          "defaultValue": "",
7418
+          "hideInGraph": false,
7419
+          "refDict": "",
7420
+          "extProps": {},
7421
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7422
+          "id": "A360A69A-AACF-4AEC-8E2B-3B0F59C656AD"
7423
+        },
7424
+        {
7425
+          "defKey": "apply_type",
7426
+          "defName": "申请类型",
7427
+          "comment": "",
7428
+          "type": "",
7429
+          "len": "",
7430
+          "scale": "",
7431
+          "primaryKey": false,
7432
+          "notNull": false,
7433
+          "autoIncrement": false,
7434
+          "defaultValue": "",
7435
+          "hideInGraph": false,
7436
+          "refDict": "",
7437
+          "extProps": {},
7438
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
7439
+          "id": "096988D2-CAC7-4E30-BBCE-5824847A4131"
7440
+        },
7441
+        {
7442
+          "defKey": "content",
7443
+          "defName": "申请内容",
7444
+          "comment": "",
7445
+          "type": "",
7446
+          "len": "",
7447
+          "scale": "",
7448
+          "primaryKey": false,
7449
+          "notNull": false,
7450
+          "autoIncrement": false,
7451
+          "defaultValue": "",
7452
+          "hideInGraph": false,
7453
+          "refDict": "",
7454
+          "extProps": {},
7455
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7456
+          "id": "3E7DAA2F-E366-43C6-9E96-12444F90EFFE"
7457
+        },
7458
+        {
7459
+          "defKey": "remark",
7460
+          "defName": "申请理由",
7461
+          "comment": "",
7462
+          "type": "",
7463
+          "len": "",
7464
+          "scale": "",
7465
+          "primaryKey": false,
7466
+          "notNull": false,
7467
+          "autoIncrement": false,
7468
+          "defaultValue": "",
7469
+          "hideInGraph": false,
7470
+          "refDict": "",
7471
+          "extProps": {},
7472
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7473
+          "id": "E6EC1EBE-A5D1-4B81-B445-4A390BEBB8B4"
7474
+        },
7475
+        {
7476
+          "defKey": "verify_status",
7477
+          "defName": "审批结果",
7478
+          "comment": "",
7479
+          "type": "",
7480
+          "len": "",
7481
+          "scale": "",
7482
+          "primaryKey": false,
7483
+          "notNull": false,
7484
+          "autoIncrement": false,
7485
+          "defaultValue": "",
7486
+          "hideInGraph": false,
7487
+          "refDict": "",
7488
+          "extProps": {},
7489
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7490
+          "id": "18A5C4E3-563C-46B6-A12D-FDB002AA0480"
7491
+        },
7492
+        {
7493
+          "defKey": "verify_desc",
7494
+          "defName": "审批说明",
7495
+          "comment": "",
7496
+          "type": "",
7497
+          "len": "",
7498
+          "scale": "",
7499
+          "primaryKey": false,
7500
+          "notNull": false,
7501
+          "autoIncrement": false,
7502
+          "defaultValue": "",
7503
+          "hideInGraph": false,
7504
+          "refDict": "",
7505
+          "extProps": {},
7506
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7507
+          "id": "2A0985FE-1246-4339-9C9E-7E03FF53B3F2"
7508
+        },
7509
+        {
7510
+          "defKey": "verify_org",
7511
+          "defName": "审批机构",
7512
+          "comment": "",
7513
+          "type": "",
7514
+          "len": "",
7515
+          "scale": "",
7516
+          "primaryKey": false,
7517
+          "notNull": false,
7518
+          "autoIncrement": false,
7519
+          "defaultValue": "",
7520
+          "hideInGraph": false,
7521
+          "refDict": "",
7522
+          "extProps": {},
7523
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7524
+          "id": "D4975D51-9F16-4432-AA26-8306223315FC"
7525
+        },
7526
+        {
7527
+          "defKey": "verify_user",
7528
+          "defName": "审批人",
7529
+          "comment": "",
7530
+          "type": "",
7531
+          "len": "",
7532
+          "scale": "",
7533
+          "primaryKey": false,
7534
+          "notNull": false,
7535
+          "autoIncrement": false,
7536
+          "defaultValue": "",
7537
+          "hideInGraph": false,
7538
+          "refDict": "",
7539
+          "extProps": {},
7540
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7541
+          "id": "464C7108-433F-42E8-BBE6-BA48AC65FAE6"
7542
+        },
7543
+        {
7544
+          "defKey": "verify_user_name",
7545
+          "defName": "审批人名称",
7546
+          "comment": "",
7547
+          "type": "",
7548
+          "len": "",
7549
+          "scale": "",
7550
+          "primaryKey": false,
7551
+          "notNull": false,
7552
+          "autoIncrement": false,
7553
+          "defaultValue": "",
7554
+          "hideInGraph": false,
7555
+          "refDict": "",
7556
+          "extProps": {},
7557
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7558
+          "id": "0F8DF251-A5D0-48CC-AAD8-D06516BF72DC"
7559
+        },
7560
+        {
7561
+          "defKey": "verify_date",
7562
+          "defName": "审批日期",
7563
+          "comment": "",
7564
+          "type": "",
7565
+          "len": "",
7566
+          "scale": "",
7567
+          "primaryKey": false,
7568
+          "notNull": false,
7569
+          "autoIncrement": false,
7570
+          "defaultValue": "",
7571
+          "hideInGraph": false,
7572
+          "refDict": "",
7573
+          "extProps": {},
7574
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
7575
+          "id": "3B95BAE1-E231-4E2D-8451-24B6B2DE82AA"
7576
+        },
7577
+        {
7578
+          "defKey": "status",
7579
+          "defName": "状态",
7580
+          "comment": "",
7581
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
7582
+          "type": "",
7583
+          "len": "",
7584
+          "scale": "",
7585
+          "primaryKey": false,
7586
+          "notNull": false,
7587
+          "autoIncrement": false,
7588
+          "defaultValue": "1",
7589
+          "hideInGraph": true,
7590
+          "refDict": "",
7591
+          "uiHint": "",
7592
+          "id": "2A004F15-3F14-4246-A0CF-40FAEC550488"
7593
+        },
7594
+        {
7595
+          "defKey": "org_id",
7596
+          "defName": "申请机构",
7597
+          "comment": "",
7598
+          "type": "",
7599
+          "len": "",
7600
+          "scale": "",
7601
+          "primaryKey": false,
7602
+          "notNull": false,
7603
+          "autoIncrement": false,
7604
+          "defaultValue": "",
7605
+          "hideInGraph": false,
7606
+          "refDict": "",
7607
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7608
+          "id": "6E82502D-6F40-4D1E-A6D8-31729A80FA26",
7609
+          "uiHint": ""
7610
+        },
7611
+        {
7612
+          "defKey": "create_user",
7613
+          "defName": "申请人",
7614
+          "comment": "",
7615
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
7616
+          "type": "",
7617
+          "len": "",
7618
+          "scale": "",
7619
+          "primaryKey": false,
7620
+          "notNull": false,
7621
+          "autoIncrement": false,
7622
+          "defaultValue": "",
7623
+          "hideInGraph": true,
7624
+          "refDict": "",
7625
+          "uiHint": "",
7626
+          "id": "54384CCC-1DCE-4963-A2E0-2688174E6CE7"
7627
+        },
7628
+        {
7629
+          "defKey": "create_user_name",
7630
+          "defName": "申请人名称",
7631
+          "comment": "",
7632
+          "type": "",
7633
+          "len": "",
7634
+          "scale": "",
7635
+          "primaryKey": false,
7636
+          "notNull": false,
7637
+          "autoIncrement": false,
7638
+          "defaultValue": "",
7639
+          "hideInGraph": false,
7640
+          "refDict": "",
7641
+          "extProps": {},
7642
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7643
+          "id": "3F282C6B-0092-44D4-AE16-098BFE56C890"
7644
+        },
7645
+        {
7646
+          "defKey": "create_date",
7647
+          "defName": "申请时间",
7648
+          "comment": "",
7649
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
7650
+          "type": "",
7651
+          "len": "",
7652
+          "scale": "",
7653
+          "primaryKey": false,
7654
+          "notNull": false,
7655
+          "autoIncrement": false,
7656
+          "defaultValue": "CURRENT_TIMESTAMP",
7657
+          "hideInGraph": true,
7658
+          "refDict": "",
7659
+          "uiHint": "",
7660
+          "id": "24B04823-5C80-4F84-8970-2C71C0883847"
7661
+        }
7662
+      ],
7663
+      "correlations": [],
7664
+      "indexes": []
7279 7665
     }
7280 7666
   ],
7281 7667
   "views": [],
@@ -7693,6 +8079,7 @@
7693 8079
         "C9F5C24F-D781-4581-8EBA-9E45B04F04F8",
7694 8080
         "888D6DF2-6108-4858-A7EC-B15B665C3F26",
7695 8081
         "19B75EC5-28E6-409A-93B9-E87CE8E1FBE6",
8082
+        "046D0984-CCB9-4996-9DEB-2F6D6705A1B5",
7696 8083
         "B65EFCBA-EA4D-4EA6-AAF8-00205A474251",
7697 8084
         "EAEDEC6F-A840-41DF-A693-FA13AF8A5F9B",
7698 8085
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",

+ 128
- 0
src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java Целия файл

@@ -0,0 +1,128 @@
1
+package com.example.civilizedcity.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.example.civilizedcity.common.BaseController;
7
+import com.example.civilizedcity.common.Constants;
8
+import com.example.civilizedcity.common.ResponseBean;
9
+
10
+import java.time.LocalDateTime;
11
+import java.util.List;
12
+
13
+import com.example.civilizedcity.common.StringUtils;
14
+import com.example.civilizedcity.entity.SysUser;
15
+import io.swagger.annotations.Api;
16
+import io.swagger.annotations.ApiOperation;
17
+import io.swagger.annotations.ApiParam;
18
+import org.springframework.beans.factory.annotation.Autowired;
19
+import org.springframework.web.bind.annotation.*;
20
+import com.example.civilizedcity.entity.TaIssueApply;
21
+import com.example.civilizedcity.service.TaIssueApplyService;
22
+
23
+/**
24
+ * 问题处理申请;(ta_issue_apply)表控制层
25
+ *
26
+ * @author : http://njyunzhi.com
27
+ * @date : 2022-12-27
28
+ */
29
+@Api(tags = "问题处理申请对象功能接口")
30
+@RestController
31
+@RequestMapping("/")
32
+public class TaIssueApplyController extends BaseController {
33
+
34
+    @Autowired
35
+    private TaIssueApplyService taIssueApplyService;
36
+
37
+    /**
38
+     * 通过ID查询单条数据
39
+     *
40
+     * @param applyId 主键
41
+     * @return 实例对象
42
+     */
43
+    @ApiOperation("通过ID查询单条数据")
44
+    @GetMapping("/taIssueApply/{id}")
45
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
46
+        return ResponseBean.success(taIssueApplyService.getById(id));
47
+    }
48
+
49
+    /**
50
+     * 分页查询
51
+     *
52
+     * @param pageNum  当前页码
53
+     * @param pageSize 每页条数
54
+     * @return 查询结果
55
+     */
56
+    @ApiOperation("分页查询")
57
+    @GetMapping("/taIssueApply")
58
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
59
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
60
+                             @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
61
+
62
+        SysUser sysUser = currentUser();
63
+
64
+        IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
65
+        QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
66
+        queryWrapper.eq(StringUtils.isEmpty(applyType),"apply_type", applyType);
67
+        queryWrapper.nested(q -> q.eq("org_id", sysUser.getOrgId()).or().eq("verify_org", sysUser.getOrgId()));
68
+        queryWrapper.orderByDesc("create_date");
69
+        IPage<TaIssueApply> result = taIssueApplyService.page(pg, queryWrapper);
70
+
71
+        return ResponseBean.success(result);
72
+    }
73
+
74
+    /**
75
+     * 申请流程
76
+     *
77
+     * @param taIssueApply 实例对象
78
+     * @return 实例对象
79
+     */
80
+    @ApiOperation("申请流程")
81
+    @PostMapping("/taIssueApply")
82
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaIssueApply taIssueApply) throws Exception {
83
+        taIssueApplyService.createNewApply(taIssueApply, currentUser());
84
+        return ResponseBean.success(taIssueApply);
85
+    }
86
+
87
+    /**
88
+     * 审批流程
89
+     *
90
+     * @param taIssueApply 实例对象
91
+     * @return 实例对象
92
+     */
93
+    @ApiOperation("审批流程")
94
+    @PutMapping("/taIssueApply/{id}")
95
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaIssueApply taIssueApply,
96
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
97
+
98
+        TaIssueApply origin = taIssueApplyService.getById(id);
99
+        if (null == origin || Constants.STATUS_DELETE == origin.getStatus()) {
100
+            return ResponseBean.error("未找到申请数据");
101
+        }
102
+
103
+        SysUser sysUser = currentUser();
104
+
105
+        origin.setVerifyStatus(taIssueApply.getVerifyStatus());
106
+        origin.setVerifyDesc(taIssueApply.getVerifyDesc());
107
+        origin.setVerifyOrg(sysUser.getOrgId());
108
+        origin.setVerifyUser(sysUser.getUserId());
109
+        origin.setVerifyUserName(sysUser.getName());
110
+        origin.setVerifyDate(LocalDateTime.now());
111
+
112
+        taIssueApplyService.updateById(origin);
113
+        return ResponseBean.success(origin);
114
+    }
115
+
116
+    /**
117
+     * 通过主键删除数据
118
+     *
119
+     * @param applyId 主键
120
+     * @return 是否成功
121
+     */
122
+    @ApiOperation("通过主键删除数据")
123
+    @DeleteMapping("/taIssueApply/{id}")
124
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
125
+        taIssueApplyService.removeLogicById(id);
126
+        return ResponseBean.success("success");
127
+    }
128
+}

+ 7
- 4
src/main/java/com/example/civilizedcity/controller/TaIssueController.java Целия файл

@@ -65,11 +65,14 @@ public class TaIssueController extends BaseController {
65 65
     @GetMapping("/taIssue")
66 66
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
67 67
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
68
-        
68
+
69
+        SysUser sysUser = currentUser();
70
+        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
71
+
69 72
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
70 73
         // QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
71 74
         // queryWrapper.orderByDesc("create_date");
72
-        IPage<TaIssue> result = taIssueService.page(pg);
75
+        IPage<TaIssue> result = taIssueService.getPageBy(pg, orgId);
73 76
         
74 77
         return ResponseBean.success(result);
75 78
     }
@@ -86,10 +89,10 @@ public class TaIssueController extends BaseController {
86 89
         SysUser user = currentUser();
87 90
 
88 91
         taIssue.setIssueId(null);
92
+        taIssue.setOrgId(null); // 暂时没有责任单位
89 93
         taIssue.setProcessNode(Constants.PROCESS_START);
90 94
         taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
91 95
         taIssue.setProcessNum(1);
92
-        taIssue.setOrgId(user.getOrgId());
93 96
         taIssue.setSourceType(Constants.ISSUE_SOURCE_INSPECTOR);
94 97
         taIssue.setStatus(Constants.STATUS_NORMAL);
95 98
         taIssue.setCreatePerson(user.getUserId());
@@ -111,7 +114,7 @@ public class TaIssueController extends BaseController {
111 114
 
112 115
         taAttachService.saveBatch(attachList);
113 116
 
114
-        // 保存处理节点
117
+        // 流程开始
115 118
         TaIssueProcess process = new TaIssueProcess();
116 119
         process.setIssueId(taIssue.getIssueId());
117 120
         process.setOrgId(user.getOrgId());

+ 0
- 1
src/main/java/com/example/civilizedcity/controller/TaIssueProcessController.java Целия файл

@@ -104,7 +104,6 @@ public class TaIssueProcessController extends BaseController {
104 104
     private void updateIssue(TaIssue taIssue, TaIssueProcess taIssueProcess) {
105 105
         taIssue.setProcessNode(taIssueProcess.getProcessNode());
106 106
         taIssue.setProcessStatus(taIssueProcess.getProcessNode());
107
-        taIssue.setOrgId(taIssueProcess.getOrgId());
108 107
         taIssueService.updateById(taIssue);
109 108
     }
110 109
     

+ 2
- 2
src/main/java/com/example/civilizedcity/entity/TaIssue.java Целия файл

@@ -63,8 +63,8 @@ public class TaIssue implements Serializable,Cloneable{
63 63
       /** 交办次数 */
64 64
       @ApiModelProperty(name = "交办次数",notes = "")
65 65
       private Integer processNum ;
66
-      /** 当前处理单位 */
67
-      @ApiModelProperty(name = "当前处理单位",notes = "")
66
+      /** 责任单位 */
67
+      @ApiModelProperty(name = "责任单位",notes = "")
68 68
       private String orgId ;
69 69
       /** 来源类型;feedback市民上报,check模拟测评 */
70 70
       @ApiModelProperty(name = "来源类型",notes = "feedback市民上报,check模拟测评")

+ 75
- 0
src/main/java/com/example/civilizedcity/entity/TaIssueApply.java Целия файл

@@ -0,0 +1,75 @@
1
+package com.example.civilizedcity.entity;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import com.baomidou.mybatisplus.annotation.IdType;
6
+import com.baomidou.mybatisplus.annotation.TableName;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import java.io.Serializable;
9
+import java.time.LocalDateTime;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+ /**
15
+ * 问题处理申请;
16
+ * @author : http://www.chiner.pro
17
+ * @date : 2022-12-27
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+@ApiModel(value = "问题处理申请",description = "")
23
+@TableName("ta_issue_apply")
24
+public class TaIssueApply implements Serializable,Cloneable{
25
+    /** 申请ID */
26
+    @ApiModelProperty(name = "申请ID",notes = "")
27
+    @TableId(value = "apply_id", type = IdType.AUTO)
28
+    private Integer applyId ;
29
+    /** 问题ID */
30
+    @ApiModelProperty(name = "问题ID",notes = "")
31
+    private Integer issueId ;
32
+    /** 申请类型 */
33
+    @ApiModelProperty(name = "申请类型",notes = "")
34
+    private String applyType ;
35
+    /** 申请内容 */
36
+    @ApiModelProperty(name = "申请内容",notes = "")
37
+    private String content ;
38
+    /** 申请理由 */
39
+    @ApiModelProperty(name = "申请理由",notes = "")
40
+    private String remark ;
41
+    /** 审批结果 */
42
+    @ApiModelProperty(name = "审批结果",notes = "")
43
+    private String verifyStatus ;
44
+    /** 审批说明 */
45
+    @ApiModelProperty(name = "审批说明",notes = "")
46
+    private String verifyDesc ;
47
+    /** 审批机构 */
48
+    @ApiModelProperty(name = "审批机构",notes = "")
49
+    private String verifyOrg ;
50
+    /** 审批人 */
51
+    @ApiModelProperty(name = "审批人",notes = "")
52
+    private String verifyUser ;
53
+    /** 审批人名称 */
54
+    @ApiModelProperty(name = "审批人名称",notes = "")
55
+    private String verifyUserName ;
56
+    /** 审批日期 */
57
+    @ApiModelProperty(name = "审批日期",notes = "")
58
+    private LocalDateTime verifyDate ;
59
+    /** 状态 */
60
+    @ApiModelProperty(name = "状态",notes = "")
61
+    private Integer status ;
62
+    /** 申请机构 */
63
+    @ApiModelProperty(name = "申请机构",notes = "")
64
+    private String orgId ;
65
+    /** 申请人 */
66
+    @ApiModelProperty(name = "申请人",notes = "")
67
+    private String createUser ;
68
+    /** 申请人名称 */
69
+    @ApiModelProperty(name = "申请人名称",notes = "")
70
+    private String createUserName ;
71
+    /** 申请时间 */
72
+    @ApiModelProperty(name = "申请时间",notes = "")
73
+    private LocalDateTime createDate ;
74
+
75
+}

+ 16
- 0
src/main/java/com/example/civilizedcity/mapper/TaIssueApplyMapper.java Целия файл

@@ -0,0 +1,16 @@
1
+package com.example.civilizedcity.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import org.apache.ibatis.annotations.Mapper;
5
+import org.apache.ibatis.annotations.Param;
6
+import com.example.civilizedcity.entity.TaIssueApply;
7
+
8
+ /**
9
+ * 问题处理申请;(ta_issue_apply)表数据库访问层
10
+ * @author : http://njyunzhi.com
11
+ * @date : 2022-12-27
12
+ */
13
+@Mapper
14
+public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
15
+    
16
+}

+ 6
- 2
src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java Целия файл

@@ -1,6 +1,7 @@
1 1
 package com.example.civilizedcity.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import org.apache.ibatis.annotations.Mapper;
5 6
 import org.apache.ibatis.annotations.Param;
6 7
 import com.example.civilizedcity.entity.TaIssue;
@@ -12,5 +13,8 @@ import com.example.civilizedcity.entity.TaIssue;
12 13
  */
13 14
 @Mapper
14 15
 public interface TaIssueMapper  extends BaseMapper<TaIssue>{
15
-    
16
-}
16
+
17
+     IPage<TaIssue> getPageBy(IPage<TaIssue> pg, @Param("orgId") String orgId);
18
+
19
+     IPage<TaIssue> getAllBy(IPage<TaIssue> pg);
20
+ }

+ 15
- 0
src/main/java/com/example/civilizedcity/service/TaIssueApplyService.java Целия файл

@@ -0,0 +1,15 @@
1
+package com.example.civilizedcity.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.example.civilizedcity.entity.SysUser;
5
+import com.example.civilizedcity.entity.TaIssueApply;
6
+
7
+ /**
8
+ * 问题处理申请;(ta_issue_apply)表服务接口
9
+ * @author : http://njyunzhi.com
10
+ * @date : 2022-12-27
11
+ */
12
+public interface TaIssueApplyService extends IBaseService<TaIssueApply> {
13
+
14
+     void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception;
15
+ }

+ 4
- 2
src/main/java/com/example/civilizedcity/service/TaIssueService.java Целия файл

@@ -1,5 +1,6 @@
1 1
 package com.example.civilizedcity.service;
2 2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 4
 import com.baomidou.mybatisplus.extension.service.IService;
4 5
 import com.example.civilizedcity.entity.TaIssue;
5 6
 
@@ -9,5 +10,6 @@ import com.example.civilizedcity.entity.TaIssue;
9 10
  * @date : 2022-12-12
10 11
  */
11 12
 public interface TaIssueService extends IBaseService<TaIssue> {
12
-    
13
-}
13
+
14
+     IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId);
15
+ }

+ 37
- 0
src/main/java/com/example/civilizedcity/service/impl/TaIssueApplyServiceImpl.java Целия файл

@@ -0,0 +1,37 @@
1
+package com.example.civilizedcity.service.impl;
2
+
3
+import com.example.civilizedcity.common.ResponseBean;
4
+import com.example.civilizedcity.entity.SysUser;
5
+import org.springframework.beans.factory.annotation.Autowired;
6
+import org.springframework.stereotype.Service;
7
+import com.example.civilizedcity.entity.TaIssueApply;
8
+import com.example.civilizedcity.mapper.TaIssueApplyMapper;
9
+import com.example.civilizedcity.service.TaIssueApplyService;
10
+
11
+import java.time.LocalDateTime;
12
+
13
+/**
14
+ * 问题处理申请;(ta_issue_apply)表服务实现类
15
+ *
16
+ * @author : http://www.chiner.pro
17
+ * @date : 2022-12-27
18
+ */
19
+@Service
20
+public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper, TaIssueApply> implements TaIssueApplyService {
21
+
22
+    @Override
23
+    public void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception {
24
+
25
+        if (null == taIssueApply.getIssueId()) {
26
+            throw new Exception("校验问题单出错");
27
+        }
28
+
29
+        taIssueApply.setApplyId(null);
30
+        taIssueApply.setCreateUser(sysUser.getUserId());
31
+        taIssueApply.setCreateUserName(sysUser.getName());
32
+        taIssueApply.setOrgId(sysUser.getOrgId());
33
+        taIssueApply.setCreateDate(LocalDateTime.now());
34
+
35
+        save(taIssueApply);
36
+    }
37
+}

+ 14
- 2
src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java Целия файл

@@ -1,16 +1,28 @@
1 1
 package com.example.civilizedcity.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 4
 import org.springframework.beans.factory.annotation.Autowired;
4 5
 import org.springframework.stereotype.Service;
5 6
 import com.example.civilizedcity.entity.TaIssue;
6 7
 import com.example.civilizedcity.mapper.TaIssueMapper;
7 8
 import com.example.civilizedcity.service.TaIssueService;
8
- /**
9
+
10
+/**
9 11
  * 问题表;(ta_issue)表服务实现类
12
+ *
10 13
  * @author : http://www.chiner.pro
11 14
  * @date : 2022-12-12
12 15
  */
13 16
 @Service
14 17
 public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue> implements TaIssueService {
15
-    
18
+
19
+    @Override
20
+    public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
21
+        if (null == orgId) {
22
+            return baseMapper.getAllBy(pg);
23
+        }
24
+
25
+
26
+        return baseMapper.getPageBy(pg, orgId);
27
+    }
16 28
 }

+ 6
- 0
src/main/resources/mapper/TaIssueApplyMapper.xml Целия файл

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

+ 30
- 1
src/main/resources/mapper/TaIssueMapper.xml Целия файл

@@ -2,5 +2,34 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 
4 4
 <mapper namespace="com.example.civilizedcity.mapper.TaIssueMapper">
5
-    
5
+
6
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
7
+        SELECT
8
+            *
9
+        FROM
10
+            ta_issue t
11
+        WHERE
12
+            EXISTS (
13
+                    SELECT
14
+                        *
15
+                    FROM
16
+                        ta_issue_process s ON s.issue_id = t.issue_id
17
+                    WHERE
18
+                    ( s.org_id = #{orgId} OR s.next_org = #{orgId} )
19
+                        AND s.`status` &gt; -1
20
+                )
21
+          AND t.`status` &gt; -1
22
+        ORDER BY
23
+            t.create_date DESC
24
+    </select>
25
+    <select id="getAllBy" resultType="com.example.civilizedcity.entity.TaIssue">
26
+        SELECT
27
+            *
28
+        FROM
29
+            ta_issue t
30
+        WHERE
31
+            t.`status` &gt; -1
32
+        ORDER BY
33
+            t.create_date DESC
34
+    </select>
6 35
 </mapper>