feats

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

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-3 15:17:53",
+  "updatedTime": "2023-2-12 19:41:01",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1221,6 +1221,23 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
         },
+        {
+          "defKey": "is_from_wx",
+          "defName": "是否微信端添加",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FDA26255-02A6-4AD5-AA2C-B8C410548D44"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
@@ -6503,7 +6520,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位问题",
+          "comment": "来源项目问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6811,9 +6828,26 @@
           "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "BF4E109D-9F8C-4E39-8803-A88E5A347AF3"
         },
+        {
+          "defKey": "community_name",
+          "defName": "社区名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "B5CFBE96-9810-4B5D-9A21-F8664F16A45C"
+        },
         {
           "defKey": "name",
-          "defName": "具体(小区)名称",
+          "defName": "名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6847,7 +6881,7 @@
         },
         {
           "defKey": "addr",
-          "defName": "定位描述",
+          "defName": "定位描述(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6862,6 +6896,40 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "31758145-9BDD-4A20-904B-E70372F394E1"
         },
+        {
+          "defKey": "sex",
+          "defName": "性别",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "18C56DEF-A828-486A-941B-A4167F5AB0BE"
+        },
+        {
+          "defKey": "age",
+          "defName": "年龄段",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 64,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "005ABCD0-A5E8-4F3B-87C9-3C90087A368F"
+        },
         {
           "defKey": "score",
           "defName": "得分",
@@ -6930,6 +6998,23 @@
           "uiHint": "",
           "id": "D7BCB5EA-301A-4B0C-8DD2-F74C4CBFF3F3"
         },
+        {
+          "defKey": "user_name",
+          "defName": "作答人名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "9EEC2EA3-0210-4385-8864-2AF7A5038727"
+        },
         {
           "defKey": "create_date",
           "defName": "作答时间",
@@ -8611,6 +8696,40 @@
           "uiHint": "",
           "id": "219A66C3-6D3F-4F1E-A572-9E5294556142"
         },
+        {
+          "defKey": "loc_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "B93801A5-158E-41EC-9CC9-F2E586414C2A"
+        },
+        {
+          "defKey": "loc_name",
+          "defName": "点位名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "49BF27B0-A3B7-4D25-8B62-871DC3C7D4C0"
+        },
         {
           "defKey": "content",
           "defName": "测评标准",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-6 11:32:38",
+  "updatedTime": "2023-2-12 19:41:46",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1221,6 +1221,23 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "D1C0A2CD-89DB-44DF-918F-EA536E39761F"
         },
