feats

db/.back_文明创办/文明创办-backup-20221213164550.pdma.json → db/.back_文明创办/文明创办-backup-20221215110455.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-13 16:43:12",
+  "updatedTime": "2022-12-15 11:04:32",
   "dbConns": [],
   "profile": {
     "default": {
@@ -237,7 +237,7 @@
         "ServiceImpl": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkVarNameU = \"UndefinedId\";\n    var pkFieldKey = \"UNDEFINED\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkFieldKey = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkVarNameU = it.func.camel(field.defKey,true);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    var mapperName = beanVarName+'Mapper';\n    \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\n\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl extends BaseServiceImpl<{{=beanClass}}Mapper, {{=beanClass}}> implements {{=serviceClass}} {\n    $blankline\n}",
         "Mapper": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.mapper;\n$blankline\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://njyunzhi.com\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper  extends BaseMapper<{{=beanClass}}>{\n    $blankline\n}",
         "Mapper.xml": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    var pkField = \"UNDEFINED_ID\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkField = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n$blankline\n\n<mapper namespace=\"{{=pkgName}}.mapper.{{=beanClass}}Mapper\">\n    $blankline\n</mapper>\n\n",
-        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.INPUT)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
+        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.ASSIGN_UUID)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
       },
       {
         "applyFor": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E",
@@ -1116,7 +1116,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "322EC759-BCCE-42E6-A1F1-837739AA6278"
         },
         {
@@ -4351,6 +4351,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "642B925C-403B-496D-BF93-5D4BE72A883B"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "97EC5064-0B0E-4AD5-BE3A-535AD8913AD1"
+        },
         {
           "defKey": "process_node",
           "defName": "流程节点",
@@ -4629,11 +4646,11 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "org_id",
-          "defName": "机构ID",
-          "comment": "",
-          "type": "",
-          "len": "",
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -4641,9 +4658,9 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "F3C73F9F-2277-498F-A067-9D44F19125B1",
-          "uiHint": ""
+          "extProps": {},
+          "domain": "",
+          "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
         {
           "defKey": "status",
@@ -4924,7 +4941,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item",
-      "defName": "测评点位",
+      "defName": "测评项目",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5029,6 +5046,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "7FF8CD4A-8CA9-4C24-A20E-F5D1C1425E33"
         },
+        {
+          "defKey": "item_type",
+          "defName": "项目类型",
+          "comment": "loc点位,survey问卷调查",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -5047,7 +5081,7 @@
           "id": "2ED82F0E-CA82-4D70-854E-9C74BF5D3F1E"
         },
         {
-          "defKey": "score",
+          "defKey": "full_score",
           "defName": "满分",
           "comment": "",
           "type": "DECIMAL",
@@ -5064,8 +5098,25 @@
           "id": "D2EBAC6F-DE7D-420D-933B-2F1D89EDA536"
         },
         {
-          "defKey": "examination_num",
-          "defName": "事件份数",
+          "defKey": "score",
+          "defName": "得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "90915C24-C088-4AC8-924E-E951EF0DB253"
+        },
+        {
+          "defKey": "num",
+          "defName": "数量",
           "comment": "",
           "type": "",
           "len": "",
@@ -5073,7 +5124,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
@@ -5443,8 +5494,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_question",
-      "defName": "点位问题",
+      "defKey": "td_question",
+      "defName": "问题表",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5524,7 +5575,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5532,23 +5583,6 @@
           "uiHint": "",
           "id": "9936D1F3-0931-40ED-A4AA-DF8DA1F3DD38"
         },
-        {
-          "defKey": "loc_id",
-          "defName": "点位ID",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "AAB4BF27-5AE1-42A1-8164-2FA6A3D8D056"
-        },
         {
           "defKey": "qu_type",
           "defName": "问题类型",
@@ -5669,8 +5703,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_qu_answer",
-      "defName": "点位问题答案",
+      "defKey": "td_qu_answer",
+      "defName": "问题答案",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5750,7 +5784,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5896,7 +5930,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item_qu",
-      "defName": "点位问题",
+      "defName": "项目问题",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5968,7 +6002,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "qu_id",
           "defName": "id",
           "comment": "",
           "type": "",
@@ -5976,10 +6010,10 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
           "id": "58A7DDC4-00CB-4FC4-86E9-E251AA006338"
@@ -6002,9 +6036,9 @@
           "uiHint": ""
         },
         {
-          "defKey": "qu_id",
-          "defName": "问题ID",
-          "comment": "来源点位问题",
+          "defKey": "qu_type",
+          "defName": "问题类型",
+          "comment": "radio 单选, fill 填空题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6013,10 +6047,95 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "refDict": "",
           "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "C5E6642A-D6EF-460C-90CA-98855441D345"
+          "id": "99ED2FEB-E6A2-4237-A998-E9E83A90A9FB"
+        },
+        {
+          "defKey": "title",
+          "defName": "问题描述",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "F967C8FB-F1EF-4C85-9DC4-EB37C8227339"
+        },
+        {
+          "defKey": "compute_type",
+          "defName": "计分方式",
+          "comment": "+得分,-减分",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "FDCEECB0-2E7F-43D6-9B96-8D464865D562"
+        },
+        {
+          "defKey": "max_score",
+          "defName": "最高得(扣)分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "786109C8-D36C-4724-8C76-DE64AC216BF1"
+        },
+        {
+          "defKey": "an_score",
+          "defName": "每项计分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
+        },
+        {
+          "defKey": "stand",
+          "defName": "评分标准",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "0C274B8A-FF55-4B84-B764-780A793044EF"
         },
         {
           "defKey": "sort_no",
@@ -6162,7 +6281,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位为题",
+          "comment": "来源点位问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6193,57 +6312,6 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
-        {
-          "defKey": "is_custom",
-          "defName": "其他问题",
-          "comment": "其他问题时, qu_id 不存在",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "58BB49C4-EE07-4A1A-B301-FC46D63C7B6B"
-        },
-        {
-          "defKey": "qu_title",
-          "defName": "问题描述",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9659966E-5B4E-4E35-BF20-BB849C988D3F"
-        },
-        {
-          "defKey": "stand_answer",
-          "defName": "标准答案",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "5C1A1961-721B-4B18-8E55-42B3A0019062"
-        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -6455,7 +6523,7 @@
         },
         {
           "defKey": "item_id",
-          "defName": "测评点位",
+          "defName": "测评项目",
           "comment": "",
           "type": "",
           "len": "",
@@ -6489,7 +6557,7 @@
         },
         {
           "defKey": "item_name",
-          "defName": "点位名称",
+          "defName": "项目名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6506,7 +6574,7 @@
         },
         {
           "defKey": "name",
-          "defName": "具体名称",
+          "defName": "具体(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6931,6 +6999,191 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_check_item_an",
+      "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": "answer_id",
+          "defName": "答案ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "DB338FE4-285E-4AF1-9578-8690FF7FE086"
+        },
+        {
+          "defKey": "qu_id",
+          "defName": "问题ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "EC6B096C-2BC6-45D7-88F5-555F94BF1AA0"
+        },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "ABCD等",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "8C057AFD-1CBC-40D9-8681-7B3A104D84A8"
+        },
+        {
+          "defKey": "answer",
+          "defName": "答案",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "51283DB3-ADD4-4B09-BBB5-887CA10C6BF7"
+        },
+        {
+          "defKey": "score",
+          "defName": "分值",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
+        },
+        {
+          "defKey": "sort_no",
+          "defName": "排序",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "extProps": {},
+          "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -7353,6 +7606,7 @@
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",
         "B6BB7C88-ABE9-4B2F-8556-6A4EA85FBFCB",
         "156A3EC2-A70F-41C1-A66F-BFBE8476BA16",
+        "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"

db/.back_文明创办/文明创办-backup-20221213164312.pdma.json → db/.back_文明创办/文明创办-backup-20221215163252.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-13 16:42:28",
+  "updatedTime": "2022-12-15 11:04:55",
   "dbConns": [],
   "profile": {
     "default": {
@@ -237,7 +237,7 @@
         "ServiceImpl": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkVarNameU = \"UndefinedId\";\n    var pkFieldKey = \"UNDEFINED\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkFieldKey = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkVarNameU = it.func.camel(field.defKey,true);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    var mapperName = beanVarName+'Mapper';\n    \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\n\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl extends BaseServiceImpl<{{=beanClass}}Mapper, {{=beanClass}}> implements {{=serviceClass}} {\n    $blankline\n}",
         "Mapper": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.mapper;\n$blankline\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://njyunzhi.com\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper  extends BaseMapper<{{=beanClass}}>{\n    $blankline\n}",
         "Mapper.xml": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    var pkField = \"UNDEFINED_ID\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkField = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n$blankline\n\n<mapper namespace=\"{{=pkgName}}.mapper.{{=beanClass}}Mapper\">\n    $blankline\n</mapper>\n\n",
-        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.INPUT)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
+        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.ASSIGN_UUID)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
       },
       {
         "applyFor": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E",
@@ -1116,7 +1116,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "322EC759-BCCE-42E6-A1F1-837739AA6278"
         },
         {
@@ -4351,6 +4351,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "642B925C-403B-496D-BF93-5D4BE72A883B"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "97EC5064-0B0E-4AD5-BE3A-535AD8913AD1"
+        },
         {
           "defKey": "process_node",
           "defName": "流程节点",
@@ -4629,11 +4646,11 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "org_id",
-          "defName": "机构ID",
-          "comment": "",
-          "type": "",
-          "len": "",
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -4641,9 +4658,9 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "F3C73F9F-2277-498F-A067-9D44F19125B1",
-          "uiHint": ""
+          "extProps": {},
+          "domain": "",
+          "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
         {
           "defKey": "status",
@@ -4924,7 +4941,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item",
-      "defName": "测评点位",
+      "defName": "测评项目",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5029,6 +5046,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "7FF8CD4A-8CA9-4C24-A20E-F5D1C1425E33"
         },
+        {
+          "defKey": "item_type",
+          "defName": "项目类型",
+          "comment": "loc点位,survey问卷调查",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -5050,9 +5084,9 @@
           "defKey": "full_score",
           "defName": "满分",
           "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
@@ -5060,12 +5094,29 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "",
           "id": "D2EBAC6F-DE7D-420D-933B-2F1D89EDA536"
         },
         {
-          "defKey": "examination_num",
-          "defName": "事件份数",
+          "defKey": "score",
+          "defName": "得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "90915C24-C088-4AC8-924E-E951EF0DB253"
+        },
+        {
+          "defKey": "num",
+          "defName": "数量",
           "comment": "",
           "type": "",
           "len": "",
@@ -5073,7 +5124,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
@@ -5443,8 +5494,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_question",
-      "defName": "点位问题",
+      "defKey": "td_question",
+      "defName": "问题表",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5524,7 +5575,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5532,23 +5583,6 @@
           "uiHint": "",
           "id": "9936D1F3-0931-40ED-A4AA-DF8DA1F3DD38"
         },
-        {
-          "defKey": "loc_id",
-          "defName": "点位ID",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "AAB4BF27-5AE1-42A1-8164-2FA6A3D8D056"
-        },
         {
           "defKey": "qu_type",
           "defName": "问题类型",
@@ -5669,8 +5703,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_qu_answer",
-      "defName": "点位问题答案",
+      "defKey": "td_qu_answer",
+      "defName": "问题答案",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5750,7 +5784,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5896,7 +5930,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item_qu",
-      "defName": "点位问题",
+      "defName": "项目问题",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5968,7 +6002,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "qu_id",
           "defName": "id",
           "comment": "",
           "type": "",
@@ -5976,10 +6010,10 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
           "id": "58A7DDC4-00CB-4FC4-86E9-E251AA006338"
@@ -6002,9 +6036,9 @@
           "uiHint": ""
         },
         {
-          "defKey": "qu_id",
-          "defName": "问题ID",
-          "comment": "来源点位问题",
+          "defKey": "qu_type",
+          "defName": "问题类型",
+          "comment": "radio 单选, fill 填空题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6013,10 +6047,95 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "refDict": "",
           "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "C5E6642A-D6EF-460C-90CA-98855441D345"
+          "id": "99ED2FEB-E6A2-4237-A998-E9E83A90A9FB"
+        },
+        {
+          "defKey": "title",
+          "defName": "问题描述",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "F967C8FB-F1EF-4C85-9DC4-EB37C8227339"
+        },
+        {
+          "defKey": "compute_type",
+          "defName": "计分方式",
+          "comment": "+得分,-减分",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "FDCEECB0-2E7F-43D6-9B96-8D464865D562"
+        },
+        {
+          "defKey": "max_score",
+          "defName": "最高得(扣)分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "786109C8-D36C-4724-8C76-DE64AC216BF1"
+        },
+        {
+          "defKey": "an_score",
+          "defName": "每项计分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
+        },
+        {
+          "defKey": "stand",
+          "defName": "评分标准",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "0C274B8A-FF55-4B84-B764-780A793044EF"
         },
         {
           "defKey": "sort_no",
@@ -6162,7 +6281,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位为题",
+          "comment": "来源点位问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6193,57 +6312,6 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
-        {
-          "defKey": "is_custom",
-          "defName": "其他问题",
-          "comment": "其他问题时, qu_id 不存在",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "58BB49C4-EE07-4A1A-B301-FC46D63C7B6B"
-        },
-        {
-          "defKey": "qu_title",
-          "defName": "问题描述",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9659966E-5B4E-4E35-BF20-BB849C988D3F"
-        },
-        {
-          "defKey": "stand_answer",
-          "defName": "标准答案",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "5C1A1961-721B-4B18-8E55-42B3A0019062"
-        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -6455,7 +6523,7 @@
         },
         {
           "defKey": "item_id",
-          "defName": "测评点位",
+          "defName": "测评项目",
           "comment": "",
           "type": "",
           "len": "",
@@ -6489,7 +6557,7 @@
         },
         {
           "defKey": "item_name",
-          "defName": "点位名称",
+          "defName": "项目名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6506,7 +6574,7 @@
         },
         {
           "defKey": "name",
-          "defName": "具体名称",
+          "defName": "具体(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6931,6 +6999,191 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_check_item_an",
+      "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": "answer_id",
+          "defName": "答案ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "DB338FE4-285E-4AF1-9578-8690FF7FE086"
+        },
+        {
+          "defKey": "qu_id",
+          "defName": "问题ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "EC6B096C-2BC6-45D7-88F5-555F94BF1AA0"
+        },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "ABCD等",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "8C057AFD-1CBC-40D9-8681-7B3A104D84A8"
+        },
+        {
+          "defKey": "answer",
+          "defName": "答案",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "51283DB3-ADD4-4B09-BBB5-887CA10C6BF7"
+        },
+        {
+          "defKey": "score",
+          "defName": "分值",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
+        },
+        {
+          "defKey": "sort_no",
+          "defName": "排序",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "extProps": {},
+          "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -7353,6 +7606,7 @@
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",
         "B6BB7C88-ABE9-4B2F-8556-6A4EA85FBFCB",
         "156A3EC2-A70F-41C1-A66F-BFBE8476BA16",
+        "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"

db/.back_文明创办/文明创办-backup-20221213164228.pdma.json → db/.back_文明创办/文明创办-backup-20221215163254.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-13 16:40:09",
+  "updatedTime": "2022-12-15 16:32:52",
   "dbConns": [],
   "profile": {
     "default": {
@@ -237,7 +237,7 @@
         "ServiceImpl": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkVarNameU = \"UndefinedId\";\n    var pkFieldKey = \"UNDEFINED\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkFieldKey = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkVarNameU = it.func.camel(field.defKey,true);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    var mapperName = beanVarName+'Mapper';\n    \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\n\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl extends BaseServiceImpl<{{=beanClass}}Mapper, {{=beanClass}}> implements {{=serviceClass}} {\n    $blankline\n}",
         "Mapper": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.mapper;\n$blankline\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://njyunzhi.com\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper  extends BaseMapper<{{=beanClass}}>{\n    $blankline\n}",
         "Mapper.xml": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    var pkField = \"UNDEFINED_ID\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkField = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n$blankline\n\n<mapper namespace=\"{{=pkgName}}.mapper.{{=beanClass}}Mapper\">\n    $blankline\n</mapper>\n\n",
-        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.INPUT)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
+        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.ASSIGN_UUID)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
       },
       {
         "applyFor": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E",
@@ -1116,7 +1116,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "322EC759-BCCE-42E6-A1F1-837739AA6278"
         },
         {
@@ -2408,7 +2408,7 @@
           "id": "31357233-866E-45C4-867D-1F11AD8CF851"
         },
         {
-          "defKey": "resource_p_id",
+          "defKey": "parent_id",
           "defName": "上级ID",
           "comment": "",
           "type": "",
@@ -4351,6 +4351,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "642B925C-403B-496D-BF93-5D4BE72A883B"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "97EC5064-0B0E-4AD5-BE3A-535AD8913AD1"
+        },
         {
           "defKey": "process_node",
           "defName": "流程节点",
@@ -4629,11 +4646,11 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "org_id",
-          "defName": "机构ID",
-          "comment": "",
-          "type": "",
-          "len": "",
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -4641,9 +4658,9 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "F3C73F9F-2277-498F-A067-9D44F19125B1",
-          "uiHint": ""
+          "extProps": {},
+          "domain": "",
+          "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
         {
           "defKey": "status",
@@ -4924,7 +4941,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item",
-      "defName": "测评点位",
+      "defName": "测评项目",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5029,6 +5046,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "7FF8CD4A-8CA9-4C24-A20E-F5D1C1425E33"
         },
+        {
+          "defKey": "item_type",
+          "defName": "项目类型",
+          "comment": "loc点位,survey问卷调查",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -5050,18 +5084,52 @@
           "defKey": "full_score",
           "defName": "满分",
           "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "D2EBAC6F-DE7D-420D-933B-2F1D89EDA536"
+        },
+        {
+          "defKey": "score",
+          "defName": "得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "90915C24-C088-4AC8-924E-E951EF0DB253"
+        },
+        {
+          "defKey": "num",
+          "defName": "数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "D2EBAC6F-DE7D-420D-933B-2F1D89EDA536"
+          "id": "06FF365A-00BF-4F0A-B284-AD3479222286"
         },
         {
           "defKey": "status",
@@ -5426,8 +5494,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_question",
-      "defName": "点位问题",
+      "defKey": "td_question",
+      "defName": "问题表",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5507,7 +5575,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5515,23 +5583,6 @@
           "uiHint": "",
           "id": "9936D1F3-0931-40ED-A4AA-DF8DA1F3DD38"
         },
-        {
-          "defKey": "loc_id",
-          "defName": "点位ID",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "AAB4BF27-5AE1-42A1-8164-2FA6A3D8D056"
-        },
         {
           "defKey": "qu_type",
           "defName": "问题类型",
@@ -5652,8 +5703,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_qu_answer",
-      "defName": "点位问题答案",
+      "defKey": "td_qu_answer",
+      "defName": "问题答案",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5733,7 +5784,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5879,7 +5930,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item_qu",
-      "defName": "点位问题",
+      "defName": "项目问题",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5951,7 +6002,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "qu_id",
           "defName": "id",
           "comment": "",
           "type": "",
@@ -5959,10 +6010,10 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
           "id": "58A7DDC4-00CB-4FC4-86E9-E251AA006338"
@@ -5985,9 +6036,9 @@
           "uiHint": ""
         },
         {
-          "defKey": "qu_id",
-          "defName": "问题ID",
-          "comment": "来源点位问题",
+          "defKey": "qu_type",
+          "defName": "问题类型",
+          "comment": "radio 单选, fill 填空题",
           "type": "",
           "len": "",
           "scale": "",
@@ -5996,10 +6047,95 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "refDict": "",
           "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "C5E6642A-D6EF-460C-90CA-98855441D345"
+          "id": "99ED2FEB-E6A2-4237-A998-E9E83A90A9FB"
+        },
+        {
+          "defKey": "title",
+          "defName": "问题描述",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "F967C8FB-F1EF-4C85-9DC4-EB37C8227339"
+        },
+        {
+          "defKey": "compute_type",
+          "defName": "计分方式",
+          "comment": "+得分,-减分",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "FDCEECB0-2E7F-43D6-9B96-8D464865D562"
+        },
+        {
+          "defKey": "max_score",
+          "defName": "最高得(扣)分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "786109C8-D36C-4724-8C76-DE64AC216BF1"
+        },
+        {
+          "defKey": "an_score",
+          "defName": "每项计分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
+        },
+        {
+          "defKey": "stand",
+          "defName": "评分标准",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "0C274B8A-FF55-4B84-B764-780A793044EF"
         },
         {
           "defKey": "sort_no",
@@ -6145,7 +6281,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位为题",
+          "comment": "来源点位问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6176,57 +6312,6 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
-        {
-          "defKey": "is_custom",
-          "defName": "其他问题",
-          "comment": "其他问题时, qu_id 不存在",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "58BB49C4-EE07-4A1A-B301-FC46D63C7B6B"
-        },
-        {
-          "defKey": "qu_title",
-          "defName": "问题描述",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9659966E-5B4E-4E35-BF20-BB849C988D3F"
-        },
-        {
-          "defKey": "stand_answer",
-          "defName": "标准答案",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "5C1A1961-721B-4B18-8E55-42B3A0019062"
-        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -6438,7 +6523,7 @@
         },
         {
           "defKey": "item_id",
-          "defName": "测评点位",
+          "defName": "测评项目",
           "comment": "",
           "type": "",
           "len": "",
@@ -6472,7 +6557,7 @@
         },
         {
           "defKey": "item_name",
-          "defName": "点位名称",
+          "defName": "项目名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6489,7 +6574,7 @@
         },
         {
           "defKey": "name",
-          "defName": "具体名称",
+          "defName": "具体(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6914,6 +6999,191 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_check_item_an",
+      "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": "answer_id",
+          "defName": "答案ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "DB338FE4-285E-4AF1-9578-8690FF7FE086"
+        },
+        {
+          "defKey": "qu_id",
+          "defName": "问题ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "EC6B096C-2BC6-45D7-88F5-555F94BF1AA0"
+        },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "ABCD等",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "8C057AFD-1CBC-40D9-8681-7B3A104D84A8"
+        },
+        {
+          "defKey": "answer",
+          "defName": "答案",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "51283DB3-ADD4-4B09-BBB5-887CA10C6BF7"
+        },
+        {
+          "defKey": "score",
+          "defName": "分值",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
+        },
+        {
+          "defKey": "sort_no",
+          "defName": "排序",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "extProps": {},
+          "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -7336,6 +7606,7 @@
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",
         "B6BB7C88-ABE9-4B2F-8556-6A4EA85FBFCB",
         "156A3EC2-A70F-41C1-A66F-BFBE8476BA16",
+        "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-13 16:45:50",
+  "updatedTime": "2022-12-15 16:32:54",
   "dbConns": [],
   "profile": {
     "default": {
@@ -237,7 +237,7 @@
         "ServiceImpl": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkVarNameU = \"UndefinedId\";\n    var pkFieldKey = \"UNDEFINED\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkFieldKey = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkVarNameU = it.func.camel(field.defKey,true);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    var mapperName = beanVarName+'Mapper';\n    \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\n\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl extends BaseServiceImpl<{{=beanClass}}Mapper, {{=beanClass}}> implements {{=serviceClass}} {\n    $blankline\n}",
         "Mapper": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.mapper;\n$blankline\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://njyunzhi.com\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper  extends BaseMapper<{{=beanClass}}>{\n    $blankline\n}",
         "Mapper.xml": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    var pkField = \"UNDEFINED_ID\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkField = field.defKey;\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n$blankline\n\n<mapper namespace=\"{{=pkgName}}.mapper.{{=beanClass}}Mapper\">\n    $blankline\n</mapper>\n\n",
-        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.INPUT)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
+        "Entity": "{{  var today=new Date();\n    var fullYear=today.getFullYear();\n    var month=today.getMonth() + 1;\n    var days=today.getDate();\n    \n    var pkVarName = \"undefinedId\";\n    var pkDataType = \"String\";\n    it.entity.fields.forEach(function(field){\n        if(field.primaryKey){\n            pkVarName = it.func.camel(field.defKey,false);\n            pkDataType = field[\"type\"];\n            return;\n        }\n    });\n    \n    var pkgName = it.entity.env.base.nameSpace;\n    var beanClass = it.entity.env.base.codeRoot;\n    var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n    var serviceClass = beanClass+'Service';\n    var serviceVarName= beanVarName+'Service';\n    \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.IdType;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.time.LocalDateTime;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\nimport lombok.experimental.Accessors;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Data\n@EqualsAndHashCode(callSuper = false)\n@Accessors(chain = true)\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n    /** {{=it.func.join(field.defName,field.comment,';')}} */\n    @ApiModelProperty(name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n    {{? field.primaryKey }}\n    @TableId(value = \"{{=field.defKey}}\", type = IdType.ASSIGN_UUID)\n    {{?}}\n    private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n}"
       },
       {
         "applyFor": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E",
@@ -1116,7 +1116,7 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "322EC759-BCCE-42E6-A1F1-837739AA6278"
         },
         {
@@ -2408,7 +2408,7 @@
           "id": "31357233-866E-45C4-867D-1F11AD8CF851"
         },
         {
-          "defKey": "resource_p_id",
+          "defKey": "parent_id",
           "defName": "上级ID",
           "comment": "",
           "type": "",
@@ -4351,6 +4351,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "642B925C-403B-496D-BF93-5D4BE72A883B"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "97EC5064-0B0E-4AD5-BE3A-535AD8913AD1"
+        },
         {
           "defKey": "process_node",
           "defName": "流程节点",
@@ -4629,11 +4646,11 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "org_id",
-          "defName": "机构ID",
-          "comment": "",
-          "type": "",
-          "len": "",
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -4641,9 +4658,9 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "F3C73F9F-2277-498F-A067-9D44F19125B1",
-          "uiHint": ""
+          "extProps": {},
+          "domain": "",
+          "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
         {
           "defKey": "status",
@@ -4924,7 +4941,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item",
-      "defName": "测评点位",
+      "defName": "测评项目",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5029,6 +5046,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "7FF8CD4A-8CA9-4C24-A20E-F5D1C1425E33"
         },
+        {
+          "defKey": "item_type",
+          "defName": "项目类型",
+          "comment": "loc点位,survey问卷调查",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -5047,7 +5081,7 @@
           "id": "2ED82F0E-CA82-4D70-854E-9C74BF5D3F1E"
         },
         {
-          "defKey": "score",
+          "defKey": "full_score",
           "defName": "满分",
           "comment": "",
           "type": "DECIMAL",
@@ -5064,8 +5098,25 @@
           "id": "D2EBAC6F-DE7D-420D-933B-2F1D89EDA536"
         },
         {
-          "defKey": "examination_num",
-          "defName": "事件份数",
+          "defKey": "score",
+          "defName": "得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "90915C24-C088-4AC8-924E-E951EF0DB253"
+        },
+        {
+          "defKey": "num",
+          "defName": "数量",
           "comment": "",
           "type": "",
           "len": "",
@@ -5073,7 +5124,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
@@ -5443,8 +5494,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_question",
-      "defName": "点位问题",
+      "defKey": "td_question",
+      "defName": "问题表",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5524,7 +5575,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5532,23 +5583,6 @@
           "uiHint": "",
           "id": "9936D1F3-0931-40ED-A4AA-DF8DA1F3DD38"
         },
-        {
-          "defKey": "loc_id",
-          "defName": "点位ID",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "AAB4BF27-5AE1-42A1-8164-2FA6A3D8D056"
-        },
         {
           "defKey": "qu_type",
           "defName": "问题类型",
@@ -5669,8 +5703,8 @@
         },
         "custom": {}
       },
-      "defKey": "td_loc_qu_answer",
-      "defName": "点位问题答案",
+      "defKey": "td_qu_answer",
+      "defName": "问题答案",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5750,7 +5784,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -5896,7 +5930,7 @@
         "custom": {}
       },
       "defKey": "ta_check_item_qu",
-      "defName": "点位问题",
+      "defName": "项目问题",
       "comment": "",
       "properties": {},
       "nameTemplate": "{defKey}[{defName}]",
@@ -5968,7 +6002,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "qu_id",
           "defName": "id",
           "comment": "",
           "type": "",
@@ -5976,10 +6010,10 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
           "id": "58A7DDC4-00CB-4FC4-86E9-E251AA006338"
@@ -6002,9 +6036,9 @@
           "uiHint": ""
         },
         {
-          "defKey": "qu_id",
-          "defName": "问题ID",
-          "comment": "来源点位问题",
+          "defKey": "qu_type",
+          "defName": "问题类型",
+          "comment": "radio 单选, fill 填空题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6013,10 +6047,95 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "refDict": "",
           "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "C5E6642A-D6EF-460C-90CA-98855441D345"
+          "id": "99ED2FEB-E6A2-4237-A998-E9E83A90A9FB"
+        },
+        {
+          "defKey": "title",
+          "defName": "问题描述",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "F967C8FB-F1EF-4C85-9DC4-EB37C8227339"
+        },
+        {
+          "defKey": "compute_type",
+          "defName": "计分方式",
+          "comment": "+得分,-减分",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "FDCEECB0-2E7F-43D6-9B96-8D464865D562"
+        },
+        {
+          "defKey": "max_score",
+          "defName": "最高得(扣)分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "786109C8-D36C-4724-8C76-DE64AC216BF1"
+        },
+        {
+          "defKey": "an_score",
+          "defName": "每项计分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
+        },
+        {
+          "defKey": "stand",
+          "defName": "评分标准",
+          "comment": "",
+          "type": "TEXT",
+          "len": 0,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "0C274B8A-FF55-4B84-B764-780A793044EF"
         },
         {
           "defKey": "sort_no",
@@ -6162,7 +6281,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位为题",
+          "comment": "来源点位问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6193,57 +6312,6 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
-        {
-          "defKey": "is_custom",
-          "defName": "其他问题",
-          "comment": "其他问题时, qu_id 不存在",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "58BB49C4-EE07-4A1A-B301-FC46D63C7B6B"
-        },
-        {
-          "defKey": "qu_title",
-          "defName": "问题描述",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9659966E-5B4E-4E35-BF20-BB849C988D3F"
-        },
-        {
-          "defKey": "stand_answer",
-          "defName": "标准答案",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "5C1A1961-721B-4B18-8E55-42B3A0019062"
-        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -6455,7 +6523,7 @@
         },
         {
           "defKey": "item_id",
-          "defName": "测评点位",
+          "defName": "测评项目",
           "comment": "",
           "type": "",
           "len": "",
@@ -6489,7 +6557,7 @@
         },
         {
           "defKey": "item_name",
-          "defName": "点位名称",
+          "defName": "项目名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6506,7 +6574,7 @@
         },
         {
           "defKey": "name",
-          "defName": "具体名称",
+          "defName": "具体(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6931,6 +6999,191 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ta_check_item_an",
+      "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": "answer_id",
+          "defName": "答案ID",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "DB338FE4-285E-4AF1-9578-8690FF7FE086"
+        },
+        {
+          "defKey": "qu_id",
+          "defName": "问题ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "EC6B096C-2BC6-45D7-88F5-555F94BF1AA0"
+        },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "ABCD等",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "8C057AFD-1CBC-40D9-8681-7B3A104D84A8"
+        },
+        {
+          "defKey": "answer",
+          "defName": "答案",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "51283DB3-ADD4-4B09-BBB5-887CA10C6BF7"
+        },
+        {
+          "defKey": "score",
+          "defName": "分值",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
+        },
+        {
+          "defKey": "sort_no",
+          "defName": "排序",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "extProps": {},
+          "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -7353,6 +7606,7 @@
         "54B9F404-6224-4952-8B2C-A30F6FEE7CC1",
         "B6BB7C88-ABE9-4B2F-8556-6A4EA85FBFCB",
         "156A3EC2-A70F-41C1-A66F-BFBE8476BA16",
+        "507794C4-11E9-4924-AEC5-368BC6E03FD7",
         "3B58B8CA-AF26-40FE-907A-A34523419478",
         "B20E272F-91EB-4BAC-AAD6-AF99D517E44D",
         "EF3D4E17-6CE0-4944-B1DC-40280B2B689F"

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

@@ -1,7 +1,7 @@
 package com.example.civilizedcity.common;
 
 public class Constants {
-    public final static int ROOT_ID = 1;    // 超级管理员ID
+    public final static String ROOT_ID = "1";    // 超级管理员ID
 
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;

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

@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.SysRole;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +20,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.SysOrg;
 import com.example.civilizedcity.service.SysOrgService;
 
- /**
+/**
  * 单位表;(sys_org)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,12 +30,12 @@ import com.example.civilizedcity.service.SysOrgService;
 @RestController
 @RequestMapping("/")
 public class SysOrgController extends BaseController {
-    
+
     @Autowired
     private SysOrgService sysOrgService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param orgId 主键
      * @return 实例对象
@@ -38,28 +45,31 @@ public class SysOrgController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(sysOrgService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/sysOrg")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("单位名称") @RequestParam(value = "name", required = false) String name) throws Exception {
+
         IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysOrg> result = sysOrgService.page(pg);
-        
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isEmpty(name), "name", name);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<SysOrg> result = sysOrgService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param sysOrg 实例对象
@@ -68,11 +78,23 @@ public class SysOrgController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysOrg")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysOrg sysOrg) throws Exception {
+        if (StringUtils.isEmpty(sysOrg.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        long i = sysOrgService.countBy("name", sysOrg.getName(), false);
+        if (i > 0) {
+            return ResponseBean.error("名称已存在");
+        }
+
+        sysOrg.setOrgId(null);
+        sysOrg.setStatus(Constants.STATUS_NORMAL);
+        sysOrg.setCreateDate(LocalDateTime.now());
         sysOrgService.save(sysOrg);
         return ResponseBean.success(sysOrg);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param sysOrg 实例对象
@@ -81,12 +103,22 @@ public class SysOrgController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/sysOrg/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysOrg sysOrg,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        if (StringUtils.isEmpty(sysOrg.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        SysOrg exists = sysOrgService.getByButNot("name", sysOrg.getName(), "org_id", id, false);
+        if (null != exists) {
+            return ResponseBean.error("名称已存在");
+        }
+
+        sysOrg.setOrgId(id);
         sysOrgService.updateById(sysOrg);
         return ResponseBean.success(sysOrg);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param orgId 主键
@@ -94,7 +126,7 @@ public class SysOrgController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysOrg/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         sysOrgService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.SysPosition;
 import com.example.civilizedcity.service.SysPositionService;
 
- /**
+/**
  * 岗位表;(sys_position)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,12 +29,12 @@ import com.example.civilizedcity.service.SysPositionService;
 @RestController
 @RequestMapping("/")
 public class SysPositionController extends BaseController {
-    
+
     @Autowired
     private SysPositionService sysPositionService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param positionId 主键
      * @return 实例对象
@@ -38,28 +44,33 @@ public class SysPositionController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(sysPositionService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/sysPosition")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("所属单位") @RequestParam(value = "orgId", required = false) String orgId,
+                             @ApiParam("名称") @RequestParam(value = "name", defaultValue = "10") String name) throws Exception {
+
         IPage<SysPosition> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysPosition> result = sysPositionService.page(pg);
-        
+        QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isEmpty(orgId), "org_id", orgId);
+        queryWrapper.like(StringUtils.isEmpty(name), "name", name);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<SysPosition> result = sysPositionService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param sysPosition 实例对象
@@ -68,11 +79,26 @@ public class SysPositionController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysPosition")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysPosition sysPosition) throws Exception {
+        if (StringUtils.isEmpty(sysPosition.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+        if (StringUtils.isEmpty(sysPosition.getOrgId())) {
+            return ResponseBean.error("单位不能为空");
+        }
+
+        long i = sysPositionService.countInOrg(sysPosition.getOrgId(), sysPosition.getName(), null);
+        if (i > 0) {
+            return ResponseBean.error("名称已存在");
+        }
+
+        sysPosition.setPositionId(null);
+        sysPosition.setStatus(Constants.STATUS_NORMAL);
+        sysPosition.setCreateDate(LocalDateTime.now());
         sysPositionService.save(sysPosition);
         return ResponseBean.success(sysPosition);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param sysPosition 实例对象
@@ -81,12 +107,25 @@ public class SysPositionController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/sysPosition/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysPosition sysPosition,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        if (StringUtils.isEmpty(sysPosition.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+        if (StringUtils.isEmpty(sysPosition.getOrgId())) {
+            return ResponseBean.error("单位不能为空");
+        }
+
+        long i = sysPositionService.countInOrg(sysPosition.getOrgId(), sysPosition.getName(), id);
+        if (i > 0) {
+            return ResponseBean.error("名称已存在");
+        }
+
+        sysPosition.setPositionPId(id);
         sysPositionService.updateById(sysPosition);
         return ResponseBean.success(sysPosition);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param positionId 主键
@@ -94,7 +133,7 @@ public class SysPositionController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysPosition/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         sysPositionService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -27,75 +27,72 @@ public class SysResourceController extends BaseController {
     @Autowired
     private SysResourceService sysResourceService;
     
-    /** 
-     * 通过ID查询单条数据 
-     *
-     * @param resourceId 主键
-     * @return 实例对象
-     */
-    @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/sysResource/{id}")
-    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(sysResourceService.getById(id));
-    }
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param resourceId 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/sysResource/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+//        return ResponseBean.success(sysResourceService.getById(id));
+//    }
     
     /** 
      * 分页查询
      *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
+     * @param typeCode 资源类型
+     * @param roleId 角色ID
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/sysResource")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
-        IPage<SysResource> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysResource> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysResource> result = sysResourceService.page(pg);
+    public ResponseBean list(@ApiParam("资源类型") @RequestParam(value = "typeCode") String typeCode,
+                             @ApiParam("角色ID") @RequestParam(value = "roleId", required = false) String roleId) throws Exception {
+
+        List<SysResource> result = sysResourceService.listBy(typeCode, roleId);
         
         return ResponseBean.success(result);
     }
     
-    /** 
-     * 新增数据
-     *
-     * @param sysResource 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/sysResource")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysResource sysResource) throws Exception {
-        sysResourceService.save(sysResource);
-        return ResponseBean.success(sysResource);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param sysResource 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/sysResource/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysResource sysResource,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        sysResourceService.updateById(sysResource);
-        return ResponseBean.success(sysResource);
-    }
-    
-    /** 
-     * 通过主键删除数据
-     *
-     * @param resourceId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/sysResource/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        sysResourceService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 新增数据
+//     *
+//     * @param sysResource 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/sysResource")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysResource sysResource) throws Exception {
+//        sysResourceService.save(sysResource);
+//        return ResponseBean.success(sysResource);
+//    }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param sysResource 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/sysResource/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysResource sysResource,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        sysResourceService.updateById(sysResource);
+//        return ResponseBean.success(sysResource);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param resourceId 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/sysResource/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+//        sysResourceService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

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

@@ -4,8 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.service.SysUserRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +21,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.service.SysRoleService;
 
- /**
+/**
  * 系统角色;(sys_role)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,12 +31,15 @@ import com.example.civilizedcity.service.SysRoleService;
 @RestController
 @RequestMapping("/")
 public class SysRoleController extends BaseController {
-    
+
     @Autowired
     private SysRoleService sysRoleService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param roleId 主键
      * @return 实例对象
@@ -38,28 +49,29 @@ public class SysRoleController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(sysRoleService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/sysRole")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
         IPage<SysRole> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysRole> result = sysRoleService.page(pg);
-        
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<SysRole> result = sysRoleService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param sysRole 实例对象
@@ -68,11 +80,24 @@ public class SysRoleController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysRole")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysRole sysRole) throws Exception {
+        sysRole.setRoleId(null);
+
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            return ResponseBean.error("角色名称不能为空");
+        }
+
+        long i = sysRoleService.countBy("name", sysRole.getName(), false);
+        if (i > 0) {
+            return ResponseBean.error("角色名称已存在");
+        }
+
+        sysRole.setStatus(Constants.STATUS_NORMAL);
+        sysRole.setCreateDate(LocalDateTime.now());
         sysRoleService.save(sysRole);
         return ResponseBean.success(sysRole);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param sysRole 实例对象
@@ -81,12 +106,23 @@ public class SysRoleController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/sysRole/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysRole sysRole,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            return ResponseBean.error("角色名称不能为空");
+        }
+
+        SysRole exists = sysRoleService.getByButNot("name", sysRole.getName(), "role_id", id, false);
+        if (null != exists) {
+            return ResponseBean.error("角色名称已存在");
+        }
+
+        sysRole.setRoleId(id);
         sysRoleService.updateById(sysRole);
         return ResponseBean.success(sysRole);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param roleId 主键
@@ -94,8 +130,11 @@ public class SysRoleController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysRole/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        sysRoleService.removeLogicById(id);
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        sysRoleService.removeById(id);
+        sysUserRoleService.removeByMap(new HashMap<String, Object>() {{
+            put("role_id", id);
+        }});
         return ResponseBean.success("success");
     }
 }

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

@@ -26,76 +26,95 @@ public class SysRoleResourceController extends BaseController {
     
     @Autowired
     private SysRoleResourceService sysRoleResourceService;
+
+     /**
+      * 新增数据, 包含编辑
+      *
+      * @param roleId 角色ID
+      * @param roleResourcesList 授权列表
+      * @return 实例对象
+      */
+     @ApiOperation("新增数据, 包含编辑")
+     @PostMapping("/role/{roleId}/resources")
+     public ResponseBean add(@ApiParam("角色ID") @PathVariable String roleId,
+                             @ApiParam("授权列表") @RequestBody List<SysRoleResource> roleResourcesList) throws Exception {
+         if (null == roleResourcesList) {
+             return ResponseBean.error("未找到授权对象");
+         }
+
+         sysRoleResourceService.mergeData(roleId, roleResourcesList);
+         return ResponseBean.success(roleResourcesList);
+     }
     
-    /** 
-     * 通过ID查询单条数据 
-     *
-     * @param resourceId 主键
-     * @return 实例对象
-     */
-    @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/sysRoleResource/{id}")
-    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(sysRoleResourceService.getById(id));
-    }
-    
-    /** 
-     * 分页查询
-     *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
-     * @return 查询结果
-     */
-    @ApiOperation("分页查询")
-    @GetMapping("/sysRoleResource")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
-        IPage<SysRoleResource> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysRoleResource> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysRoleResource> result = sysRoleResourceService.page(pg);
-        
-        return ResponseBean.success(result);
-    }
-    
-    /** 
-     * 新增数据
-     *
-     * @param sysRoleResource 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/sysRoleResource")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysRoleResource sysRoleResource) throws Exception {
-        sysRoleResourceService.save(sysRoleResource);
-        return ResponseBean.success(sysRoleResource);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param sysRoleResource 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/sysRoleResource/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysRoleResource sysRoleResource,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        sysRoleResourceService.updateById(sysRoleResource);
-        return ResponseBean.success(sysRoleResource);
-    }
-    
-    /** 
-     * 通过主键删除数据
-     *
-     * @param resourceId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/sysRoleResource/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        sysRoleResourceService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param resourceId 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/sysRoleResource/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+//        return ResponseBean.success(sysRoleResourceService.getById(id));
+//    }
+//
+//    /**
+//     * 分页查询
+//     *
+//     * @param pageNum 当前页码
+//     * @param pageSize 每页条数
+//     * @return 查询结果
+//     */
+//    @ApiOperation("分页查询")
+//    @GetMapping("/sysRoleResource")
+//    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+//
+//        IPage<SysRoleResource> pg = new Page<>(pageNum, pageSize);
+//        // QueryWrapper<SysRoleResource> queryWrapper = new QueryWrapper<>();
+//        // queryWrapper.orderByDesc("create_date");
+//        IPage<SysRoleResource> result = sysRoleResourceService.page(pg);
+//
+//        return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 新增数据
+//     *
+//     * @param sysRoleResource 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/sysRoleResource")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysRoleResource sysRoleResource) throws Exception {
+//        sysRoleResourceService.save(sysRoleResource);
+//        return ResponseBean.success(sysRoleResource);
+//    }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param sysRoleResource 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/sysRoleResource/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysRoleResource sysRoleResource,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        sysRoleResourceService.updateById(sysRoleResource);
+//        return ResponseBean.success(sysRoleResource);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param resourceId 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/sysRoleResource/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+//        sysRoleResourceService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

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

@@ -4,8 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.SysResource;
+import com.example.civilizedcity.entity.SysRole;
+import com.example.civilizedcity.service.SysResourceService;
+import com.example.civilizedcity.service.SysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,10 +33,13 @@ import com.example.civilizedcity.service.SysUserService;
 @RestController
 @RequestMapping("/")
 public class SysUserController extends BaseController {
-    
+
     @Autowired
-    private SysUserService sysUserService;
-    
+     SysRoleService sysRoleService;
+
+    @Autowired
+     SysResourceService sysResourceService;
+
     /** 
      * 通过ID查询单条数据 
      *
@@ -36,8 +49,36 @@ public class SysUserController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/sysUser/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(sysUserService.getById(id));
+        SysUser sysUser = sysUserService.getById(id);
+        if (null == sysUser || sysUser.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("用户不存在");
+        }
+
+        return ResponseBean.success(getPermissions(sysUser));
     }
+
+     /**
+      * 查询当前人员
+      *
+      * @param
+      * @return 实例对象
+      */
+     @ApiOperation("查询当前人员")
+     @GetMapping("/sysUser/current")
+     public ResponseBean current() throws Exception {
+         SysUser sysUser = currentUser();
+         return ResponseBean.success(getPermissions(sysUser));
+     }
+
+     private SysUser getPermissions(SysUser sysUser) {
+         List<SysRole> rolesList = sysRoleService.getByUser(sysUser.getUserId());
+         List<SysResource> resourcesList = sysResourceService.getByUser(sysUser.getUserId());
+
+         sysUser.setRolesList(rolesList);
+         sysUser.setResourcesList(resourcesList);
+
+         return sysUser;
+     }
     
     /** 
      * 分页查询
@@ -48,12 +89,20 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation("分页查询")
     @GetMapping("/sysUser")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("姓名") @RequestParam(value = "name", required = false) String name,
+                             @ApiParam("机构") @RequestParam(value = "orgId", required = false) String orgId,
+                             @ApiParam("手机号") @RequestParam(value = "phone", required = false) String phone) throws Exception {
         
         IPage<SysUser> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.ne("user_id", Constants.ROOT_ID);
+        queryWrapper.orderByDesc("create_date");
         IPage<SysUser> result = sysUserService.page(pg);
         
         return ResponseBean.success(result);
@@ -68,23 +117,23 @@ public class SysUserController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysUser")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysUser sysUser) throws Exception {
-        sysUserService.save(sysUser);
+        sysUserService.mergeData(sysUser);
         return ResponseBean.success(sysUser);
     }
     
-    /** 
-     * 更新数据
-     *
-     * @param sysUser 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/sysUser/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysUser sysUser,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        sysUserService.updateById(sysUser);
-        return ResponseBean.success(sysUser);
-    }
+//    /**
+//     * 更新数据
+//     *
+//     * @param sysUser 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/sysUser/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysUser sysUser,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        sysUserService.updateById(sysUser);
+//        return ResponseBean.success(sysUser);
+//    }
     
     /** 
      * 通过主键删除数据

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

@@ -27,75 +27,75 @@ public class SysUserRoleController extends BaseController {
     @Autowired
     private SysUserRoleService sysUserRoleService;
     
-    /** 
-     * 通过ID查询单条数据 
-     *
-     * @param userId 主键
-     * @return 实例对象
-     */
-    @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/sysUserRole/{id}")
-    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(sysUserRoleService.getById(id));
-    }
-    
-    /** 
-     * 分页查询
-     *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
-     * @return 查询结果
-     */
-    @ApiOperation("分页查询")
-    @GetMapping("/sysUserRole")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
-        IPage<SysUserRole> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<SysUserRole> result = sysUserRoleService.page(pg);
-        
-        return ResponseBean.success(result);
-    }
-    
-    /** 
-     * 新增数据
-     *
-     * @param sysUserRole 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/sysUserRole")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysUserRole sysUserRole) throws Exception {
-        sysUserRoleService.save(sysUserRole);
-        return ResponseBean.success(sysUserRole);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param sysUserRole 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/sysUserRole/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysUserRole sysUserRole,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        sysUserRoleService.updateById(sysUserRole);
-        return ResponseBean.success(sysUserRole);
-    }
-    
-    /** 
-     * 通过主键删除数据
-     *
-     * @param userId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/sysUserRole/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        sysUserRoleService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param userId 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/sysUserRole/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+//        return ResponseBean.success(sysUserRoleService.getById(id));
+//    }
+//
+//    /**
+//     * 分页查询
+//     *
+//     * @param pageNum 当前页码
+//     * @param pageSize 每页条数
+//     * @return 查询结果
+//     */
+//    @ApiOperation("分页查询")
+//    @GetMapping("/sysUserRole")
+//    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+//
+//        IPage<SysUserRole> pg = new Page<>(pageNum, pageSize);
+//        // QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+//        // queryWrapper.orderByDesc("create_date");
+//        IPage<SysUserRole> result = sysUserRoleService.page(pg);
+//
+//        return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 新增数据
+//     *
+//     * @param sysUserRole 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/sysUserRole")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody SysUserRole sysUserRole) throws Exception {
+//        sysUserRoleService.save(sysUserRole);
+//        return ResponseBean.success(sysUserRole);
+//    }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param sysUserRole 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/sysUserRole/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysUserRole sysUserRole,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        sysUserRoleService.updateById(sysUserRole);
+//        return ResponseBean.success(sysUserRole);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param userId 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/sysUserRole/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+//        sysUserRoleService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

