Merge branch 'master' of http://git.ycjcjy.com/civilized_city/service

db/.back_文明创办/文明创办-backup-2023129082004.pdma.json → db/.back_文明创办/文明创办-backup-2023131183934.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-29 08:17:44",
+  "updatedTime": "2023-1-31 18:39:19",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1204,6 +1204,23 @@
           "uiHint": "",
           "id": "C3E43687-58A1-4E99-AE11-085F9B6688D7"
         },
+        {
+          "defKey": "is_user",
+          "defName": "是否系统用户",
+          "comment": "0市民,1系统用户",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
@@ -6921,9 +6938,32 @@
       "id": "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaFeedback"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_feedback",
       "defName": "反馈表",
@@ -7006,7 +7046,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -7048,6 +7088,39 @@
           "domain": "",
           "id": "2B36F8F1-9C06-434F-B4D5-0A28D587BA24"
         },
+        {
+          "defKey": "location",
+          "defName": "定位",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "2D8D31C7-FD0E-48DB-9538-FCF3B79E93AB"
+        },
+        {
+          "defKey": "addr",
+          "defName": "具体位置",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "215DDE0F-97A2-4DBC-99D5-31C8AF2768E9"
+        },
         {
           "defKey": "person_id",
           "defName": "反馈人ID",
@@ -7102,18 +7175,18 @@
         {
           "defKey": "verify_status",
           "defName": "审核状态",
-          "comment": "0未审,1通过,2驳回",
+          "comment": "null未审,pass通过,reject驳回",
           "type": "",
           "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "0",
+          "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "90567F1C-10F8-4BB2-9F32-B92B7077091B"
         },
         {
@@ -8371,9 +8444,32 @@
       "id": "38420D50-01AB-4E31-84D3-20192D26E25F",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckStand"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_check_stand",
       "defName": "测评标准",
@@ -8448,8 +8544,8 @@
       ],
       "fields": [
         {
-          "defKey": "id",
-          "defName": "ID",
+          "defKey": "statnd_id",
+          "defName": "标准ID",
           "comment": "",
           "type": "",
           "len": 32,
@@ -8465,11 +8561,11 @@
           "id": "219A66C3-6D3F-4F1E-A572-9E5294556142"
         },
         {
-          "defKey": "org_id",
-          "defName": "机构ID",
+          "defKey": "content",
+          "defName": "测评标准",
           "comment": "",
-          "type": "",
-          "len": "",
+          "type": "TEXT",
+          "len": 0,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -8477,7 +8573,7 @@
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "domain": "",
           "id": "30776463-B5E8-44DB-B5B6-45817A48E59F",
           "uiHint": ""
         },
@@ -8531,29 +8627,147 @@
           "refDict": "",
           "uiHint": "",
           "id": "DED8CFDE-66A8-4460-A94A-2AAA1D169C5D"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
+    },
+    {
+      "id": "78C3BB38-9B37-445B-A311-168B4682FE5E",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ts_stat_data",
+      "defName": "常用统计",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
         },
         {
-          "defKey": "update_user",
-          "defName": "更新人",
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "stat_no",
+          "defName": "序号",
           "comment": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "type": "",
-          "len": 32,
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "E7763878-4C25-476F-8C26-56BF7E0A9F35"
+        },
+        {
+          "defKey": "stat_type",
+          "defName": "统计类型",
+          "comment": "",
+          "type": "",
+          "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
           "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "49707BF9-E174-4ABA-8527-2C6A0996FE43",
+          "uiHint": ""
+        },
+        {
+          "defKey": "name",
+          "defName": "指标名称",
+          "comment": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "06EC3E88-DE3F-43F9-A155-D2454F4D8C4E"
+          "id": "22B03E6C-E6FD-4D4F-855B-87E5F8EF79BF"
         },
         {
-          "defKey": "update_date",
-          "defName": "更新时间",
+          "defKey": "value",
+          "defName": "统计值",
           "comment": "",
-          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "type": "",
           "len": "",
           "scale": "",
@@ -8564,7 +8778,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "4C2C2D21-B0E0-4279-AD8B-F7359B17B7AB"
+          "id": "5DC510CC-D45C-42D4-AEED-5AD9130E0D88"
         }
       ],
       "correlations": [],
@@ -9004,6 +9218,17 @@
       "refDiagrams": [],
       "refDicts": [],
       "id": "96B34919-1A2F-4E7A-87B9-0330F40F7DF2"
+    },
+    {
+      "defKey": "stat",
+      "defName": "查询统计",
+      "refEntities": [
+        "78C3BB38-9B37-445B-A311-168B4682FE5E"
+      ],
+      "refViews": [],
+      "refDiagrams": [],
+      "refDicts": [],
+      "id": "49C90869-CA44-48D0-A675-ECCB8853A412"
     }
   ],
   "dataTypeMapping": {

db/job_stat_issue_daily.sql

@@ -0,0 +1,8 @@
+DROP EVENT IF EXISTS `job_stat_issue_daily`;
+delimiter ;;
+CREATE EVENT `job_stat_issue_daily`
+ON SCHEDULE
+EVERY '1' DAY STARTS '2023-02-01 01:00:00'
+DO CALL pro_stat_issue('issue_daily', DATE_SUB(CURDATE(), INTERVAL 1 DAY), DATE_SUB(CURDATE(), INTERVAL 1 DAY))
+;;
+delimiter ;

db/job_stat_issue_monthly.sql

@@ -0,0 +1,8 @@
+DROP EVENT IF EXISTS `job_stat_issue_monthly`;
+delimiter ;;
+CREATE EVENT `job_stat_issue_monthly`
+ON SCHEDULE
+EVERY '1' MONTH STARTS '2023-02-01 01:00:00'
+DO CALL pro_stat_issue('issue_monthly', DATE_ADD(LAST_DAY(DATE_SUB(NOW(), INTERVAL 2 MONTH)), INTERVAL 1 DAY), LAST_DAY(DATE_SUB(NOW(), INTERVAL 1 MONTH)))
+;;
+delimiter ;

db/pro_stat_issue.sql

@@ -0,0 +1,28 @@
+DROP PROCEDURE IF EXISTS `pro_stat_issue`;
+delimiter ;;
+CREATE PROCEDURE `pro_stat_issue`(IN `ls_type` varchar(32),IN `ls_start` varchar(20),IN `ls_end` varchar(20))
+BEGIN
+	DECLARE ls_stat_name VARCHAR(20);
+	
+	IF ls_type = 'issue_daily' OR ls_type = 'issue_monthly' THEN
+		SET ls_stat_name = ls_start;
+		IF ls_type = 'issue_monthly' THEN
+			SET ls_stat_name = SUBSTR(ls_start FROM 1 FOR 7);
+		END IF;
+	
+		# 先清除数据
+		DELETE t FROM ts_stat_data t WHERE t.stat_type = ls_type AND t.`name` = ls_stat_name;
+		
+		# 再统计数据
+		INSERT INTO ts_stat_data (stat_type, `name`, `value`)
+		SELECT ls_type, ls_stat_name, COUNT(*)
+		FROM ta_issue t
+		WHERE t.`status` > -1
+		AND TO_DAYS(t.create_date) >= TO_DAYS(ls_start)
+		AND TO_DAYS(t.create_date) <= TO_DAYS(ls_end);
+		
+	END IF;	
+	
+END
+;;
+delimiter ;

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-29 08:20:04",
+  "updatedTime": "2023-1-31 18:39:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1205,6 +1205,23 @@
           "uiHint": "",
           "id": "C3E43687-58A1-4E99-AE11-085F9B6688D7"
         },