+        {
+          "defKey": "is_from_wx",
+          "defName": "是否微信端添加",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FDA26255-02A6-4AD5-AA2C-B8C410548D44"
+        },
         {
           "defKey": "create_user",
           "defName": "创建人",
@@ -6503,7 +6520,7 @@
         {
           "defKey": "qu_id",
           "defName": "问题ID",
-          "comment": "来源点位问题",
+          "comment": "来源项目问题",
           "type": "",
           "len": "",
           "scale": "",
@@ -6811,9 +6828,26 @@
           "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
           "id": "BF4E109D-9F8C-4E39-8803-A88E5A347AF3"
         },
+        {
+          "defKey": "community_name",
+          "defName": "社区名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "B5CFBE96-9810-4B5D-9A21-F8664F16A45C"
+        },
         {
           "defKey": "name",
-          "defName": "具体(小区)名称",
+          "defName": "名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6847,7 +6881,7 @@
         },
         {
           "defKey": "addr",
-          "defName": "定位描述",
+          "defName": "定位描述(小区)名称",
           "comment": "",
           "type": "",
           "len": "",
@@ -6964,6 +6998,23 @@
           "uiHint": "",
           "id": "D7BCB5EA-301A-4B0C-8DD2-F74C4CBFF3F3"
         },
+        {
+          "defKey": "user_name",
+          "defName": "作答人名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "9EEC2EA3-0210-4385-8864-2AF7A5038727"
+        },
         {
           "defKey": "create_date",
           "defName": "作答时间",

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

@@ -7,6 +7,7 @@ import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +18,7 @@ import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.service.SysResourceService;
 import com.example.civilizedcity.service.SysRoleService;
 import com.example.civilizedcity.service.SysUserDutyService;
+import com.example.civilizedcity.vo.ChangePassword;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -116,6 +118,29 @@ public class SysUserController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 小程序端分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("小程序端分页查询")
+    @GetMapping("/ma/sysUser")
+    public ResponseBean maList(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
+        IPage<SysUser> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", currentUser().getOrgId());
+        queryWrapper.eq("is_from_wx", 1);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
+
+        return ResponseBean.success(result);
+    }
+
     /**
      * 新增数据
      *
@@ -133,6 +158,42 @@ public class SysUserController extends BaseController {
         return ResponseBean.success(sysUser);
     }
 
+
+    /**
+     * 小程序端新增数据
+     *
+     * @param sysUser 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("小程序端新增数据")
+    @PostMapping("/ma/sysUser")
+    public ResponseBean addMa(@ApiParam("对象实体") @RequestBody SysUser sysUser) throws Exception {
+        if (StringUtils.isEmpty(sysUser.getPhone())) {
+            return ResponseBean.error("请填写手机号");
+        }
+        if (StringUtils.isEmpty(sysUser.getName())) {
+            return ResponseBean.error("请填写名称");
+        }
+
+        SysUser user = currentUser();
+
+        SysUser origin = sysUserService.getByPhone(sysUser.getPhone(), user.getOrgId());
+        if (null != origin) {
+            if (StringUtils.isNotEmpty(sysUser.getUserId()) && !sysUser.getUserId().equals(origin.getUserId())) {
+                return ResponseBean.error("当前人员已存在");
+            }
+
+            sysUser.setUserId(origin.getUserId());
+            if (Constants.STATUS_DELETE == sysUser.getStatus()) {
+                // 如果这个人被删除了, 则重置为正常状态
+                sysUser.setStatus(Constants.STATUS_NORMAL);
+            }
+        }
+
+        sysUserService.createMaUser(sysUser, user);
+        return ResponseBean.success(sysUser);
+    }
+
     /**
      * 更新数据
      *
@@ -165,6 +226,24 @@ public class SysUserController extends BaseController {
 //        return ResponseBean.success(sysUser);
 //    }
 
+
+    @PutMapping("/ma/sysUser/change-password")
+    @ApiOperation(value="小程序端修改密码", notes = "修改密码", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean changePassword(@ApiParam("修改密码参数") @RequestBody ChangePassword param) throws Exception {
+        if (StringUtils.isEmpty(param.getOriginPassword()) || StringUtils.isEmpty(param.getNewPassword())) {
+            return ResponseBean.error("原始密码或新密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        SysUser user = currentUser();
+
+        boolean isOk = sysUserService.changePassword(user, param);
+        if (!isOk) {
+            ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("密码修改成功");
+    }
+
     /**
      * 通过主键删除数据
      *
@@ -177,4 +256,28 @@ public class SysUserController extends BaseController {
         sysUserService.removeLogicById(id);
         return ResponseBean.success("success");
     }
+
+    /**
+     * 小程序端通过主键删除数据
+     *
+     * @param userId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("小程序端通过主键删除数据")
+    @DeleteMapping("/ma/sysUser/{id}")
+    public ResponseBean deleteMaById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        SysUser user = sysUserService.getById(id);
+        if (null == user || Constants.STATUS_DELETE == user.getStatus()) {
+            return ResponseBean.error("人员不存在");
+        }
+
+        SysUser sysUser = currentUser();
+        if (!sysUser.getOrgId().equals(user.getOrgId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        sysUserService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
 }

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

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.ExcelUtils;
 import com.example.civilizedcity.common.ResponseBean;
 import java.util.List;
+
+import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,7 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.service.TaCheckAnswerService;
 
- /**
+import javax.servlet.http.HttpServletResponse;
+
+/**
  * 测评作答;(ta_check_answer)表控制层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
@@ -49,15 +56,56 @@ public class TaCheckAnswerController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/taCheckAnswer")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
-        IPage<TaCheckAnswer> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaCheckAnswer> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheckAnswer> result = taCheckAnswerService.page(pg);
-        
-        return ResponseBean.success(result);
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("答卷类型") @RequestParam(value ="itemType", defaultValue = "loc") String itemType,
+                             @ApiParam("测评ID") @RequestParam(value ="checkId", required = false) String checkId,
+                             @ApiParam("点位ID") @RequestParam(value ="typeId", required = false) String typeId,
+                             @ApiParam("社区") @RequestParam(value ="communityName", required = false) String communityName,
+                             @ApiParam("答卷类型") @RequestParam(value ="addr", required = false) String addr) throws Exception {
+
+        if (Constants.CHECK_OF_LOC.equals(itemType)) {
+            IPage<CheckLocAnswer> pg = new Page<>(pageNum, pageSize);
+            IPage<CheckLocAnswer> result = taCheckAnswerService.getLocPageBy(pg, checkId, typeId);
+            return ResponseBean.success(result);
+        }
+
+        if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
+            IPage<CheckSurveyAnswer> pg = new Page<>(pageNum, pageSize);
+            IPage<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyPageBy(pg, checkId, communityName, addr);
+            return ResponseBean.success(result);
+        }
+
+        return ResponseBean.error("非法的答卷类型");
     }
+
+     /**
+      * 导出
+      *
+      * @return 查询结果
+      */
+     @ApiOperation("导出")
+     @GetMapping("/taCheckAnswer/export")
+     public ResponseBean export(@ApiParam("答卷类型") @RequestParam(value ="itemType", defaultValue = "loc") String itemType,
+                                @ApiParam("测评ID") @RequestParam(value ="checkId", required = false) String checkId,
+                                @ApiParam("点位ID") @RequestParam(value ="typeId", required = false) String typeId,
+                                @ApiParam("社区") @RequestParam(value ="communityName", required = false) String communityName,
+                                @ApiParam("答卷类型") @RequestParam(value ="addr", required = false) String addr,
+                                HttpServletResponse response) throws Exception {
+
+         if (Constants.CHECK_OF_LOC.equals(itemType)) {
+             List<CheckLocAnswer> result = taCheckAnswerService.getLocListBy(checkId, typeId);
+             ExcelUtils.flush(response, CheckLocAnswer.class, result, "实地测评答案明细");
+             return null;
+         }
+
+         if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
+             List<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyListBy(checkId, communityName, addr);
+             ExcelUtils.flush(response, CheckSurveyAnswer.class, result, "调查问卷答案明细");
+             return null;
+         }
+
+         return ResponseBean.error("非法的答卷类型");
+     }
     
     /** 
      * 新增数据

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

@@ -260,6 +260,7 @@ public class TaCheckItemController extends BaseController {
         taCheckAnswer.setStatus(Constants.STATUS_NORMAL);
         taCheckAnswer.setOrgId(sysUser.getOrgId());
         taCheckAnswer.setCreateUser(sysUser.getUserId());
+        taCheckAnswer.setUserName(sysUser.getName());
         taCheckAnswer.setCreateDate(LocalDateTime.now());
 
         taCheckItemService.answer(taCheckItem, taCheckAnswer, sysUser);

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

@@ -55,6 +55,38 @@ public class TaIssueApplyController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(taIssueApplyService.getById(id));
     }
+
+
+    /**
+     * 获取申请条数
+     *
+     * @param state 申请状态 0, 未审批, 1 已审批
+     * @return 实例对象
+     */
+    @ApiOperation("获取申请条数")
+    @GetMapping("/taIssueApply/nums")
+    public ResponseBean countApply(@ApiParam("申请状态") @RequestParam(value = "state", defaultValue = "0") Integer state,
+                                   @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
+
+        SysUser sysUser = currentUser();
+        boolean isManager = isManager(sysUser);
+        long num = 0;
+
+        QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(applyType), "apply_type", applyType);
+        queryWrapper.eq(!isManager, "org_id", sysUser.getOrgId());
+
+        if (0 == state) {
+            queryWrapper.isNull("verify_date");
+        } else {
+            queryWrapper.isNotNull("verify_date");
+        }
+
+        num = taIssueApplyService.count(queryWrapper);
+
+        return ResponseBean.success(num);
+    }
+
     /**
      * 通过ISSUE_ID查询单条数据
      *

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

@@ -48,6 +48,9 @@ public class SysUser implements Serializable,Cloneable{
      /** 是否系统用户 */
      @ApiModelProperty(name = "是否系统用户",notes = "")
      private Boolean isUser ;
