fangmingyue 1 year ago
parent
commit
09c481190c

db/.back_文明创办/文明创办-backup-2023330100554.pdma.json → db/.back_文明创办/文明创办-backup-2023518101923.pdma.json View File

@@ -2,9 +2,9 @@
2 2
   "name": "文明创办",
3 3
   "describe": "文明创办",
4 4
   "avatar": "",
5
-  "version": "4.1.4",
5
+  "version": "4.1.1",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2023-3-27 19:12:07",
7
+  "updatedTime": "2023-5-10 11:56:46",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -494,7 +494,8 @@
494 494
         "hideInGraph": true
495 495
       }
496 496
     ],
497
-    "modelType": "modalGroup"
497
+    "modelType": "modalGroup",
498
+    "menuWidth": "250px"
498 499
   },
499 500
   "entities": [
500 501
     {
@@ -4936,6 +4937,40 @@
4936 4937
           "domain": "",
4937 4938
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
4938 4939
         },
4940
+        {
4941
+          "defKey": "loc_num",
4942
+          "defName": "实地测评份数",
4943
+          "comment": "",
4944
+          "type": "",
4945
+          "len": "",
4946
+          "scale": "",
4947
+          "primaryKey": false,
4948
+          "notNull": false,
4949
+          "autoIncrement": false,
4950
+          "defaultValue": "",
4951
+          "hideInGraph": false,
4952
+          "refDict": "",
4953
+          "extProps": {},
4954
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4955
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
4956
+        },
4957
+        {
4958
+          "defKey": "survey_num",
4959
+          "defName": "调查问卷份数",
4960
+          "comment": "",
4961
+          "type": "",
4962
+          "len": "",
4963
+          "scale": "",
4964
+          "primaryKey": false,
4965
+          "notNull": false,
4966
+          "autoIncrement": false,
4967
+          "defaultValue": "",
4968
+          "hideInGraph": false,
4969
+          "refDict": "",
4970
+          "extProps": {},
4971
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4972
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
4973
+        },
4939 4974
         {
4940 4975
           "defKey": "status",
4941 4976
           "defName": "状态",

db/.back_文明创办/文明创办-backup-2023510115646.pdma.json → db/.back_文明创办/文明创办-backup-2023518112005.pdma.json View File

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.1.1",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2023-5-11 16:31:13",
7
+  "updatedTime": "2023-5-18 10:19:23",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -3930,23 +3930,6 @@
3930 3930
           "extProps": {},
3931 3931
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
3932 3932
           "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
3933
-        },
3934
-        {
3935
-          "defKey": "source_type2",
3936
-          "defName": "问题来源PC",
3937
-          "comment": "check 模拟测评  feedback 市民上报  inspector 督查员上报",
3938
-          "type": "",
3939
-          "len": "",
3940
-          "scale": "",
3941
-          "primaryKey": false,
3942
-          "notNull": false,
3943
-          "autoIncrement": false,
3944
-          "defaultValue": "",
3945
-          "hideInGraph": false,
3946
-          "refDict": "",
3947
-          "extProps": {},
3948
-          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
3949
-          "id": "42892AD2-FF8E-4D87-8705-14737E34AE9A"
3950 3933
         }
3951 3934
       ],
3952 3935
       "correlations": [],
@@ -5558,6 +5541,23 @@
5558 5541
           "refDict": "",
5559 5542
           "extProps": {},
5560 5543
           "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
5544
+        },
5545
+        {
5546
+          "defKey": "card_title",
5547
+          "defName": "卡片名称",
5548
+          "comment": "小程序端,新建定位时显示的名称",
5549
+          "type": "",
5550
+          "len": "",
5551
+          "scale": "",
5552
+          "primaryKey": false,
5553
+          "notNull": false,
5554
+          "autoIncrement": false,
5555
+          "defaultValue": "",
5556
+          "hideInGraph": false,
5557
+          "refDict": "",
5558
+          "extProps": {},
5559
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
5560
+          "id": "7ECA8243-FCF7-4539-A9AE-17E0DA920AD4"
5561 5561
         }
5562 5562
       ],
5563 5563
       "correlations": [],

db/.back_文明创办/文明创办-backup-2023415134743.pdma.json → db/.back_文明创办/文明创办-backup-2023518112034.pdma.json View File

@@ -2,9 +2,9 @@
2 2
   "name": "文明创办",
3 3
   "describe": "文明创办",
4 4
   "avatar": "",