+        {
+          "defKey": "is_user",
+          "defName": "是否系统用户",
+          "comment": "0市民,1系统用户",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
@@ -6922,9 +6939,32 @@
       "id": "EF3D4E17-6CE0-4944-B1DC-40280B2B689F",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaFeedback"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_feedback",
       "defName": "反馈表",
@@ -7007,7 +7047,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
@@ -7049,6 +7089,39 @@
           "domain": "",
           "id": "2B36F8F1-9C06-434F-B4D5-0A28D587BA24"
         },
+        {
+          "defKey": "location",
+          "defName": "定位",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "id": "2D8D31C7-FD0E-48DB-9538-FCF3B79E93AB"
+        },
+        {
+          "defKey": "addr",
+          "defName": "具体位置",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "id": "215DDE0F-97A2-4DBC-99D5-31C8AF2768E9"
+        },
         {
           "defKey": "person_id",
           "defName": "反馈人ID",
@@ -7103,18 +7176,18 @@
         {
           "defKey": "verify_status",
           "defName": "审核状态",
-          "comment": "0未审,1通过,2驳回",
+          "comment": "null未审,pass通过,reject驳回",
           "type": "",
           "len": "",
           "scale": "",
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "0",
+          "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "90567F1C-10F8-4BB2-9F32-B92B7077091B"
         },
         {
@@ -8372,9 +8445,32 @@
       "id": "38420D50-01AB-4E31-84D3-20192D26E25F",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckStand"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_check_stand",
       "defName": "测评标准",
@@ -8536,6 +8632,158 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "78C3BB38-9B37-445B-A311-168B4682FE5E",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "ts_stat_data",
+      "defName": "常用统计",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "stat_no",
+          "defName": "序号",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": true,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "refDict": "",
+          "uiHint": "",
+          "id": "E7763878-4C25-476F-8C26-56BF7E0A9F35"
+        },
+        {
+          "defKey": "stat_type",
+          "defName": "统计类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "49707BF9-E174-4ABA-8527-2C6A0996FE43",
+          "uiHint": ""
+        },
+        {
+          "defKey": "name",
+          "defName": "指标名称",
+          "comment": "",
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "22B03E6C-E6FD-4D4F-855B-87E5F8EF79BF"
+        },
+        {
+          "defKey": "value",
+          "defName": "统计值",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "5DC510CC-D45C-42D4-AEED-5AD9130E0D88"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -8971,6 +9219,17 @@
       "refDiagrams": [],
       "refDicts": [],
       "id": "96B34919-1A2F-4E7A-87B9-0330F40F7DF2"
+    },
+    {
+      "defKey": "stat",
+      "defName": "查询统计",
+      "refEntities": [
+        "78C3BB38-9B37-445B-A311-168B4682FE5E"
+      ],
+      "refViews": [],
+      "refDiagrams": [],
+      "refDicts": [],
+      "id": "49C90869-CA44-48D0-A675-ECCB8853A412"
     }
   ],
   "dataTypeMapping": {

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

@@ -3,6 +3,7 @@ package com.example.civilizedcity.common;
 import cn.dev33.satoken.stp.StpUtil;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.SysUserService;
 import com.example.civilizedcity.service.TaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Component
 public class BaseController {
@@ -23,6 +25,9 @@ public class BaseController {
     @Autowired
     protected TaPersonService taPersonService;
 
+    @Autowired
+    protected SysUserDutyService sysUserDutyService;
+
     public SysUser currentUser() throws Exception {
         String loginId = StpUtil.getLoginIdAsString();
         if (StringUtils.isEmpty(loginId)) {
@@ -52,4 +57,16 @@ public class BaseController {
 
         return taPerson;
     }
+
+    public boolean isManager(SysUser sysUser) throws Exception {
+        if (Constants.ROOT_ORG.equals(sysUser.getOrgId())) return true;
+
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        sysUser.setDutyList(dutyList);  // 添加了一点副作用
+        if (null != dutyList && (dutyList.contains(Constants.DUTY_MANAGER) || dutyList.contains(Constants.DUTY_QUERY_PERSON))) {
+            return true;
+        }
+
+        return false;
+    }
 }

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

@@ -24,6 +24,8 @@ public class Constants {
 
     // 问题单
     public final static String ATTACH_SOURCE_ISSUE = "issue";
+    // 市民上报
+    public final static String ATTACH_SOURCE_FEEDBACK = "feedback";
     // 单位问题单
     public final static String ATTACH_SOURCE_ORG_ISSUE = "org-issue";
     // 测评答案
@@ -57,8 +59,8 @@ public class Constants {
 
     // 流程起始: 待交办
     public final static String PROCESS_START = "start";
-    // 流程: 被打回 - 市民提交
-    public final static String PROCESS_REJECT = "reject";
+    // 流程: 被打回 - 市民提交 - 算办结
+//    public final static String PROCESS_REJECT = "reject";
 
     // 审核
     public final static String PROCESS_VERIFY = "verify";

src/main/java/com/example/civilizedcity/config/WxMaUitl.java

@@ -41,6 +41,10 @@ public class WxMaUitl {
         return service.getUserService().getPhoneNoInfo(param.getSessionKey(), param.getEncryptedData(), param.getIv());
     }
 
+    public WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException {
+        return service.getUserService().getNewPhoneNoInfo(code);
+    }
+
     @Data
     public static class AuthParam {
         String signature;

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

@@ -5,7 +5,9 @@ import com.example.civilizedcity.common.ResponseBean;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.service.TaIssueService;
+import com.example.civilizedcity.service.TsStatDataService;
 import com.example.civilizedcity.vo.StatVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,16 +16,21 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 查询统计
  */
+@Api(tags = "常用统计对象功能接口")
 @RestController
 public class StatController extends BaseController {
 
     @Autowired
     TaIssueService taIssueService;
 
+    @Autowired
+    TsStatDataService tsStatDataService;
+
     @ApiOperation("小程序首页查询统计")
     @GetMapping("/ma/index-stat")
     public ResponseBean getMaIndex(@ApiParam("身份") @RequestParam(value = "duty", required = false) String duty) throws Exception {
@@ -35,14 +42,45 @@ public class StatController extends BaseController {
         } catch (Exception e) {
             //
         }
-        try {
-            person = currentPerson();
-        } catch (Exception e) {
-            //
+
+        person = currentPerson();
+        if (null == person) {
+            return ResponseBean.error("请在小程序端操作");
         }
 
-        List<StatVo> result = taIssueService.statMaIndex(user, duty);
+        List<StatVo> result = taIssueService.statMaIndex(user, person, duty);
+
+        return ResponseBean.success(result);
+    }
+
+    @ApiOperation("管理端首页统计")
+    @GetMapping("/stat/admin/index-banner")
+    public ResponseBean statAdminIndexBanner() throws Exception {
+        Map<String, Object> result = tsStatDataService.statAdminIndexBanner();
+        return ResponseBean.success(result);
+    }
+
+    @ApiOperation("问题单数量查询统计")
+    @GetMapping("/stat/issue")
+    public ResponseBean statIssueData(@ApiParam("统计类型") @RequestParam String statType,
+                                      @ApiParam("开始日期") @RequestParam String startDate,
+                                      @ApiParam("结束日期") @RequestParam String endDate,
+                                      @ApiParam("统计条数") @RequestParam Integer num) throws Exception {
+        List<StatVo> result = tsStatDataService.statIssue(statType, startDate, endDate, num);
+        return ResponseBean.success(result);
+    }
+
+    @ApiOperation("单位交办统计")
+    @GetMapping("/stat/issue/org")
+    public ResponseBean statIssueOrg(@ApiParam("单位ID") @RequestParam String orgId) throws Exception {
+        List<StatVo> result = tsStatDataService.statIssueOrg(orgId);
+        return ResponseBean.success(result);
+    }
 
+    @ApiOperation("问题分类统计")
+    @GetMapping("/stat/issue/type")
+    public ResponseBean statIssueType() throws Exception {
+        List<StatVo> result = tsStatDataService.statIssueType();
         return ResponseBean.success(result);
     }
 }

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

@@ -12,6 +12,7 @@ import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysRole;
+import com.example.civilizedcity.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -145,7 +146,22 @@ 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) throws Exception {
+        SysUser sysUser = currentUser();
+
+        if (Constants.ROOT_ID.equals(id)) {
+            return ResponseBean.error("系统机构, 禁止删除");
+        }
+
+        long count = sysOrgService.countBy("org_p_id", id, true);
+        if (count > 0) {
+            return ResponseBean.error("请先删除子级单位");
+        }
+
+        if (!Constants.ROOT_ORG.equals(sysUser.getOrgId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
         sysOrgService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -107,6 +107,7 @@ public class SysUserController extends BaseController {
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+        queryWrapper.eq("is_user", 1);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.ne("user_id", Constants.ROOT_ID);
         queryWrapper.orderByDesc("create_date");

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

@@ -0,0 +1,149 @@
+package com.example.civilizedcity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.ResponseBean;
+import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.service.TaAttachService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.example.civilizedcity.entity.TaFeedback;
+import com.example.civilizedcity.service.TaFeedbackService;
+
+ /**
+ * 反馈表;(ta_feedback)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-30
+ */
+@Api(tags = "反馈表对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaFeedbackController extends BaseController {
+    
+    @Autowired
+    private TaFeedbackService taFeedbackService;
+
+    @Autowired
+    private TaAttachService taAttachService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taFeedback/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaFeedback taFeedback = taFeedbackService.getById(id);
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_FEEDBACK, taFeedback.getFeedbackId());
+        taFeedback.setAttachList(attachList);
+        return ResponseBean.success(taFeedback);
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taFeedback")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("我的") @RequestParam(value ="isMine", defaultValue = "false") Boolean isMine,
+                             @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus) throws Exception {
+
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson && isMine) {
+            return ResponseBean.error("请在小程序中操作");
+        }
+
+        String personId = isMine ? taPerson.getPersonId() : null;
+        
+        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+        IPage<TaIssue> result = taFeedbackService.getPageBy(pg, personId, bizStatus);
+        
+        return ResponseBean.success(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param taFeedback 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/taFeedback")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback) throws Exception {
+
+        if (StringUtils.isEmpty(taFeedback.getContent())) {
+            return ResponseBean.error("请填写反馈内容");
+        }
+        if (StringUtils.isEmpty(taFeedback.getAddr())) {
+            return ResponseBean.error("请填写具体位置");
+        }
+
+        if (null == taFeedback.getAttachList() || taFeedback.getAttachList().size() == 0) {
+            return ResponseBean.error("请上传照片");
+        }
+
+        TaPerson taPerson = currentPerson();
+
+        taFeedbackService.createNew(taFeedback, taPerson);
+        return ResponseBean.success(taFeedback);
+    }
+    
+//    /**
+//     * 更新数据
+//     *
+//     * @param taFeedback 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/taFeedback/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback,
+//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+//        taFeedbackService.updateById(taFeedback);
+//        return ResponseBean.success(taFeedback);
+//    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param feedbackId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taFeedback/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson) {
+            return ResponseBean.error("请在小程序中操作");
+        }
+
+        TaFeedback taFeedback = taFeedbackService.getById(id);
+        if (null == taFeedback || taFeedback.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到相关数据");
+        }
+
+        if (!taPerson.getPersonId().equals(taFeedback.getPersonId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        taFeedbackService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
+}

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

@@ -13,6 +13,7 @@ import java.util.List;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.event.MessagEvent;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.TaIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,9 @@ public class TaIssueApplyController extends BaseController {
     @Autowired
     private TaIssueService taIssueService;
 
+    @Autowired
+    private SysUserDutyService sysUserDutyService;
+
     @Autowired
     ApplicationEventPublisher applicationEventPublisher;
 
@@ -66,11 +70,14 @@ public class TaIssueApplyController extends BaseController {
                                        @ApiParam("申请类型") @RequestParam("applyType") String applyType) throws Exception {
 
         SysUser sysUser = currentUser();
+        boolean isManager = isManager(sysUser);
 
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("issue_id", issueId);
         queryWrapper.eq("apply_type", applyType);
-        queryWrapper.eq("org_id", sysUser.getOrgId());
+        if (!isManager) {
+            queryWrapper.eq("org_id", sysUser.getOrgId());
+        }
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         queryWrapper.last("limit 1");
@@ -91,14 +98,15 @@ public class TaIssueApplyController extends BaseController {
     @GetMapping("/taIssueApply")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) Integer issueId,
                              @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
                              @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
 
         SysUser sysUser = currentUser();
-        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
+        String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
 
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, applyType, orgId, sourceType);
+        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType);
 
         return ResponseBean.success(result);
     }
@@ -150,9 +158,17 @@ public class TaIssueApplyController extends BaseController {
 
         taIssueApplyService.updateById(origin);
 
-        // 清空当前申请 - 表示申请流程已走完
+        //
         taIssueService.updateApply(taIssueApply.getIssueId(), null, null);
 
+        // 如果是销单申请
+        if (Constants.APPLY_END.equals(origin.getApplyType())) {
+            if (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus())) {
+                // 如果通过
+                taIssueService.updateEnd(sysUser, taIssueApply.getOrgId(), taIssueApply.getIssueId());
+            }
+        }
+
 //        if (Constants.APPLY_VERIFY.equals(origin.getApplyType())) {
 //            int validateStatus = Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus()) ? Constants.VERIFY_REJECT : Constants.VERIFY_PASS;
 //            taIssueService.updateValidateStatus(taIssueApply.getIssueId(), validateStatus);

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

@@ -89,22 +89,21 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        Boolean mine = true;
-        Integer validateStatus = null;
-        if (isRooter) {
-            mine = false;
-        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
-            mine = true;
-        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
-            mine = true;
-            validateStatus = 0;
-        } else {
-            return ResponseBean.error("暂无权限查询数据");
-        }
+//        Boolean mine = true;
+//        Integer validateStatus = null;
+//        if (isRooter) {
+//            mine = false;
+//        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+//            mine = true;
+//        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
+//            mine = false;
+//            validateStatus = 0;
+//        } else {
+//            return ResponseBean.error("暂无权限查询数据");
+//        }
 
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("org_id", orgId);
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
@@ -125,15 +124,10 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
-        // 既是督察员又是管理员
-        if (!isRooter) {
-            if (dutyList.contains(Constants.DUTY_MANAGER)) {
-                // 管理员
-                queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", 0));
-            } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
-                // 督察员
-                queryWrapper.eq("create_user", sysUser.getUserId());
-            }
+        // 督察员
+        if (dutyList.contains(Constants.DUTY_INSPECTOR) && !dutyList.contains(Constants.DUTY_MANAGER)) {
+            // 督察员
+            queryWrapper.eq("create_user", sysUser.getUserId());
         }
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);

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

@@ -74,6 +74,7 @@ public class TaIssueProcessController extends BaseController {
         IPage<TaIssueProcess> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssueProcess> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("issue_id", issueId);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<TaIssueProcess> result = taIssueProcessService.page(pg, queryWrapper);
 
@@ -157,6 +158,8 @@ public class TaIssueProcessController extends BaseController {
 
         if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
             return ResponseBean.error("请指定交办单位");
+        } else {
+            taIssue.setOrgId(taIssueProcess.getOrgId());
         }
         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
             return ResponseBean.error("请设置截止日期");
@@ -177,7 +180,7 @@ public class TaIssueProcessController extends BaseController {
 
         updateIssue(taIssue, taIssueProcess);
 
-        taOrgIssueService.createNewIssue(taIssue, taIssueProcess, sysUser);
+        taOrgIssueService.createNewIssue(taIssue, sysUser);
 
         return ResponseBean.success(taIssueProcess);
     }

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

@@ -60,11 +60,13 @@ public class TdQuestionController extends BaseController {
     @GetMapping("/tdQuestion")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                             @ApiParam("标题") @RequestParam(value = "title", required = false) String title) throws Exception {
+                             @ApiParam("标题") @RequestParam(value = "title", required = false) String title,
+                             @ApiParam("问题类型") @RequestParam(value = "quType", required = false) String quType) throws Exception {
 
         IPage<TdQuestion> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TdQuestion> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
+        queryWrapper.eq(!StringUtils.isEmpty(quType), "qu_type", quType);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<TdQuestion> result = tdQuestionService.page(pg, queryWrapper);

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

@@ -172,10 +172,10 @@ public class WxMaController extends BaseController {
 
     @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
     @PutMapping("/auth-phone")
-    public ResponseBean updateUserPhone(@ApiParam("授权手机的参数") @RequestBody WxMaUitl.AuthParam param) throws Exception {
+    public ResponseBean updateUserPhone(@ApiParam("授权手机的Code") @RequestParam String code) throws Exception {
 
         // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = wxMaUitl.getPhoneNoInfo(param);
+        WxMaPhoneNumberInfo phoneNoInfo = wxMaUitl.getPhoneNoInfo(code);
 
         TaPerson taPerson = currentPerson();
         if (null == taPerson) {
@@ -185,7 +185,9 @@ public class WxMaController extends BaseController {
         taPerson.setPhone(phoneNoInfo.getPhoneNumber());
         taPersonService.updateById(taPerson);
 
-        return ResponseBean.success(taPerson);
+        Map<String, Object> res = sysLoginService.loginByPerson(taPerson);
+
+        return ResponseBean.success(res);
     }
 
     @PostMapping("/change-password")

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

@@ -45,6 +45,9 @@ public class SysUser implements Serializable,Cloneable{
     /** 机构ID */
     @ApiModelProperty(name = "机构ID",notes = "")
     private String orgId ;
+     /** 是否系统用户 */
+     @ApiModelProperty(name = "是否系统用户",notes = "")
+     private Boolean isUser ;
     /** 状态 */
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;

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

@@ -0,0 +1,76 @@
+package com.example.civilizedcity.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 反馈表;
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "反馈表",description = "")
+@TableName("ta_feedback")
+public class TaFeedback implements Serializable,Cloneable{
+    /** 反馈ID */
+    @ApiModelProperty(name = "反馈ID",notes = "")
+    @TableId(value = "feedback_id", type = IdType.ASSIGN_UUID)
+    private String feedbackId ;
+    /** 反馈标题 */
+    @ApiModelProperty(name = "反馈标题",notes = "")
+    private String title ;
+    /** 详情 */
+    @ApiModelProperty(name = "详情",notes = "")
+    private String content ;
+    /** 定位 */
+    @ApiModelProperty(name = "定位",notes = "")
+    private String location ;
+    /** 具体位置 */
+    @ApiModelProperty(name = "具体位置",notes = "")
+    private String addr ;
+    /** 反馈人ID */
+    @ApiModelProperty(name = "反馈人ID",notes = "")
+    private String personId ;
+    /** 反馈人姓名 */
+    @ApiModelProperty(name = "反馈人姓名",notes = "")
+    private String name ;
+    /** 联系电话 */
+    @ApiModelProperty(name = "联系电话",notes = "")
+    private String phone ;
+    /** 审核状态;0未审,1通过,2驳回 */
+    @ApiModelProperty(name = "审核状态",notes = "null未审,pass通过,reject驳回")
+    private String verifyStatus ;
+    /** 审核意见 */
+    @ApiModelProperty(name = "审核意见",notes = "")
+    private String verifyDesc ;
+    /** 关联问题单 */
+    @ApiModelProperty(name = "关联问题单",notes = "")
+    private String issueId ;
+    /** 机构ID */
+    @ApiModelProperty(name = "机构ID",notes = "")
+    private String orgId ;
+    /** 状态 */
+    @ApiModelProperty(name = "状态",notes = "")
+    private Integer status ;
+    /** 创建时间 */
+    @ApiModelProperty(name = "创建时间",notes = "")
+    private LocalDateTime createDate ;
+
+
+     @TableField(exist = false)
+     @ApiModelProperty(name = "文件列表",notes = "")
+     private List<TaAttach> attachList;
+}

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

@@ -0,0 +1,39 @@
+package com.example.civilizedcity.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 常用统计;
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "常用统计",description = "")
+@TableName("ts_stat_data")
+public class TsStatData implements Serializable,Cloneable{
+    /** 序号 */
+    @ApiModelProperty(name = "序号",notes = "")
+    @TableId(value = "stat_no", type = IdType.ASSIGN_UUID)
+    private Integer statNo ;
+    /** 统计类型 */
+    @ApiModelProperty(name = "统计类型",notes = "")
+    private String statType ;
+    /** 指标名称 */
+    @ApiModelProperty(name = "指标名称",notes = "")
+    private String name ;
+    /** 统计值 */
+    @ApiModelProperty(name = "统计值",notes = "")
+    private Integer value ;
+
+}

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

@@ -5,11 +5,16 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysUser;
 
- /**
+import java.util.List;
+
+/**
  * 用户表;(sys_user)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface SysUserMapper  extends BaseMapper<SysUser>{
- }
+     List<SysUser> getListByPhone(@Param("phone") String phone);
+
+    long countAll(@Param("rootId") String rootId);
+}

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

@@ -0,0 +1,31 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.entity.TaIssue;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.example.civilizedcity.entity.TaFeedback;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 反馈表;(ta_feedback)表数据库访问层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-30
+ */
+@Mapper
+public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
+
+    long countByVerifyStatus(@Param("personId") String personId, @Param("verifyStatus") String verifyStatus);
+
+    Map<String, Object> statMaIndex(@Param("personId") String personId);
+
+    IPage<TaIssue> getPageBy(IPage<TaIssue> pg,
+                             @Param("personId") String personId,
+                             @Param("processList") List<String> processList,
+                             @Param("verifyStatus") String verifyStatus);
+}

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

@@ -15,6 +15,7 @@ import com.example.civilizedcity.entity.TaIssueApply;
 public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
 
      IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg,
+                                   @Param("issueId") Integer issueId,
                                    @Param("applyType") String applyType,
                                    @Param("orgId") String orgId,
                                    @Param("sourceType") String sourceType);

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

@@ -2,11 +2,12 @@ package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.MapKey;
+import com.example.civilizedcity.vo.StatVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaIssue;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,6 +28,14 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
 
      int updateValidateStatus(@Param("issueId") Integer issueId, @Param("validateStatus") int validateStatus);
 
-     @MapKey("id")
      Map<String, Object> statMaIndex(@Param("userId") String userId);
- }
+
+     Map<String, Object> statIssueOrg(@Param("orgId") String orgId);
+
+     List<StatVo> statIssueType();
+
+    int updateProcess(@Param("issueId") Integer issueId,
+                      @Param("userId") String userId,
+                      @Param("processNode") String processNode,
+                      @Param("processStatus") String processStatus);
+}

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

@@ -27,6 +27,7 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
 
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
 
-     @MapKey("id")
      Map<String, Object> statMaIndex(@Param("orgId") String orgId);
- }
+
+    int updateProcess(@Param("issueId") Integer issueId,@Param("orgId") String orgId,@Param("processStatus") String processStatus);
+}

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

@@ -0,0 +1,25 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.civilizedcity.vo.StatVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.example.civilizedcity.entity.TsStatData;
+
+import java.util.List;
+
+/**
+ * 常用统计;(ts_stat_data)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-31
+ */
+@Mapper
+public interface TsStatDataMapper  extends BaseMapper<TsStatData>{
+    List<StatVo> statIssueDaily(@Param("startDate") String startDate,
+                                @Param("endDate") String endDate,
+                                @Param("num") Integer num);
+
+    List<StatVo> statIssueMonthly(@Param("startDate") String startDate,
+                                  @Param("endDate") String endDate,
+                                  @Param("num") Integer num);
+}

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

@@ -3,8 +3,11 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysLogin;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.vo.WxChangePwd;
 
+import java.util.Map;
+
 /**
  * 系统账户表;(sys_login)表服务接口
  * @author : http://njyunzhi.com
@@ -13,4 +16,6 @@ import com.example.civilizedcity.vo.WxChangePwd;
 public interface SysLoginService extends IBaseService<SysLogin> {
 
      boolean changePassword(SysUser user, WxChangePwd wxChangePwd);
- }
+
+    Map<String, Object> loginByPerson(TaPerson taPerson);
+}

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

@@ -0,0 +1,20 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TaFeedback;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
+
+/**
+ * 反馈表;(ta_feedback)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-30
+ */
+public interface TaFeedbackService extends IBaseService<TaFeedback> {
+
+    void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception;
+
+    IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus);
+}

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

@@ -14,5 +14,5 @@ public interface TaIssueApplyService extends IBaseService<TaIssueApply> {
 
      void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception;
 
-     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, String applyType, String orgId, String sourceType);
+     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType);
  }

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

@@ -1,9 +1,9 @@
 package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.vo.StatVo;
 
 import java.util.List;
@@ -21,5 +21,7 @@ public interface TaIssueService extends IBaseService<TaIssue> {
 
      void updateApply(Integer issueId, String applyType, Integer applyId);
 
-     List<StatVo> statMaIndex(SysUser user, String duty);
- }
+     List<StatVo> statMaIndex(SysUser user, TaPerson person, String duty);
+
+    void updateEnd(SysUser sysUser, String orgId, Integer issueId);
+}

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

@@ -15,5 +15,5 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
 
-     void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser);
+     void createNewIssue(TaIssue taIssue, SysUser sysUser);
  }

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

@@ -0,0 +1,24 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TsStatData;
+import com.example.civilizedcity.vo.StatVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 常用统计;(ts_stat_data)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-31
+ */
+public interface TsStatDataService extends IBaseService<TsStatData> {
+
+     List<StatVo> statIssue(String statType, String startDate, String endDate, Integer num);
+
+    List<StatVo> statIssueOrg(String orgId);
+
+    List<StatVo> statIssueType();
+
+    Map<String, Object> statAdminIndexBanner();
+}

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

@@ -1,7 +1,12 @@
 package com.example.civilizedcity.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.mapper.SysUserDutyMapper;
+import com.example.civilizedcity.mapper.SysUserMapper;
 import com.example.civilizedcity.vo.WxChangePwd;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -9,6 +14,12 @@ import com.example.civilizedcity.entity.SysLogin;
 import com.example.civilizedcity.mapper.SysLoginMapper;
 import com.example.civilizedcity.service.SysLoginService;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 系统账户表;(sys_login)表服务实现类
  *
@@ -18,6 +29,12 @@ import com.example.civilizedcity.service.SysLoginService;
 @Service
 public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogin> implements SysLoginService {
 
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Autowired
+    SysUserDutyMapper sysUserDutyMapper;
+
     @Override
     public boolean changePassword(SysUser user, WxChangePwd wxChangePwd) {
 
@@ -26,4 +43,45 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
 
         return false;
     }
+
+    @Override
+    public Map<String, Object> loginByPerson(TaPerson taPerson) {
+        Map<String, Object> res = new HashMap<>();
+        SysUser user = null;
+
+                List<SysUser> sysUserList = sysUserMapper.getListByPhone(taPerson.getPhone());
+        if (null == sysUserList || sysUserList.size() < 1) {
+            user = new SysUser();
+            user.setPhone(taPerson.getPhone());
+            user.setIsUser(false);
+            user.setOrgId(taPerson.getPersonId()); // 机构ID 使用用户ID , 目前没有使用到
+            user.setStatus(Constants.STATUS_NORMAL);
+            user.setCreateDate(LocalDateTime.now());
+            sysUserMapper.insert(user);
+
+            if (null == sysUserList) {
+                sysUserList = new ArrayList<>();
+            }
+
+            sysUserList.add(user);
+        } else {
+            if (sysUserList.size() == 1) {
+                user = sysUserList.get(0);
+            } else {
+                user = sysUserList.stream().filter(x -> x.getIsUser()).findFirst().get();
+            }
+        }
+
+        // 获取人员身份
+        List<String> dutyList = sysUserDutyMapper.getListByUser(user.getUserId());
+        user.setDutyList(dutyList);
+
+        // 登录新用户
+        StpUtil.login(user.getUserId(), "miniapp");
+        res.put("user", user);
+        res.put("person", taPerson);
+        res.put("token", StpUtil.getTokenValue());
+
+        return res;
+    }
 }

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

@@ -20,7 +20,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
 
     @Override
     public List<SysResource> getByUser(String userId) {
-        if (userId == Constants.ROOT_ID) {
+        if (Constants.ROOT_ID.equals(userId)) {
             QueryWrapper<SysResource> queryWrapper = new QueryWrapper<>();
             queryWrapper.gt("status", Constants.STATUS_DELETE);
             return list(queryWrapper);

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

@@ -21,7 +21,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole>
 
     @Override
     public List<SysRole> getByUser(String userId) {
-        if (userId == Constants.ROOT_ID) {
+        if (Constants.ROOT_ID.equals(userId)) {
             QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.gt("status", Constants.STATUS_DELETE);
             return list(queryWrapper);

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.example.civilizedcity.common.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysUserDuty;

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

@@ -0,0 +1,133 @@
+package com.example.civilizedcity.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.mapper.TaAttachMapper;
+import com.example.civilizedcity.mapper.TaIssueMapper;
+import com.example.civilizedcity.mapper.TaPersonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TaFeedback;
+import com.example.civilizedcity.mapper.TaFeedbackMapper;
+import com.example.civilizedcity.service.TaFeedbackService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 反馈表;(ta_feedback)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-30
+ */
+@Service
+public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements TaFeedbackService {
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception {
+
+        // 准备 TaFeedback 数据
+        taFeedback.setFeedbackId(StringUtils.uuid());
+
+        if (StringUtils.isEmpty(taFeedback.getName())) {
+            taFeedback.setName(taPerson.getName());
+        } else {
+            if (StringUtils.isEmpty(taPerson.getName())) {
+                taPerson.setName(taFeedback.getName());
+                taPersonMapper.updateById(taPerson);
+            }
+        }
+
+        if (StringUtils.isEmpty(taFeedback.getPhone())) {
+            taFeedback.setPhone(taPerson.getPhone());
+        }
+
+        taFeedback.setPersonId(taPerson.getPersonId());
+        taFeedback.setStatus(Constants.STATUS_NORMAL);
+        taFeedback.setCreateDate(LocalDateTime.now());
+
+        // 准备 TaIssue 数据
+        TaIssue taIssue = new TaIssue();
+        taIssue.setTitle(taFeedback.getTitle());
+        taIssue.setLocation(taFeedback.getLocation());
+        taIssue.setAddr(taFeedback.getAddr());
+        taIssue.setContent(taFeedback.getContent());
+
+        taIssue.setOrgId(null); // 暂时没有责任单位
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssue.setProcessNum(1);
+        taIssue.setSourceType(Constants.ISSUE_SOURCE_FEEDBACK);
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreateUser(taFeedback.getPersonId());
+        taIssue.setUserName(taFeedback.getName());
+        taIssue.setCreateDate(LocalDateTime.now());
+        taIssueMapper.insert(taIssue);
+        // 保存文件
+        List<TaAttach> attachList = taFeedback.getAttachList();
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
+                item.setOwnerId(taIssue.getIssueId().toString());
+                item.setStatus(Constants.STATUS_NORMAL);
+                item.setCreateDate(LocalDateTime.now());
+                taAttachMapper.insert(item);
+            }
+        }
+
+        taFeedback.setIssueId(taIssue.getIssueId().toString());
+        save(taFeedback);
+        // 保存文件
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.ATTACH_SOURCE_FEEDBACK);
+                item.setOwnerId(taFeedback.getFeedbackId());
+                taAttachMapper.insert(item);
+            }
+        }
+
+    }
+
+    @Override
+    public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus) {
+
+        List<String> processList = new ArrayList<>();
+        String verifyStatus = null;
+
+        // 未处理
+        if (Constants.PROCESS_START.equals(bizStatus)) {
+            processList.add(Constants.PROCESS_START);
+        }
+
+        // 已处理, 包含处理中以及已完成的
+        if (Constants.PROCESS_ASSIGNED.equals(bizStatus)) {
+            processList.add(Constants.PROCESS_ASSIGNED);
+            processList.add(Constants.PROCESS_END);
+        }
+
+        // 已打回
+        if (Constants.APPLY_STATUS_REJECT.equals(bizStatus)) {
+            verifyStatus = Constants.APPLY_STATUS_REJECT;
+        }
+
+        return baseMapper.getPageBy(pg, personId, processList, verifyStatus);
+    }
+}

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

@@ -49,8 +49,6 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
                 throw new Exception("未找到交办单位问题单");
             }
 