+     /** 是否系统用户 */
+     @ApiModelProperty(name = "是否微信端添加",notes = "")
+     private Boolean isFromWx ;
     /** 状态 */
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;

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

@@ -47,6 +47,9 @@ public class TaCheckAnswer implements Serializable,Cloneable{
     /** 定位描述 - 小区 */
     @ApiModelProperty(name = "定位描述 - 小区",notes = "")
     private String addr ;
+     /** 社区名称 */
+     @ApiModelProperty(name = "社区名称",notes = "")
+     private String communityName ;
      /** 性别 */
      @ApiModelProperty(name = "性别",notes = "")
      private String sex ;
@@ -65,6 +68,9 @@ public class TaCheckAnswer implements Serializable,Cloneable{
     /** 作答人 */
     @ApiModelProperty(name = "作答人",notes = "")
     private String createUser ;
+     /** 作答人名称 */
+     @ApiModelProperty(name = "作答人名称",notes = "")
+     private String userName ;
     /** 作答时间 */
     @ApiModelProperty(name = "作答时间",notes = "")
     private LocalDateTime createDate ;

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

@@ -1,6 +1,9 @@
 package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckAnswer;
@@ -25,4 +28,20 @@ public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
     int getCountByUser(@Param("itemId") String itemId, @Param("userId") String userId);
 
     List<TaCheckAnswer> getByUser(@Param("itemId") String itemId, @Param("userId") String userId);
+
+    IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg,
+                                       @Param("checkId") String checkId,
+                                       @Param("typeId") String typeId);
+
+    List<CheckLocAnswer> getLocListBy(@Param("checkId") String checkId,
+                                      @Param("typeId") String typeId);
+
+    IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg,
+                                             @Param("checkId") String checkId,
+                                             @Param("communityName") String communityName,
+                                             @Param("addr") String addr);
+
+    List<CheckSurveyAnswer> getSurveyListBy(@Param("checkId") String checkId,
+                                            @Param("communityName") String communityName,
+                                            @Param("addr") String addr);
 }

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

