feats

db/.back_文明创办/文明创办-backup-2023129082004.pdma.json → db/.back_文明创办/文明创办-backup-2023131111551.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 11:14:31",
   "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": "",
+          "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,40 +8627,6 @@
           "refDict": "",
           "uiHint": "",
           "id": "DED8CFDE-66A8-4460-A94A-2AAA1D169C5D"
-        },
-        {
-          "defKey": "update_user",
-          "defName": "更新人",
-          "comment": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "type": "",
-          "len": 32,
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": true,
-          "refDict": "",
-          "uiHint": "",
-          "id": "06EC3E88-DE3F-43F9-A155-D2454F4D8C4E"
-        },
-        {
-          "defKey": "update_date",
-          "defName": "更新时间",
-          "comment": "",
-          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": true,
-          "refDict": "",
-          "uiHint": "",
-          "id": "4C2C2D21-B0E0-4279-AD8B-F7359B17B7AB"
         }
       ],
       "correlations": [],

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 11:15:51",
   "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": "测评标准",

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

@@ -57,8 +57,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

@@ -41,7 +41,7 @@ public class StatController extends BaseController {
             //
         }
 
-        List<StatVo> result = taIssueService.statMaIndex(user, duty);
+        List<StatVo> result = taIssueService.statMaIndex(user, person, duty);
 
         return ResponseBean.success(result);
     }

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,101 @@
+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.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;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param feedbackId 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taFeedback/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return ResponseBean.success(taFeedbackService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @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) throws Exception {
+        
+        IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
+        // QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
+        // queryWrapper.orderByDesc("create_date");
+        IPage<TaFeedback> result = taFeedbackService.page(pg);
+        
+        return ResponseBean.success(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param taFeedback 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/taFeedback")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaFeedback taFeedback) throws Exception {
+        taFeedbackService.save(taFeedback);
+        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){
+        taFeedbackService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
+}

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,69 @@
+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-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 ;
+
+}

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

@@ -5,11 +5,14 @@ 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);
  }

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

@@ -0,0 +1,23 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.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);
+
+     @MapKey("id")
+     Map<String, Object> statMaIndex(@Param("personId") String personId);
+ }

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,13 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TaFeedback;
+
+ /**
+ * 反馈表;(ta_feedback)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2023-1-30
+ */
+public interface TaFeedbackService extends IBaseService<TaFeedback> {
+    
+}

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

@@ -4,6 +4,7 @@ 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 +22,5 @@ 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);
  }

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/TaFeedbackServiceImpl.java

@@ -0,0 +1,16 @@
+package com.example.civilizedcity.service.impl;
+
+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;
+ /**
+ * 反馈表;(ta_feedback)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2023-1-30
+ */
+@Service
+public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements TaFeedbackService {
+    
+}

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

@@ -4,6 +4,8 @@ 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.TaPerson;
+import com.example.civilizedcity.mapper.TaFeedbackMapper;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,9 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     @Autowired
     TaOrgIssueMapper taOrgIssueMapper;
 
+    @Autowired
+    TaFeedbackMapper taFeedbackMapper;
+
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
         if (null == orgId) {
@@ -49,7 +54,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 +68,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)));
         }
@@ -80,13 +85,16 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         else if (Constants.DUTY_QUERY_PERSON.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("assigned_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)));
         }
 
         // 市民
         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;

src/main/resources/application.yml

@@ -8,6 +8,14 @@ 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
+#    max-idle: 10
+#    max-wait: 10000
+#    min-idle: 5
+#    initial-size: 5
+#    validation-query: SELECT 1
+#    test-on-borrow: false
+#    test-while-idle: true
+#    time-between-eviction-runs-millis: 18800
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
@@ -33,6 +41,7 @@ yz:
       - "/**/signin"
       - "/ma/captcha"
       - "/ma/change-password"
+      - "/ma/auth-phone"
 
 wx:
   miniapp:

src/main/resources/mapper/SysUserMapper.xml

@@ -2,5 +2,14 @@
 <!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>
 </mapper>

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -0,0 +1,30 @@
+<?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
+            UUID_SHORT() as id,
+            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>
+</mapper>

src/main/resources/mapper/TaIssueMapper.xml

@@ -51,7 +51,6 @@
             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

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -53,7 +53,7 @@
             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` > -1
           and s.`status` > -1