src/main/java/com/example/civilizedcity/controller/TdLocQuAnswerController.java → src/main/java/com/example/civilizedcity/controller/TdQuAnswerController.java

@@ -1,18 +1,16 @@
 package com.example.civilizedcity.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.ResponseBean;
-import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TdLocQuAnswer;
-import com.example.civilizedcity.service.TdLocQuAnswerService;
+import com.example.civilizedcity.entity.TdQuAnswer;
+import com.example.civilizedcity.service.TdQuAnswerService;
 
  /**
  * 点位问题答案;(td_loc_qu_answer)表控制层
@@ -22,10 +20,10 @@ import com.example.civilizedcity.service.TdLocQuAnswerService;
 @Api(tags = "点位问题答案对象功能接口")
 @RestController
 @RequestMapping("/")
-public class TdLocQuAnswerController extends BaseController {
+public class TdQuAnswerController extends BaseController {
     
     @Autowired
-    private TdLocQuAnswerService tdLocQuAnswerService;
+    private TdQuAnswerService tdLocQuAnswerService;
     
     /** 
      * 通过ID查询单条数据 
@@ -51,10 +49,10 @@ public class TdLocQuAnswerController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
         
-        IPage<TdLocQuAnswer> pg = new Page<>(pageNum, pageSize);
+        IPage<TdQuAnswer> pg = new Page<>(pageNum, pageSize);
         // QueryWrapper<TdLocQuAnswer> queryWrapper = new QueryWrapper<>();
         // queryWrapper.orderByDesc("create_date");
-        IPage<TdLocQuAnswer> result = tdLocQuAnswerService.page(pg);
+        IPage<TdQuAnswer> result = tdLocQuAnswerService.page(pg);
         
         return ResponseBean.success(result);
     }
@@ -67,7 +65,7 @@ public class TdLocQuAnswerController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/tdLocQuAnswer")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdLocQuAnswer tdLocQuAnswer) throws Exception {
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuAnswer tdLocQuAnswer) throws Exception {
         tdLocQuAnswerService.save(tdLocQuAnswer);
         return ResponseBean.success(tdLocQuAnswer);
     }
@@ -80,7 +78,7 @@ public class TdLocQuAnswerController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/tdLocQuAnswer/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdLocQuAnswer tdLocQuAnswer,
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuAnswer tdLocQuAnswer,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
         tdLocQuAnswerService.updateById(tdLocQuAnswer);
         return ResponseBean.success(tdLocQuAnswer);

src/main/java/com/example/civilizedcity/controller/TdLocQuestionController.java → src/main/java/com/example/civilizedcity/controller/TdQuestionController.java

@@ -1,18 +1,16 @@
 package com.example.civilizedcity.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.ResponseBean;
-import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TdLocQuestion;
-import com.example.civilizedcity.service.TdLocQuestionService;
+import com.example.civilizedcity.entity.TdQuestion;
+import com.example.civilizedcity.service.TdQuestionService;
 
  /**
  * 点位问题;(td_loc_question)表控制层
@@ -22,10 +20,10 @@ import com.example.civilizedcity.service.TdLocQuestionService;
 @Api(tags = "点位问题对象功能接口")
 @RestController
 @RequestMapping("/")
-public class TdLocQuestionController extends BaseController {
+public class TdQuestionController extends BaseController {
     
     @Autowired
-    private TdLocQuestionService tdLocQuestionService;
+    private TdQuestionService tdLocQuestionService;
     
     /** 
      * 通过ID查询单条数据 
@@ -51,10 +49,10 @@ public class TdLocQuestionController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
         
-        IPage<TdLocQuestion> pg = new Page<>(pageNum, pageSize);
+        IPage<TdQuestion> pg = new Page<>(pageNum, pageSize);
         // QueryWrapper<TdLocQuestion> queryWrapper = new QueryWrapper<>();
         // queryWrapper.orderByDesc("create_date");
-        IPage<TdLocQuestion> result = tdLocQuestionService.page(pg);
+        IPage<TdQuestion> result = tdLocQuestionService.page(pg);
         
         return ResponseBean.success(result);
     }
@@ -67,7 +65,7 @@ public class TdLocQuestionController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/tdLocQuestion")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdLocQuestion tdLocQuestion) throws Exception {
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuestion tdLocQuestion) throws Exception {
         tdLocQuestionService.save(tdLocQuestion);
         return ResponseBean.success(tdLocQuestion);
     }
@@ -80,7 +78,7 @@ public class TdLocQuestionController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/tdLocQuestion/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdLocQuestion tdLocQuestion,
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuestion tdLocQuestion,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
         tdLocQuestionService.updateById(tdLocQuestion);
         return ResponseBean.success(tdLocQuestion);

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

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class SysOrg implements Serializable,Cloneable{
     /** 机构ID */
     @ApiModelProperty(name = "机构ID",notes = "")