@@ -23,4 +23,8 @@ public interface SysUserService extends IBaseService<SysUser> {
     List<String> getRoleList(String userId);
 
     List<String> getPermissionList(String userId);
+
+    SysUser getByPhone(String phone, String orgId);
+
+    void createMaUser(SysUser sysUser, SysUser currentUser);
 }

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

@@ -1,7 +1,10 @@
 package com.example.civilizedcity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaCheckAnswer;
+import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurveyAnswer;
 
 import java.util.List;
 
@@ -18,4 +21,12 @@ public interface TaCheckAnswerService extends IBaseService<TaCheckAnswer> {
     int countByItem(String itemId);
 
     List<TaCheckAnswer> getByUser(String itemId, String userId);
+
+    IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId);
+
+    List<CheckLocAnswer> getLocListBy(String checkId, String typeId);
+
+    IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String communityName, String addr);
+
+    List<CheckSurveyAnswer> getSurveyListBy(String checkId, String communityName, String addr);
 }

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.EncryptUtils;
 import com.example.civilizedcity.common.StringUtils;
@@ -10,6 +11,7 @@ import com.example.civilizedcity.mapper.SysUserRoleMapper;
 import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.mapper.SysUserMapper;
 import com.example.civilizedcity.service.SysUserService;
@@ -37,6 +39,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Autowired
     SysUserDutyMapper sysUserDutyMapper;
 
+    String defaultPwd = "123456";
+
     @Override
     public SysUser login(LoginParam loginParm) throws Exception {
         SysLogin sysLogin = sysLoginMapper.getByAccount(loginParm.getAccount());
@@ -146,6 +150,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
         }
 
         // 身份表
