feats

db/.back_文明创办/文明创办-backup-202318194130.pdma.json → db/.back_文明创办/文明创办-backup-202324212508.pdma.json

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

db/文明创办.pdma.json

   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-3 15:17:53",
+  "updatedTime": "2023-2-4 21:25:08",
   "dbConns": [],
   "profile": {
     "default": {
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "31758145-9BDD-4A20-904B-E70372F394E1"
         },
+        {
+          "defKey": "sex",
+          "defName": "性别",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "18C56DEF-A828-486A-941B-A4167F5AB0BE"
+        },
+        {
+          "defKey": "age",
+          "defName": "年龄段",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 64,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "005ABCD0-A5E8-4F3B-87C9-3C90087A368F"
+        },
         {
           "defKey": "score",
           "defName": "得分",

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

         List<StatVo> result = tsStatDataService.statIssueType();
         return ResponseBean.success(result);
     }
+
+    @ApiOperation("点位分类统计")
+    @GetMapping("/stat/issue/loc")
+    public ResponseBean statLoc() throws Exception {
+        List<StatVo> result = tsStatDataService.statIssueLoc();
+        return ResponseBean.success(result);
+    }
 }

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

             }});
         }
 
-        int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
-        if (cnt >= taCheckItem.getNum()) {
-            return ResponseBean.success(new HashMap<String, Object>(){{
-                put("errorCode", 3);
-                put("message", "当前问卷已收齐, 无须作答");
-            }});
+        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+            int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
+            if (cnt >= taCheckItem.getNum()) {
+                return ResponseBean.success(new HashMap<String, Object>(){{
+                    put("errorCode", 3);
+                    put("message", "当前问卷已收齐, 无须作答");
+                }});
+            }
         }
 
         return ResponseBean.success(new HashMap<String, Object>(){{

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

     /** 定位 */
     @ApiModelProperty(name = "定位",notes = "")
     private String location ;
-    /** 定位描述 */
-    @ApiModelProperty(name = "定位描述",notes = "")
+    /** 定位描述 - 小区 */
+    @ApiModelProperty(name = "定位描述 - 小区",notes = "")
     private String addr ;
+     /** 性别 */
+     @ApiModelProperty(name = "性别",notes = "")
+     private String sex ;
+     /** 年龄段 */
+     @ApiModelProperty(name = "年龄段",notes = "")
+     private String age ;
     /** 得分 */
     @ApiModelProperty(name = "得分",notes = "")
     private Double score ;

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

                       @Param("userId") String userId,
                       @Param("processNode") String processNode,
                       @Param("processStatus") String processStatus);
+
+    List<StatVo> statIssueLoc();
 }

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

     List<StatVo> statIssueType();
 
     Map<String, Object> statAdminIndexBanner();
+
+    List<StatVo> statIssueLoc();
 }

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

 
         return result;
     }
+
+    @Override
+    public List<StatVo> statIssueLoc() {
+        return taIssueMapper.statIssueLoc();
+    }
 }

src/main/resources/mapper/TaIssueMapper.xml

         ORDER BY
             a.`value` DESC
     </select>
+    <select id="statIssueLoc" resultType="com.example.civilizedcity.vo.StatVo">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    t.`name`,
+                    ifnull( s.cnt, 0 ) AS `value`
+                FROM
+                    td_loc_type t
+                        LEFT JOIN (
+                        SELECT
+                            a.loc_id,
+                            count( 1 ) AS cnt
+                        FROM
+                            ta_issue a
+                        WHERE
+                            a.`status` > - 1
+                        GROUP BY
+                            a.loc_id
+                    ) s ON t.type_id = s.loc_id
+            ) m
+        ORDER BY
+            m.`value` DESC
+    </select>
 </mapper>