-            // 标记在申请中
-            taOrgIssue.setResult(taIssueApply.getApplyType());
             taOrgIssueMapper.updateById(taOrgIssue);
         }
 
@@ -73,7 +71,7 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     }
 
     @Override
-    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, String applyType, String orgId, String sourceType) {
-        return baseMapper.getPageBy(pg, applyType, orgId, sourceType);
+    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType) {
+        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType);
     }
 }

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

@@ -2,8 +2,11 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaIssueProcess;
+import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.mapper.TaFeedbackMapper;
+import com.example.civilizedcity.mapper.TaIssueProcessMapper;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +15,7 @@ import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.mapper.TaIssueMapper;
 import com.example.civilizedcity.service.TaIssueService;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +32,12 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     @Autowired
     TaOrgIssueMapper taOrgIssueMapper;
 
+    @Autowired
+    TaFeedbackMapper taFeedbackMapper;
+
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
         if (null == orgId) {
@@ -49,7 +59,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     }
 
     @Override
-    public List<StatVo> statMaIndex(SysUser user, String duty) {
+    public List<StatVo> statMaIndex(SysUser user, TaPerson person, String duty) {
         List<StatVo> result = new ArrayList<>();
 
         // 督察员
@@ -63,7 +73,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         // 管理员
         else if (Constants.DUTY_MANAGER.equals(duty)) {
             Map<String, Object> res = baseMapper.statMaIndex(null);
-            result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
+            result.add(new StatVo().setName("待交办").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
             result.add(new StatVo().setName("已交办").setValue(getStatValueBy(res.get("assigned_num"), 0)));
             result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
         }
@@ -86,12 +96,36 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
 
         // 市民
         else {
-
+            Map<String, Object> res = taFeedbackMapper.statMaIndex(person.getPersonId());
+            result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
+            result.add(new StatVo().setName("已处理").setValue(getStatValueBy(res.get("assigned_num"), 0) + getStatValueBy(res.get("end_num"), 0)));
+            result.add(new StatVo().setName("已打回").setValue(getStatValueBy(res.get("reject_num"), 0)));
         }
 
         return result;
     }
 
+    @Override
+    public void updateEnd(SysUser sysUser, String orgId, Integer issueId) {
+        // 问题单完成
+        baseMapper.updateProcess(issueId, sysUser.getUserId(), Constants.PROCESS_END, Constants.PROCESS_END);
+
+        // 机构问题单完成
+        taOrgIssueMapper.updateProcess(issueId, orgId, Constants.PROCESS_END);
+
+        // 流程完成
+        TaIssueProcess taIssueProcess = new TaIssueProcess();
+        taIssueProcess.setIssueId(issueId);
+        taIssueProcess.setOrgId(orgId);
+        taIssueProcess.setProcessNode(Constants.PROCESS_END);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_END);
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+
+    }
+
     Integer getStatValueBy(Object v, Integer def) {
         if (null == v) return def;
         return Integer.valueOf(v.toString());

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

@@ -40,10 +40,10 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     }
 
     @Override
-    public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) {
+    public void createNewIssue(TaIssue taIssue, SysUser sysUser) {
         TaOrgIssue taOrgIssue = new TaOrgIssue();
         taOrgIssue.setIssueId(taIssue.getIssueId());
-        taOrgIssue.setOrgId(taIssueProcess.getOrgId());
+        taOrgIssue.setOrgId(taIssue.getOrgId());
         taOrgIssue.setProcessStatus(Constants.PROCESS_START);
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
         taOrgIssue.setCreateDate(LocalDateTime.now());

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

@@ -0,0 +1,71 @@
+package com.example.civilizedcity.service.impl;
+
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.mapper.SysUserMapper;
+import com.example.civilizedcity.mapper.TaIssueMapper;
+import com.example.civilizedcity.vo.StatVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TsStatData;
+import com.example.civilizedcity.mapper.TsStatDataMapper;
+import com.example.civilizedcity.service.TsStatDataService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 常用统计;(ts_stat_data)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-31
+ */
+@Service
+public class TsStatDataServiceImpl extends BaseServiceImpl<TsStatDataMapper, TsStatData> implements TsStatDataService {
+
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Override
+    public List<StatVo> statIssue(String statType, String startDate, String endDate, Integer num) {
+
+        if (statType.contains("daily")) {
+            return baseMapper.statIssueDaily(startDate, endDate, num);
+        }
+
+        if (statType.contains("monthly")) {
+            return baseMapper.statIssueMonthly(startDate, endDate, num);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<StatVo> statIssueOrg(String orgId) {
+        Map<String, Object> map = taIssueMapper.statIssueOrg(orgId);
+        List<StatVo> res = new ArrayList<>();
+        res.add(new StatVo().setName("已完结").setValue(map.get("endNum")));
+        res.add(new StatVo().setName("处理中").setValue(map.get("assignedNum")));
+        res.add(new StatVo().setName("已逾期").setValue(map.get("expireNum")));
+        return res;
+    }
+
+    @Override
+    public List<StatVo> statIssueType() {
+        return taIssueMapper.statIssueType();
+    }
+
+    @Override
+    public Map<String, Object> statAdminIndexBanner() {
+        // 总用户数
+        long userNum = sysUserMapper.countAll(Constants.ROOT_ID);
+        // 问题单统计
+        Map<String, Object> result = taIssueMapper.statMaIndex(null);
+        result.put("user_num", userNum);
+
+        return result;
+    }
+}

src/main/resources/application.yml

@@ -8,6 +8,22 @@ spring:
     url: jdbc:mysql://110.40.183.156:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: civilizedcity
     password: civilizedcity@ABCD1234
+    hikari:
+      # 最小空闲连接数
+      minimum-idle: 10
+      # 空闲连接存活最大时间, 默认 600000 - 10分钟
+      idle-timeout: 120000 # 2min
+      # 最大连接池数, 默认 10
+      maximum-pool-size: 30
+      # 连接池最长生命 0 无限期, 1800000 - 30分钟
+      max-lifetime: 180000 # 3min
+      # 连接超时 默认 30000 - 30秒
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+      # 连接活性检测 6000 - 1 分钟
+      keepalive-time: 6000
+
+
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
@@ -33,6 +49,7 @@ yz:
       - "/**/signin"
       - "/ma/captcha"
       - "/ma/change-password"
+      - "/ma/auth-phone"
 
 wx:
   miniapp:

src/main/resources/mapper/SysUserMapper.xml

@@ -2,5 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.SysUserMapper">
-    
+
+    <select id="getListByPhone" resultType="com.example.civilizedcity.entity.SysUser">
+        SELECT
+            *
+        FROM
+            sys_user t
+        WHERE
+            t.phone = #{phone}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="countAll" resultType="java.lang.Long">
+        SELECT
+            count( * )
+        FROM
+            sys_user t
+        WHERE
+            t.user_id != #{rootId}
+	        AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -0,0 +1,54 @@
+<?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.TaFeedbackMapper">
+
+    <select id="countByVerifyStatus" resultType="java.lang.Long">
+        SELECT
+            count( * )
+        FROM
+            ta_feedback t
+        WHERE
+            t.person_id = #{personId}
+          AND t.verify_status = #{verifyStatus}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="statMaIndex" resultType="java.util.Map">
+        SELECT
+            sum(IF(s.process_node = 'start', 1, 0)) as unassigned_num,
+            sum(IF(s.process_node = 'assigned', 1, 0)) as assigned_num,
+            sum(IF(s.process_node = 'end', 1, 0)) as end_num,
+            sum(IF(t.verify_status = 'reject', 1, 0)) as reject_num
+        FROM
+            ta_feedback t
+                JOIN ta_issue s ON t.issue_id = s.issue_id
+        WHERE
+            t.person_id = #{personId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
+        SELECT
+            s.*
+        FROM
+            ta_feedback t
+                INNER JOIN ta_issue s ON t.issue_id = s.issue_id
+        WHERE
+            1 = 1
+          <if test="null != personId and personId != ''">
+              AND t.person_id = #{personId}
+          </if>
+          <if test="processList != null">
+              AND s.process_node IN
+              <foreach item="item" collection="processList" separator="," open="(" close=")">
+                  #{item}
+              </foreach>
+          </if>
+        <if test="null != verifyStatus and verifyStatus != ''">
+          AND t.verify_status = #{verifyStatus}
+        </if>
+          AND t.`status` &gt; -1
+          AND s.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -13,6 +13,9 @@
                 INNER JOIN ta_issue s ON t.issue_id = s.issue_id
         WHERE
             t.`status` > -1
+        <if test="issueId != null">
+            AND t.issue_id = #{issueId}
+        </if>
         <if test="applyType != null and applyType != ''">
             AND t.apply_type = #{applyType}
         </if>

src/main/resources/mapper/TaIssueMapper.xml

@@ -15,6 +15,15 @@
         WHERE
             t.issue_id = #{issueId}
     </update>
+    <update id="updateProcess">
+        UPDATE ta_issue t
+        SET t.process_node = #{processNode},
+            t.process_status = #{processStatus},
+            t.update_user = #{userId},
+            t.update_date = now( )
+        WHERE
+            t.issue_id = #{issueId}
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
@@ -47,11 +56,9 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         SELECT
-            UUID_SHORT() as id,
             count(*) as published_num,
             sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
             sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,
-            sum(IF(t.process_node = 'reject', 1, 0)) as reject_num,
             sum(IF(t.process_node = 'end', 1, 0)) as end_num
         FROM
             ta_issue t
@@ -61,4 +68,34 @@
           </if>
           AND t.`status` > - 1
     </select>
+    <select id="statIssueOrg" resultType="java.util.Map">
+        SELECT
+            UUID_SHORT( ) AS id,
+            IFNULL( SUM( IF ( t.process_node = 'end', t.process_num, 0 ) ), 0 ) AS endNum,
+            IFNULL( SUM( IF ( t.process_node = 'assigned', t.process_num, 0 ) ), 0 ) AS assignedNum,
+            IFNULL( SUM( IF ( t.expire_date &lt;= NOW( ), t.process_num, 0 ) ), 0 ) AS expireNum
+        FROM
+            ta_issue t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` &gt; -1
+    </select>
+    <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    t.`name`,
+                    sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
+                FROM
+                    td_issue_type t
+                        LEFT JOIN ta_issue s ON s.type_id = t.type_id
+                        AND s.`status` &gt; - 1
+                GROUP BY
+                    t.type_id
+            ) a
+        ORDER BY
+            a.`value` DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaOrgIssueMapper">
+    <update id="updateProcess">
+        UPDATE ta_org_issue t
+        SET t.process_status = #{processStatus}
+        WHERE
+            t.org_id = #{orgId}
+          AND t.issue_id = #{issueId}
+    </update>
 
     <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
@@ -48,12 +55,11 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            UUID_SHORT() as id,
             SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
             SUM(s.process_node == 'end', 1, 0) as end_num,
             SUM(s.process_node != 'end', 1, 0) as doing_num
         from ta_org_issue t
-                 INNER JOIN ta_issue s on t.issue_id = s.issue_id
+                 INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
         where t.org_id = #{orgId}
           and t.`status` &gt; -1
           and s.`status` &gt; -1

src/main/resources/mapper/TsStatDataMapper.xml

@@ -0,0 +1,49 @@
+<?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.TsStatDataMapper">
+
+    <select id="statIssueDaily" resultType="com.example.civilizedcity.vo.StatVo">
+        SELECT
+            a.`name`,
+            IFNULL( b.`value`, 0 ) as `value`
+        FROM
+            ( SELECT DATE_ADD( #{startDate}, INTERVAL t.rownum DAY ) AS `name` FROM sequence t WHERE t.rownum &lt; #{num} ) a
+        LEFT JOIN (
+            SELECT
+            t.`name`,
+            t.`value`
+            FROM
+            ts_stat_data t
+            WHERE
+            t.stat_type = 'issue_daily'
+            AND t.`name` &gt;= #{startDate}
+            AND t.`name` &lt;= #{endDate}
+        ) b ON a.`name` = b.`name`
+        ORDER BY
+            a.`name` ASC
+    </select>
+    <select id="statIssueMonthly" resultType="com.example.civilizedcity.vo.StatVo">
+        SELECT
+            a.`name`,
+            IFNULL( b.`value`, 0 ) as `value`
+        FROM (
+            SELECT DATE_FORMAT( DATE_ADD( CONCAT( #{startDate}, '-01' ), INTERVAL t.rownum MONTH ), '%Y-%m' ) AS `name`
+            FROM sequence t
+            WHERE t.rownum &lt; #{num}
+        ) a
+        LEFT JOIN (
+            SELECT
+                t.`name`,
+                t.`value`
+            FROM
+                ts_stat_data t
+            WHERE
+                t.stat_type = 'issue_monthly'
+              AND t.`name` &gt;= #{startDate}
+              AND t.`name` &lt;= #{endDate}
+        ) b ON a.`name` = b.`name`
+        ORDER BY
+            a.`name` ASC
+    </select>
+</mapper>