+        mergeDuty(sysUser);
+
+        return true;
+    }
+
+    private void mergeDuty(SysUser sysUser) {
         List<String> dutyList = sysUser.getDutyList();
         if (null == dutyList || dutyList.size() == 0) {
             sysUserDutyMapper.deleteByMap(new HashMap<String, Object>() {{
@@ -171,8 +181,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             // 去除垃圾数据
             sysUserDutyMapper.deleteNotIn(sysUser.getUserId(), idList);
         }
-
-        return true;
     }
 
     @Override
@@ -185,6 +193,56 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
         return sysUserDutyMapper.getListByUser(userId);
     }
 
+    @Override
+    public SysUser getByPhone(String phone, String orgId) {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", phone);
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public void createMaUser(SysUser sysUser, SysUser currentUser) {
+
+        LocalDateTime now = LocalDateTime.now();
+
+        sysUser.setIsUser(true);
+        sysUser.setOrgId(currentUser.getOrgId());
+        sysUser.setIsFromWx(true);
+
+        if (StringUtils.isEmpty(sysUser.getUserId())) {
+            sysUser.setCreateUser(currentUser.getUserId());
+            sysUser.setCreateDate(now);
+
+            save(sysUser);
+        } else {
+            updateById(sysUser);
+        }
+
+        // 登录账户
+        SysLogin sysLogin = sysLoginMapper.getByAccount(sysUser.getPhone());
+        if (null == sysLogin) {
+            sysLogin = new SysLogin();
+
+            sysLogin.setAccount(sysUser.getPhone());
+            sysLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(defaultPwd), sysUser.getUserId()));
+            sysLogin.setUserId(sysUser.getUserId());
+            sysLogin.setStatus(Constants.STATUS_NORMAL);
+            sysLogin.setCreateDate(now);
+            sysLoginMapper.insert(sysLogin);
+        }
+
+        // 身份表
+        if (null == sysUser.getDutyList() || sysUser.getDutyList().size() == 0) {
+            sysUser.setDutyList(new ArrayList<String>(){{
+                add(Constants.DUTY_ORG_USER);
+            }});
+        }
+        mergeDuty(sysUser);
+    }
+
     boolean checkPassword(String src, String targ, String salt) {
         String newPass = EncryptUtils.md5(src, salt);
         return targ.equals(newPass);

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

@@ -1,5 +1,8 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckAnswer;
@@ -31,4 +34,24 @@ public class TaCheckAnswerServiceImpl extends BaseServiceImpl<TaCheckAnswerMappe
     public List<TaCheckAnswer> getByUser(String itemId, String userId) {
         return baseMapper.getByUser(itemId, userId);
     }
+
+    @Override
+    public IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId) {
+        return baseMapper.getLocPageBy(pg, checkId, typeId);
+    }
+
+    @Override
+    public List<CheckLocAnswer> getLocListBy(String checkId, String typeId) {
+        return baseMapper.getLocListBy(checkId, typeId);
+    }
+
+    @Override
+    public IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String communityName, String addr) {
+        return baseMapper.getSurveyPageBy(pg, checkId, communityName, addr);
+    }
+
+    @Override
+    public List<CheckSurveyAnswer> getSurveyListBy(String checkId, String communityName, String addr) {
+        return baseMapper.getSurveyListBy(checkId, communityName, addr);
+    }
 }

src/main/java/com/example/civilizedcity/vo/CheckLocAnswer.java

@@ -0,0 +1,70 @@
+package com.example.civilizedcity.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("实地测评答案")
+public class CheckLocAnswer {
+
+    @ExcelIgnore
+    @ApiModelProperty("作答详情ID")
+    private String answerItemId;
+
+    @ExcelIgnore
+    @ApiModelProperty("作答ID")
+    private String answerId;
+
+    @ExcelIgnore
+    @ApiModelProperty("测评项目ID")
+    private String checkItemId;
+
+    @ExcelIgnore
+    @ApiModelProperty("点位ID")
+    private String typeId;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "点位名称", index = 1)
+    @ApiModelProperty("点位名称")
+    private String typeName;
+
+    @ExcelIgnore
+    @ApiModelProperty("测评ID")
+    private String checkId;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "测评名称", index = 0)
+    @ApiModelProperty("测评名称")
+    private String checkTitle;
+
+    @ColumnWidth(50)
+    @ExcelProperty(value = "问题", index = 2)
+    @ApiModelProperty("问题")
+    private String quTitle;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "答案", index = 3)
+    @ApiModelProperty("答案")
+    private String answer;
+
+    @ColumnWidth(60)
+    @ExcelProperty(value = "详细地址", index = 4)
+    @ApiModelProperty("详细地址")
+    private String addr;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "作答人", index = 5)
+    @ApiModelProperty("作答人")
+    private String userName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "作答时间", index = 6)
+    @ApiModelProperty("作答时间")
+    private LocalDateTime createDate;
+}

src/main/java/com/example/civilizedcity/vo/CheckSurveyAnswer.java

@@ -0,0 +1,76 @@
+package com.example.civilizedcity.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("调查问卷答案")
+public class CheckSurveyAnswer {
+
+    @ExcelIgnore
+    @ApiModelProperty("作答详情ID")
+    private String answerItemId;
+
+    @ExcelIgnore
+    @ApiModelProperty("作答ID")
+    private String answerId;
+
+    @ExcelIgnore
+    @ApiModelProperty("测评项目ID")
+    private String checkItemId;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "社区名称", index = 1)
+    @ApiModelProperty("社区名称")
+    private String communityName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "小区名称", index = 2)
+    @ApiModelProperty("小区名称")
+    private String addr;
+
+    @ExcelIgnore
+    @ApiModelProperty("测评ID")
+    private String checkId;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "测评名称", index = 0)
+    @ApiModelProperty("测评名称")
+    private String checkTitle;
+
+    @ColumnWidth(50)
+    @ExcelProperty(value = "问题", index = 3)
+    @ApiModelProperty("问题")
+    private String quTitle;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "答案", index = 4)
+    @ApiModelProperty("答案")
+    private String answer;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "作答人", index = 5)
+    @ApiModelProperty("作答人")
+    private String userName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "作答时间", index = 6)
+    @ApiModelProperty("作答时间")
+    private LocalDateTime createDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "受访者年龄段", index = 7)
+    @ApiModelProperty("受访者年龄段")
+    private String sex;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "受访者年龄段", index = 8)
+    @ApiModelProperty("受访者年龄段")
+    private String age;
+}

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -53,4 +53,92 @@
           AND t.create_user = #{userId}
           AND t.`status` > -1
     </select>