5
-  "version": "4.1.4",
5
+  "version": "4.1.1",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2023-3-30 10:05:54",
7
+  "updatedTime": "2023-5-18 11:20:05",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -494,7 +494,8 @@
494 494
         "hideInGraph": true
495 495
       }
496 496
     ],
497
-    "modelType": "modalGroup"
497
+    "modelType": "modalGroup",
498
+    "menuWidth": "250px"
498 499
   },
499 500
   "entities": [
500 501
     {
@@ -4936,6 +4937,40 @@
4936 4937
           "domain": "",
4937 4938
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
4938 4939
         },
4940
+        {
4941
+          "defKey": "loc_num",
4942
+          "defName": "实地测评份数",
4943
+          "comment": "",
4944
+          "type": "",
4945
+          "len": "",
4946
+          "scale": "",
4947
+          "primaryKey": false,
4948
+          "notNull": false,
4949
+          "autoIncrement": false,
4950
+          "defaultValue": "",
4951
+          "hideInGraph": false,
4952
+          "refDict": "",
4953
+          "extProps": {},
4954
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4955
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
4956
+        },
4957
+        {
4958
+          "defKey": "survey_num",
4959
+          "defName": "调查问卷份数",
4960
+          "comment": "",
4961
+          "type": "",
4962
+          "len": "",
4963
+          "scale": "",
4964
+          "primaryKey": false,
4965
+          "notNull": false,
4966
+          "autoIncrement": false,
4967
+          "defaultValue": "",
4968
+          "hideInGraph": false,
4969
+          "refDict": "",
4970
+          "extProps": {},
4971
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
4972
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
4973
+        },
4939 4974
         {
4940 4975
           "defKey": "status",
4941 4976
           "defName": "状态",

+ 4
- 1
db/upgrade.1.1.sql View File

@@ -8,4 +8,7 @@ ALTER TABLE `sys_org`
8 8
 
9 9
 
10 10
 ALTER TABLE `ta_issue`
11
-ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;
11
+ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;
12
+
13
+ALTER TABLE `ta_check_answer`
14
+    ADD COLUMN `card_title` varchar(255) NULL COMMENT '卡片名称(小程序端,新建定位时显示的名称)' AFTER `user_name`;

+ 18
- 1
db/文明创办.pdma.json View File

@@ -4,7 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "4.1.1",
6 6
   "createdTime": "2022-12-12 09:36:12",
7
-  "updatedTime": "2023-5-10 11:56:46",
7
+  "updatedTime": "2023-5-18 11:20:34",
8 8
   "dbConns": [],
9 9
   "profile": {
10 10
     "default": {
@@ -7186,6 +7186,23 @@
7186 7186
           "refDict": "",
7187 7187
           "uiHint": "",
7188 7188
           "id": "A836C724-F5D9-4A45-A413-209B55DDA976"
7189
+        },
7190
+        {
7191
+          "defKey": "card_title",
7192
+          "defName": "卡片名称",
7193
+          "comment": "小程序端,新建定位时显示的名称",
7194
+          "type": "",
7195
+          "len": "",
7196
+          "scale": "",
7197
+          "primaryKey": false,
7198
+          "notNull": false,
7199
+          "autoIncrement": false,
7200
+          "defaultValue": "",
7201
+          "hideInGraph": false,
7202
+          "refDict": "",
7203
+          "extProps": {},
7204
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
7205
+          "id": "1CDF0BAA-5F46-498F-A791-FD71F33EB3D5"
7189 7206
         }
7190 7207
       ],
7191 7208
       "correlations": [],

+ 5
- 0
src/main/java/com/example/civilizedcity/entity/TaCheckAnswer.java View File

@@ -87,4 +87,9 @@ public class TaCheckAnswer implements Serializable,Cloneable{
87 87
      @TableField(exist = false)
88 88
      @ApiModelProperty(name = "点位名称",notes = "")
89 89
      private String typeName ;
90
+
91
+
92
+     /** 卡片名称 */
93
+     @ApiModelProperty(name = "卡片名称",notes = "")
94
+     private String cardTitle ;
90 95
 }

+ 1
- 0
src/main/java/com/example/civilizedcity/entity/TaCheckItem.java View File

@@ -94,4 +94,5 @@ public class TaCheckItem implements Serializable, Cloneable {
94 94
     @TableField(exist = false)
95 95
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
96 96
     private Integer answerNum;
97
+
97 98
 }