-    @TableId(value = "org_id", type = IdType.INPUT)
+    @TableId(value = "org_id", type = IdType.ASSIGN_UUID)
     private String orgId ;
     /** 机构编码 */
     @ApiModelProperty(name = "机构编码",notes = "")

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

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class SysPosition implements Serializable,Cloneable{
     /** 岗位ID */
     @ApiModelProperty(name = "岗位ID",notes = "")
-    @TableId(value = "position_id", type = IdType.INPUT)
+    @TableId(value = "position_id", type = IdType.ASSIGN_UUID)
     private String positionId ;
     /** 岗位名称 */
     @ApiModelProperty(name = "岗位名称",notes = "")

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

@@ -38,7 +38,7 @@ public class SysResource implements Serializable,Cloneable{
     private String resourceCode ;
     /** 上级ID */
     @ApiModelProperty(name = "上级ID",notes = "")
-    private String resourcePId ;
+    private String parentId ;
     /** 排序 */
     @ApiModelProperty(name = "排序",notes = "")
     private Integer sortNo ;

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

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class SysRole implements Serializable,Cloneable{
     /** 角色ID */
     @ApiModelProperty(name = "角色ID",notes = "")
-    @TableId(value = "role_id", type = IdType.INPUT)
+    @TableId(value = "role_id", type = IdType.ASSIGN_UUID)
     private String roleId ;
     /** 角色名称 */
     @ApiModelProperty(name = "角色名称",notes = "")

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

@@ -25,7 +25,7 @@ public class SysRoleResource implements Serializable,Cloneable{
      /** 用户ID */
      @ApiModelProperty(name = "ID",notes = "")
      @TableId(value = "id", type = IdType.AUTO)
-     private String id ;
+     private Integer id ;
     /** 角色ID */
     @ApiModelProperty(name = "角色ID",notes = "")
     private String roleId ;

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,11 +28,11 @@ import lombok.experimental.Accessors;
 public class SysUser implements Serializable,Cloneable{
     /** 用户ID */
     @ApiModelProperty(name = "用户ID",notes = "")
-    @TableId(value = "user_id", type = IdType.INPUT)
+    @TableId(value = "user_id", type = IdType.ASSIGN_UUID)
     private String userId ;
     /** 用户名称 */
     @ApiModelProperty(name = "用户名称",notes = "")
-    private Integer name ;
+    private String name ;
     /** 头像 */
     @ApiModelProperty(name = "头像",notes = "")
     private String avatar ;
@@ -52,4 +55,11 @@ public class SysUser implements Serializable,Cloneable{
     @ApiModelProperty(name = "创建时间",notes = "")
     private LocalDateTime createDate ;
 
+     @ApiModelProperty(name = "角色列表", notes = "")
+     @TableField(exist = false)
+     List<SysRole> rolesList;
+
+     @ApiModelProperty(name = "资源列表", notes = "")
+     @TableField(exist = false)
+     List<SysResource> resourcesList;
 }

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

@@ -25,7 +25,7 @@ public class SysUserRole implements Serializable,Cloneable{
      /** 用户ID */
      @ApiModelProperty(name = "ID",notes = "")
      @TableId(value = "id", type = IdType.AUTO)
-     private String id ;
+     private Integer id ;
     /** 角色ID */
     @ApiModelProperty(name = "角色ID",notes = "")
     private String roleId ;

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

@@ -22,18 +22,33 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "点位问题",description = "")
 @TableName("ta_check_item_qu")
 public class TaCheckItemQu implements Serializable,Cloneable{
-    /** id */
-    @ApiModelProperty(name = "id",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
-    private Integer id ;
-    /** 点位ID */
-    @ApiModelProperty(name = "点位ID",notes = "")
-    private String itemId ;
-    /** 问题ID;来源点位问题 */
-    @ApiModelProperty(name = "问题ID",notes = "来源点位问题")
-    private String quId ;
-    /** 序号 */
-    @ApiModelProperty(name = "序号",notes = "")
-    private Integer sortNo ;
+     /** id */
+     @ApiModelProperty(name = "id",notes = "")
+     @TableId(value = "qu_id", type = IdType.ASSIGN_UUID)
+     private String quId ;
+     /** 点位ID */
+     @ApiModelProperty(name = "点位ID",notes = "")
+     private String itemId ;
+     /** 问题类型;radio 单选, fill 填空题 */
+     @ApiModelProperty(name = "问题类型",notes = "radio 单选, fill 填空题")
+     private String quType ;
+     /** 问题描述 */
+     @ApiModelProperty(name = "问题描述",notes = "")
+     private String title ;
+     /** 计分方式;+得分,-减分 */
+     @ApiModelProperty(name = "计分方式",notes = "+得分,-减分")
+     private String computeType ;
+     /** 最高得(扣)分 */
+     @ApiModelProperty(name = "最高得(扣)分",notes = "")
+     private Double maxScore ;
+     /** 每项计分 */
+     @ApiModelProperty(name = "每项计分",notes = "")
+     private Double anScore ;
+     /** 评分标准 */
+     @ApiModelProperty(name = "评分标准",notes = "")
+     private String stand ;
+     /** 序号 */
+     @ApiModelProperty(name = "序号",notes = "")
+     private Integer sortNo ;
 
 }

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

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class TaPerson implements Serializable,Cloneable{
     /** 人员id */
     @ApiModelProperty(name = "人员id",notes = "")
-    @TableId(value = "person_id", type = IdType.INPUT)
+    @TableId(value = "person_id", type = IdType.ASSIGN_UUID)
     private String personId ;
     /** 微信openid */
     @ApiModelProperty(name = "微信openid",notes = "")

src/main/java/com/example/civilizedcity/entity/TdLocQuAnswer.java → src/main/java/com/example/civilizedcity/entity/TdQuAnswer.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel(value = "点位问题答案",description = "")
 @TableName("td_loc_qu_answer")
-public class TdLocQuAnswer implements Serializable,Cloneable{
+public class TdQuAnswer implements Serializable,Cloneable{
     /** 答案ID */
     @ApiModelProperty(name = "答案ID",notes = "")
     @TableId(value = "answer_id", type = IdType.INPUT)

src/main/java/com/example/civilizedcity/entity/TdLocQuestion.java → src/main/java/com/example/civilizedcity/entity/TdQuestion.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel(value = "点位问题",description = "")
 @TableName("td_loc_question")
-public class TdLocQuestion implements Serializable,Cloneable{
+public class TdQuestion implements Serializable,Cloneable{
     /** 问题ID */
     @ApiModelProperty(name = "问题ID",notes = "")
     @TableId(value = "qu_id", type = IdType.INPUT)

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

@@ -5,12 +5,18 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysResource;
 
- /**
+import java.util.List;
+
+/**
  * 资源表;(sys_resource)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
-public interface SysResourceMapper  extends BaseMapper<SysResource>{
-    
+public interface SysResourceMapper extends BaseMapper<SysResource> {
+
+    List<SysResource> getByUser(@Param("userId") String userId);
+
+    List<SysResource> listBy(@Param("typeCode") String typeCode, @Param("roleId") String roleId);
 }

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

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysRole;
 
- /**
+import java.util.List;
+
+/**
  * 系统角色;(sys_role)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface SysRoleMapper  extends BaseMapper<SysRole>{
-    
-}
+
+     List<SysRole> getByUser(@Param("userId") String userId);
+ }

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

@@ -5,12 +5,17 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysRoleResource;
 
- /**
+import java.util.List;
+
+/**
  * 角色资源;(sys_role_resource)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface SysRoleResourceMapper  extends BaseMapper<SysRoleResource>{
-    
-}
+
+     SysRoleResource getByRoleAndResource(@Param("roleId") String roleId, @Param("resourceId") String resourceId);
+
+     int deleteNotIn(@Param("roleId") String roleId, @Param("idList") List<Integer> idList);
+ }

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

@@ -5,12 +5,17 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysUserRole;
 
- /**
+import java.util.List;
+
+/**
  * 角色授权;(sys_user_role)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface SysUserRoleMapper  extends BaseMapper<SysUserRole>{
-    
-}
+
+     SysUserRole getByUserAndRole(@Param("userId") String userId, @Param("roleId") String roleId);
+
+     int deleteNotIn(@Param("userId") String userId, @Param("idList") List<Integer> idList);
+ }

src/main/java/com/example/civilizedcity/mapper/TdLocQuAnswerMapper.java → src/main/java/com/example/civilizedcity/mapper/TdQuAnswerMapper.java

@@ -2,8 +2,7 @@ package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import com.example.civilizedcity.entity.TdLocQuAnswer;
+import com.example.civilizedcity.entity.TdQuAnswer;
 
  /**
  * 点位问题答案;(td_loc_qu_answer)表数据库访问层
@@ -11,6 +10,6 @@ import com.example.civilizedcity.entity.TdLocQuAnswer;
  * @date : 2022-12-13
  */
 @Mapper
-public interface TdLocQuAnswerMapper  extends BaseMapper<TdLocQuAnswer>{
+public interface TdQuAnswerMapper extends BaseMapper<TdQuAnswer>{
     
 }

src/main/java/com/example/civilizedcity/mapper/TdLocQuestionMapper.java → src/main/java/com/example/civilizedcity/mapper/TdQuestionMapper.java

@@ -2,8 +2,7 @@ package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import com.example.civilizedcity.entity.TdLocQuestion;
+import com.example.civilizedcity.entity.TdQuestion;
 
  /**
  * 点位问题;(td_loc_question)表数据库访问层
@@ -11,6 +10,6 @@ import com.example.civilizedcity.entity.TdLocQuestion;
  * @date : 2022-12-13
  */
 @Mapper
-public interface TdLocQuestionMapper  extends BaseMapper<TdLocQuestion>{
+public interface TdQuestionMapper extends BaseMapper<TdQuestion>{
     
 }

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

@@ -9,5 +9,6 @@ import com.example.civilizedcity.entity.SysPosition;
  * @date : 2022-12-12
  */
 public interface SysPositionService extends IBaseService<SysPosition> {
-    
-}
+
+     long countInOrg(String orgId, String name, String nePosId);
+ }

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

@@ -3,11 +3,16 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysResource;
 
- /**
+import java.util.List;
+
+/**
  * 资源表;(sys_resource)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 public interface SysResourceService extends IBaseService<SysResource> {
-    
+
+     List<SysResource> getByUser(String userId);
+
+    List<SysResource> listBy(String typeCode, String roleId);
 }

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

@@ -3,11 +3,14 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysRoleResource;
 
- /**
+import java.util.List;
+
+/**
  * 角色资源;(sys_role_resource)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 public interface SysRoleResourceService extends IBaseService<SysRoleResource> {
-    
-}
+
+     boolean mergeData(String roleId, List<SysRoleResource> roleResourcesList);
+ }

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

@@ -3,11 +3,14 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysRole;
 
- /**
+import java.util.List;
+
+/**
  * 系统角色;(sys_role)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 public interface SysRoleService extends IBaseService<SysRole> {
-    
-}
+
+     List<SysRole> getByUser(String userId);
+ }

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

@@ -15,4 +15,6 @@ public interface SysUserService extends IBaseService<SysUser> {
     SysUser login(LoginParam loginParm) throws Exception;
 
     boolean changePassword(SysUser user, ChangePassword param) throws Exception;
+
+    boolean mergeData(SysUser sysUser) throws Exception;
 }

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

@@ -1,13 +0,0 @@
-package com.example.civilizedcity.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.example.civilizedcity.entity.TdLocQuAnswer;
-
- /**
- * 点位问题答案;(td_loc_qu_answer)表服务接口
- * @author : http://njyunzhi.com
- * @date : 2022-12-13
- */
-public interface TdLocQuAnswerService extends IBaseService<TdLocQuAnswer> {
-    
-}

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

@@ -1,13 +0,0 @@
-package com.example.civilizedcity.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.example.civilizedcity.entity.TdLocQuestion;
-
- /**
- * 点位问题;(td_loc_question)表服务接口
- * @author : http://njyunzhi.com
- * @date : 2022-12-13
- */
-public interface TdLocQuestionService extends IBaseService<TdLocQuestion> {
-    
-}

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

@@ -0,0 +1,12 @@
+package com.example.civilizedcity.service;
+
+import com.example.civilizedcity.entity.TdQuAnswer;
+
+ /**
+ * 点位问题答案;(td_loc_qu_answer)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-13
+ */
+public interface TdQuAnswerService extends IBaseService<TdQuAnswer> {
+    
+}

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

@@ -0,0 +1,12 @@
+package com.example.civilizedcity.service;
+
+import com.example.civilizedcity.entity.TdQuestion;
+
+ /**
+ * 点位问题;(td_loc_question)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-13
+ */
+public interface TdQuestionService extends IBaseService<TdQuestion> {
+    
+}

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

@@ -1,16 +1,29 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.common.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysPosition;
 import com.example.civilizedcity.mapper.SysPositionMapper;
 import com.example.civilizedcity.service.SysPositionService;
- /**
+
+/**
  * 岗位表;(sys_position)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysPositionServiceImpl extends BaseServiceImpl<SysPositionMapper, SysPosition> implements SysPositionService {
-    
+
+    @Override
+    public long countInOrg(String orgId, String name, String nePosId) {
+        QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("name", name);
+        queryWrapper.ne(StringUtils.isEmpty(nePosId), "position_id", nePosId);
+
+        return count(queryWrapper);
+    }
 }

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

@@ -1,16 +1,36 @@
 package com.example.civilizedcity.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.common.Constants;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysResource;
 import com.example.civilizedcity.mapper.SysResourceMapper;
 import com.example.civilizedcity.service.SysResourceService;
- /**
+
+import java.util.List;
+
+/**
  * 资源表;(sys_resource)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, SysResource> implements SysResourceService {
-    
+
+    @Override
+    public List<SysResource> getByUser(String userId) {
+        if (userId == Constants.ROOT_ID) {
+            QueryWrapper<SysResource> queryWrapper = new QueryWrapper<>();
+            queryWrapper.gt("status", Constants.STATUS_DELETE);
+            return list(queryWrapper);
+        }
+
+        return baseMapper.getByUser(userId);
+    }
+
+    @Override
+    public List<SysResource> listBy(String typeCode, String roleId) {
+        return baseMapper.listBy(typeCode, roleId);
+    }
 }

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

@@ -5,12 +5,48 @@ import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysRoleResource;
 import com.example.civilizedcity.mapper.SysRoleResourceMapper;
 import com.example.civilizedcity.service.SysRoleResourceService;
- /**
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
  * 角色资源;(sys_role_resource)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysRoleResourceServiceImpl extends BaseServiceImpl<SysRoleResourceMapper, SysRoleResource> implements SysRoleResourceService {
-    
+
+    @Override
+    public boolean mergeData(String roleId, List<SysRoleResource> roleResourcesList) {
+        // 如果是空 list, 代表取消授权
+        if (roleResourcesList.size() == 0) {
+            removeByMap(new HashMap<String, Object>(){{
+                put("role_id", roleId);
+            }});
+            return true;
+        }
+
+        //
+        List<Integer> idList = new ArrayList<>();
+        for (SysRoleResource item: roleResourcesList) {
+            item.setRoleId(roleId);
+
+            SysRoleResource origin = baseMapper.getByRoleAndResource(roleId, item.getResourceId());
+            if (null != origin) {
+                item.setId(origin.getId());
+            } else {
+                baseMapper.insert(item);
+            }
+
+            idList.add(item.getId());
+        }
+
+        // 删除多余的数据
+        baseMapper.deleteNotIn(roleId, idList);
+
+        return true;
+    }
 }

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

@@ -1,16 +1,32 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.common.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.mapper.SysRoleMapper;
 import com.example.civilizedcity.service.SysRoleService;
- /**
+
+import java.util.List;
+
+/**
  * 系统角色;(sys_role)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
-    
+
+    @Override
+    public List<SysRole> getByUser(String userId) {
+        if (userId == Constants.ROOT_ID) {
+            QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.gt("status", Constants.STATUS_DELETE);
+            return list(queryWrapper);
+        }
+
+        return baseMapper.getByUser(userId);
+    }
 }

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

@@ -4,7 +4,10 @@ import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysLogin;
+import com.example.civilizedcity.entity.SysRole;
+import com.example.civilizedcity.entity.SysUserRole;
 import com.example.civilizedcity.mapper.SysLoginMapper;
+import com.example.civilizedcity.mapper.SysUserRoleMapper;
 import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +16,11 @@ import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.mapper.SysUserMapper;
 import com.example.civilizedcity.service.SysUserService;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * 用户表;(sys_user)表服务实现类
  *
@@ -25,6 +33,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Autowired
     SysLoginMapper sysLoginMapper;
 
+    @Autowired
+    SysUserRoleMapper sysUserRoleMapper;
+
     @Override
     public SysUser login(LoginParam loginParm) throws Exception {
         SysLogin sysLogin = sysLoginMapper.getByAccount(loginParm.getAccount());
@@ -69,6 +80,73 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
         return sysLoginMapper.updateById(sysLogin) > 0;
     }
 
+    @Override
+    public boolean mergeData(SysUser sysUser) throws Exception {
+        if (StringUtils.isEmpty(sysUser.getName())) {
+            throw new Exception("用户名称不能为空");
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 用户表
+        String userId = sysUser.getUserId();
+        if (StringUtils.isEmpty(userId)) {
+            if (!StringUtils.isEmpty(sysUser.getPhone())) {
+                SysUser origin = getExistBy("phone", sysUser.getPhone(), false, true);
+                if (null != origin) {
+                    throw new Exception("手机号重复");
+                }
+            }
+
+            if (null == sysUser.getStatus()) {
+                sysUser.setStatus(Constants.STATUS_NORMAL);
+            }
+
+            sysUser.setCreateDate(now);
+            save(sysUser);
+            userId = sysUser.getUserId();
+        } else {
+            if (!StringUtils.isEmpty(sysUser.getPhone())) {
+                SysUser origin = getByButNot("phone", sysUser.getPhone(), "user_id", userId, true);
+                if (null != origin) {
+                    throw new Exception("手机号重复");
+                }
+            }
+
+            //
+            updateById(sysUser);
+        }
+
+        // 授权角色
+        List<SysRole> rolesList = sysUser.getRolesList();
+        if (null == rolesList || rolesList.size() == 0) {
+            sysUserRoleMapper.deleteByMap(new HashMap<String, Object>() {{
+                put("user_id", sysUser.getUserId());
+            }});
+        } else {
+            List<Integer> idList = new ArrayList<>();
+            for (SysRole role : rolesList) {
+                SysUserRole item = new SysUserRole();
+                item.setUserId(sysUser.getUserId());
+                item.setRoleId(role.getRoleId());
+
+                SysUserRole exists = sysUserRoleMapper.getByUserAndRole(sysUser.getUserId(), role.getRoleId());
+                if (null != exists) {
+                    item.setId(exists.getId());
+                } else {
+                    sysUserRoleMapper.insert(item);
+                }
+
+                idList.add(item.getId());
+            }
+
+            // 去除垃圾数据
+            sysUserRoleMapper.deleteNotIn(sysUser.getUserId(), idList);
+        }
+
+        return true;
+    }
+
     boolean checkPassword(String src, String targ, String salt) {
         String newPass = EncryptUtils.md5(src, salt);
         return targ.equals(newPass);

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

@@ -1,16 +0,0 @@
-package com.example.civilizedcity.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TdLocQuAnswer;
-import com.example.civilizedcity.mapper.TdLocQuAnswerMapper;
-import com.example.civilizedcity.service.TdLocQuAnswerService;
- /**
- * 点位问题答案;(td_loc_qu_answer)表服务实现类
- * @author : http://www.chiner.pro
- * @date : 2022-12-13
- */
-@Service
-public class TdLocQuAnswerServiceImpl extends BaseServiceImpl<TdLocQuAnswerMapper, TdLocQuAnswer> implements TdLocQuAnswerService {
-    
-}

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

@@ -1,16 +0,0 @@
-package com.example.civilizedcity.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TdLocQuestion;
-import com.example.civilizedcity.mapper.TdLocQuestionMapper;
-import com.example.civilizedcity.service.TdLocQuestionService;
- /**
- * 点位问题;(td_loc_question)表服务实现类
- * @author : http://www.chiner.pro
- * @date : 2022-12-13
- */
-@Service
-public class TdLocQuestionServiceImpl extends BaseServiceImpl<TdLocQuestionMapper, TdLocQuestion> implements TdLocQuestionService {
-    
-}

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

@@ -0,0 +1,15 @@
+package com.example.civilizedcity.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TdQuAnswer;
+import com.example.civilizedcity.mapper.TdQuAnswerMapper;
+import com.example.civilizedcity.service.TdQuAnswerService;
+ /**
+ * 点位问题答案;(td_loc_qu_answer)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2022-12-13
+ */
+@Service
+public class TdQuAnswerServiceImpl extends BaseServiceImpl<TdQuAnswerMapper, TdQuAnswer> implements TdQuAnswerService {
+    
+}

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

@@ -0,0 +1,15 @@
+package com.example.civilizedcity.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TdQuestion;
+import com.example.civilizedcity.mapper.TdQuestionMapper;
+import com.example.civilizedcity.service.TdQuestionService;
+ /**
+ * 点位问题;(td_loc_question)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2022-12-13
+ */
+@Service
+public class TdQuestionServiceImpl extends BaseServiceImpl<TdQuestionMapper, TdQuestion> implements TdQuestionService {
+    
+}

src/main/resources/application.yml

@@ -30,8 +30,8 @@ yz:
 
 wx:
   miniapp:
-    appid:
-    secret:
+    appid: wxe44244d1a5ea3364
+    secret: b7dbbb7b51d40aa716115e76721ed3ff
     token:
     aesKey:
 

src/main/resources/mapper/SysResourceMapper.xml

@@ -2,5 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysResourceMapper">
-    
+
+    <select id="getByUser" resultType="com.example.civilizedcity.entity.SysResource">
+        SELECT DISTINCT
+            t.*
+        FROM
+            sys_resource t
+                INNER JOIN sys_role_resource s ON t.resource_id = s.resource_id
+                INNER JOIN sys_user_role m ON m.role_id = s.role_id
+        WHERE
+            m.user_id = #{userId}
+        ORDER BY
+            t.type_code,
+            t.sort_no ASC
+    </select>
+    <select id="listBy" resultType="com.example.civilizedcity.entity.SysResource">
+        SELECT
+            t.*
+        FROM
+            sys_resource t
+        <if test="roleId != null">
+            INNER JOIN sys_role_resource s ON s.resource_id = t.resource_id
+        </if>
+        WHERE
+            t.type_code = #{typeCode}
+        <if test="roleId != null">
+            AND s.role_id = #{roleId}
+        </if>
+        ORDER BY
+            t.sort_no ASC
+    </select>
 </mapper>

src/main/resources/mapper/SysRoleMapper.xml

@@ -2,5 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysRoleMapper">
-    
+
+    <select id="getByUser" resultType="com.example.civilizedcity.entity.SysRole">
+        SELECT DISTINCT
+            t.*
+        FROM
+            sys_role t
+                INNER JOIN sys_user_role s ON t.role_id = s.role_id
+        WHERE
+            s.user_id = #{userId}
+        ORDER BY
+            t.`name`
+    </select>
 </mapper>

src/main/resources/mapper/SysRoleResourceMapper.xml

@@ -2,5 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysRoleResourceMapper">
-    
+    <delete id="deleteNotIn">
+        DELETE t
+        FROM
+            sys_role_resource t
+        WHERE
+            t.role_id = #{roleId}
+            AND t.id NOT IN
+        <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </delete>
+
+    <select id="getByRoleAndResource" resultType="com.example.civilizedcity.entity.SysRoleResource">
+        SELECT
+            *
+        FROM
+            sys_role_resource t
+        WHERE
+            t.role_id = #{roleId}
+          AND t.resource_id = #{resourceId}
+    </select>
 </mapper>

src/main/resources/mapper/SysUserRoleMapper.xml

@@ -2,5 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysUserRoleMapper">
-    
+    <delete id="deleteNotIn">
+        DELETE t
+        FROM
+            sys_user_role t
+        WHERE
+            t.user_id = #{userId}
+        AND t.id NOT IN
+        <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </delete>
+
+    <select id="getByUserAndRole" resultType="com.example.civilizedcity.entity.SysUserRole">
+        SELECT
+            *
+        FROM
+            sys_user_role t
+        WHERE
+            t.user_id = #{userId}
+          AND t.role_id = #{roleId}
+    </select>
 </mapper>

src/main/resources/mapper/TdLocQuAnswerMapper.xml → src/main/resources/mapper/TdQuAnswerMapper.xml

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

src/main/resources/mapper/TdLocQuestionMapper.xml → src/main/resources/mapper/TdQuestionMapper.xml

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