+
+    <sql id="getLocAnswers">
+        SELECT
+            t.item_id AS answer_item_id,
+            t.answer_id,
+            m.item_id AS check_item_id,
+            m.type_id,
+            m.`name` AS type_name,
+            n.check_id,
+            n.title AS check_title,
+            qu.title AS qu_title,
+            IF(qu.qu_type = 'fill', t.answer,  an.answer) as answer,
+            s.addr,
+            s.user_name,
+            s.create_date
+        FROM
+            ta_check_answer_item t
+            INNER JOIN ta_check_answer s ON t.answer_id = s.answer_id
+            INNER JOIN ta_check_item m ON s.item_id = m.item_id
+            INNER JOIN ta_check n ON m.check_id = n.check_id
+            INNER JOIN ta_check_item_qu qu ON t.qu_id = qu.qu_id
+            LEFT JOIN ta_check_item_an an ON t.qu_id = an.qu_id
+            AND t.answer_code = an.answer_code
+        WHERE
+            m.item_type = 'loc'
+            AND t.`status` = 1
+            <if test="checkId != null and checkId != ''">
+                AND n.check_id = #{checkId}
+            </if>
+            <if test="typeId != null and typeId != ''">
+                AND m.type_id = #{typeId}
+            </if>
+        ORDER BY
+            s.create_date ASC
+    </sql>
+
+    <select id="getLocPageBy" resultType="com.example.civilizedcity.vo.CheckLocAnswer">
+        <include refid="getLocAnswers"></include>
+    </select>
+    <select id="getLocListBy" resultType="com.example.civilizedcity.vo.CheckLocAnswer">
+        <include refid="getLocAnswers"></include>
+    </select>
+
+    <sql id="getSurveyAnswers">
+        SELECT
+            t.item_id AS answer_item_id,
+            t.answer_id,
+            m.item_id AS check_item_id,
+            n.check_id,
+            n.title AS check_title,
+            qu.title AS qu_title,
+            IF( qu.qu_type = 'fill', t.answer, an.answer ) AS answer,
+            s.addr,
+            s.user_name,
+            s.create_date,
+            IF( s.sex = '0', '女', IF( s.sex = '1', '男', '-')) AS sex,
+            s.age,
+            s.community_name
+        FROM
+            ta_check_answer_item t
+                INNER JOIN ta_check_answer s ON t.answer_id = s.answer_id
+                INNER JOIN ta_check_item m ON s.item_id = m.item_id
+                INNER JOIN ta_check n ON m.check_id = n.check_id
+                INNER JOIN ta_check_item_qu qu ON t.qu_id = qu.qu_id
+                LEFT JOIN ta_check_item_an an ON t.qu_id = an.qu_id
+                AND t.answer_code = an.answer_code
+        WHERE
+            m.item_type = 'survey'
+          AND t.`status` = 1
+        <if test="checkId != null and checkId != ''">
+            AND n.check_id = #{checkId}
+        </if>
+        <if test="communityName != null and communityName != ''">
+          AND s.community_name LIKE CONCAT( #{communityName}, '%' )
+        </if>
+        <if test="addr != null and addr != ''">
+          AND s.addr LIKE CONCAT( #{addr}, '%' )
+        </if>
+        ORDER BY
+            s.create_date ASC
+    </sql>
+
+    <select id="getSurveyPageBy" resultType="com.example.civilizedcity.vo.CheckSurveyAnswer">
+        <include refid="getSurveyAnswers"></include>
+    </select>
+    <select id="getSurveyListBy" resultType="com.example.civilizedcity.vo.CheckSurveyAnswer">
+        <include refid="getSurveyAnswers"></include>
+    </select>
 </mapper>