Merge branch 'feature/1221-suggest' into develop-new

# Conflicts:
#	cooleshow-app/src/main/java/com/yonge/cooleshow/admin/io/request/SysSuggestionVo.java
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysSuggestionTypeServiceImpl.java
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/SysSuggestionWrapper.java
#	cooleshow-user/user-biz/src/main/resources/config/mybatis/SysSuggestionTypeMapper.xml

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/SysSuggestionV2Controller.java

@@ -0,0 +1,191 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.admin.io.request.SysSuggestionVo;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.SysSuggestionV2Service;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("${app-config.url.admin:}/sysSuggestionV2")
+@Api(tags = "平台建议表")
+public class SysSuggestionV2Controller extends BaseController {
+
+    @Autowired
+    private SysSuggestionV2Service sysSuggestionService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+
+    /**
+     * 查询单条
+     *
+     * @param id 详情ID
+     * @return R<SysSuggestionVo.SysSuggestion>
+     */
+    @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/detail')")
+    @GetMapping("/detail/{id}")
+    public R<SysSuggestionWrapper.SysSuggestion> detail(@PathVariable("id") Long id) {
+
+        // 建议详情
+        SysSuggestionV2 wrapper = sysSuggestionService.detail(id);
+        SysSuggestionWrapper.SysSuggestion suggestion =
+                SysSuggestionWrapper.SysSuggestion.from(JSON.toJSONString(wrapper));
+        if (wrapper != null && wrapper.getSuggestionTypeId() != null) {
+            List<Long> userIdList = new ArrayList<>();
+            userIdList.add(wrapper.getUserId());
+            if (wrapper.getHandleBy() != null) {
+                userIdList.add(wrapper.getHandleBy());
+            }
+            Map<Long, SysUser> userIdMap = sysUserService.getMapByIds(userIdList);
+            suggestion.setNickname(userIdMap.getOrDefault(suggestion.getUserId(), new SysUser()).getUsername());
+            suggestion.setHandleName(userIdMap.getOrDefault(suggestion.getHandleBy(), new SysUser()).getUsername());
+        }
+
+        return R.from(suggestion);
+    }
+
+    /**
+     * 查询分页
+     *
+     * @param query SysSuggestionWrapper.SysSuggestionQuery
+     * @return R<PageInfo < SysSuggestionWrapper.SysSuggestion>>
+     */
+    @ApiOperation(value = "查询分页", notes = "传入sysSuggestionSearch")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/page')")
+    @PostMapping("/page")
+    public R<PageInfo<SysSuggestionWrapper.SysSuggestion>> page(@RequestBody SysSuggestionWrapper.SysSuggestionQuery query) {
+
+        IPage<SysSuggestionWrapper.SysSuggestion> pages = sysSuggestionService.selectPage(QueryInfo.getPage(query), query);
+
+        List<SysSuggestionWrapper.SysSuggestion> records = pages.getRecords();
+        if (CollectionUtils.isNotEmpty(records)) {
+            List<Long> userIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getUserId)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+
+            List<Long> handUserIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getHandleBy)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            if (!handUserIdList.isEmpty()) {
+                userIdList.addAll(handUserIdList);
+            }
+            Map<Long, SysUser> userIdMap = sysUserService.getMapByIds(userIdList);
+
+            records.forEach(next -> {
+                next.setNickname(userIdMap.getOrDefault(next.getUserId(), new SysUser()).getUsername());
+                next.setHandleName(userIdMap.getOrDefault(next.getHandleBy(), new SysUser()).getUsername());
+            });
+        }
+        return R.from(QueryInfo.pageInfo(pages, records));
+    }
+
+    /**
+     * 新增
+     *
+     * @param suggestion SysSuggestionVo.SysSuggestion
+     * @return R<Boolean>
+     */
+    @ApiOperation(value = "新增", notes = "传入sysSuggestion")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/save')")
+    @PostMapping("/save")
+    public R<Boolean> add(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion,
+                          @RequestHeader(name = "user-agent") String userAgent) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        suggestion.setUserId(sysUser.getId());
+        suggestion.setClientType(ClientEnum.SYSTEM);
+        suggestion.setUserAgent(userAgent);
+
+        return R.from(sysSuggestionService.add(JSON.parseObject(suggestion.jsonString(), SysSuggestionV2.class)));
+    }
+
+    /**
+     * 修改
+     *
+     * @param suggestion SysSuggestionVo.SysSuggestion
+     * @return R<Boolean>
+     */
+    @ApiOperation(value = "修改", notes = "传入sysSuggestion")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/update')")
+//	@PostMapping("/update")
+    public R<Boolean> update(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion) {
+
+        return R.from(sysSuggestionService.update(JSON.parseObject(suggestion.jsonString(), SysSuggestionV2.class)));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id 详情ID
+     * @return R<Boolean>
+     */
+    @ApiOperation(value = "删除", notes = "传入id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", dataType = "long")
+    })
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/remove')")
+    @PostMapping("/remove")
+    public R<Boolean> remove(@RequestParam Long id) {
+
+        return R.from(sysSuggestionService.removeById(id));
+    }
+
+    @ApiOperation(value = "修改", notes = "传入sysSuggestion")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/handleSuggestion')")
+    @PostMapping("/handleSuggestion")
+    public R<Boolean> handleSuggestion(@Validated @RequestBody SysSuggestionWrapper.HandleSuggestion handleSuggestion) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        handleSuggestion.setHandleBy(sysUser.getId());
+        return R.from(sysSuggestionService.handleSuggestion(handleSuggestion));
+    }
+
+    @ApiOperation(value = "查询未处理的建议数量")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/queryUnHandleNum')")
+    @GetMapping("/queryUnHandleNum")
+    public R<Integer> queryUnHandleNum() {
+        Integer count = sysSuggestionService.lambdaQuery()
+                .eq(SysSuggestionV2::getHandleStatus, false)
+                .count();
+        return R.from(count);
+    }
+}

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/io/request/SysSuggestionVo.java

@@ -2,36 +2,44 @@ package com.yonge.cooleshow.admin.io.request;
 
 import com.alibaba.fastjson.JSON;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.SuggestionType;
+import com.yonge.cooleshow.common.enums.ESuggestionHandleAttitude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
 /**
  * 平台建议表
- * 2023-12-20 11:27:10
+ * 2022-11-15 17:59:45
  */
 @ApiModel(value = "SysSuggestionVo对象", description = "平台建议表查询视图对象")
 public class SysSuggestionVo {
 
     @Data
-    @ApiModel(" SysSuggestionQuery-平台建议表")
+    @ApiModel(" SysSuggestionList-平台建议表")
     public static class SysSuggestionQuery implements QueryInfo {
 
-        @ApiModelProperty("当前页")
+        @ApiModelProperty(value = "当前页")
         private Integer page;
 
-        @ApiModelProperty("分页行数")
+        @ApiModelProperty(value = "分页行数")
         private Integer rows;
 
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
+        @ApiModelProperty(value = "客户端类型")
+        private ClientEnum clientType;
 
-        public static SysSuggestionQuery from(String json) {
-            return JSON.parseObject(json, SysSuggestionQuery.class);
-        }
+        @ApiModelProperty("建议类型")
+        private SuggestionType suggestionType;
+
+        @ApiModelProperty("开始时间")
+        private Date startTime;
+
+        @ApiModelProperty("结束时间")
+        private Date endTime;
     }
 
     @Data
@@ -42,70 +50,40 @@ public class SysSuggestionVo {
         @ApiModelProperty("编号")
         private Long id;
 
+        @ApiModelProperty(value = "建议类型ID", required = true)
+        @NotNull
+        private Long suggestionTypeId;
 
-        @ApiModelProperty("联系方式")
+        @ApiModelProperty(value = "联系方式", required = true)
+        @NotNull
         private String mobileNo;
 
+        @ApiModelProperty(value = "建议类型", required = true)
+        @NotNull
+        private SuggestionType type;
 
-        @ApiModelProperty("标题")
+        @ApiModelProperty(value = "标题", required = true)
+        @NotNull
         private String title;
 
-
-        @ApiModelProperty("内容")
+        @ApiModelProperty(value = "内容", required = true)
+        @NotNull
         private String content;
 
-
-        @ApiModelProperty("")
-        private String url;
-
+        @ApiModelProperty("附件信息, 多个,隔开")
+        private String attachmentUrls;
 
         @ApiModelProperty("用户编号")
         private Long userId;
 
-
-        @ApiModelProperty("提交时间")
-        private Date createTime;
-
-
-        @ApiModelProperty("")
-        private String clientId;
-
-
-        @ApiModelProperty("建议类型")
-        private String type;
-
-
-        @ApiModelProperty("")
-        private String clientType;
-
-
-        @ApiModelProperty("建议类型ID")
-        private Long suggestionTypeId;
-
+        @ApiModelProperty("客户端类型")
+        private ClientEnum clientType;
 
         @ApiModelProperty("客户端信息")
         private String userAgent;
 
-
-        @ApiModelProperty("处理状态：true:已处理，false:待处理")
-        private Boolean handleStatus;
-
-
-        @ApiModelProperty("处理时间")
-        private Date handleTime;
-
-
-        @ApiModelProperty("处理人")
-        private Long handleBy;
-
-
-        @ApiModelProperty("是否反馈用户,true:是，false:否")
-        private Boolean feedback;
-
-
-        @ApiModelProperty("反馈内容")
-        private String feedbackContent;
-
+        @ApiModelProperty("处理态度")
+        private ESuggestionHandleAttitude handleAttitude;
 
         public String jsonString() {
             return JSON.toJSONString(this);
@@ -114,6 +92,7 @@ public class SysSuggestionVo {
         public static SysSuggestion from(String json) {
             return JSON.parseObject(json, SysSuggestion.class);
         }
+
     }
 
-}
+}

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SysSuggestionV2Controller.java

@@ -0,0 +1,131 @@
+package com.yonge.cooleshow.student.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.admin.io.request.SysSuggestionVo;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.SysSuggestionV2Service;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("${app-config.url.student:}/sysSuggestionV2")
+@Api(tags = "平台建议表")
+public class SysSuggestionV2Controller extends BaseController {
+
+    @Autowired
+    private SysSuggestionV2Service sysSuggestionService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private StudentService studentService;
+
+    /**
+     * 查询分页
+     *
+     * @param query SysSuggestionWrapper.SysSuggestionQuery
+     * @return R<PageInfo < SysSuggestionWrapper.SysSuggestion>>
+     */
+    @ApiOperation(value = "查询分页", notes = "传入sysSuggestionSearch")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/page')")
+    @PostMapping("/page")
+    public R<PageInfo<SysSuggestionWrapper.SysSuggestion>> page(@RequestBody SysSuggestionWrapper.SysSuggestionQuery query) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        query.setUserId(sysUser.getId());
+        Student student = studentService.getById(sysUser.getId());
+        if (student.getTenantId() != null && student.getTenantId() != -1) {
+            query.setClientType(ClientEnum.TENANT_STUDENT);
+        } else {
+            query.setClientType(ClientEnum.STUDENT);
+        }
+
+        IPage<SysSuggestionWrapper.SysSuggestion> pages = sysSuggestionService.selectPage(QueryInfo.getPage(query), query);
+
+        List<SysSuggestionWrapper.SysSuggestion> records = pages.getRecords();
+        if (CollectionUtils.isNotEmpty(records)) {
+            List<Long> userIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getUserId)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+
+            List<Long> handUserIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getHandleBy)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            if (!handUserIdList.isEmpty()) {
+                userIdList.addAll(handUserIdList);
+            }
+            Map<Long, SysUser> userIdMap = sysUserService.getMapByIds(userIdList);
+
+            records.forEach(next -> {
+                next.setNickname(userIdMap.getOrDefault(next.getUserId(), new SysUser()).getUsername());
+                next.setHandleName(userIdMap.getOrDefault(next.getHandleBy(), new SysUser()).getUsername());
+            });
+        }
+        return R.from(QueryInfo.pageInfo(pages, records));
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param suggestion SysSuggestionVo.SysSuggestion
+     * @return R<Boolean>
+     */
+    @ApiOperation(value = "新增", notes = "传入sysSuggestion")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/save')")
+    @PostMapping("/save")
+    public R<Boolean> add(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion,
+                          @RequestHeader(name = "user-agent") String userAgent) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        suggestion.setUserId(sysUser.getId());
+        suggestion.setUserAgent(userAgent);
+
+        Student student = studentService.getById(sysUser.getId());
+        if (student.getTenantId() != null && student.getTenantId() != -1) {
+            suggestion.setClientType(ClientEnum.TENANT_STUDENT);
+        } else {
+            suggestion.setClientType(ClientEnum.STUDENT);
+        }
+
+        return R.from(sysSuggestionService.add(JSON.parseObject(suggestion.jsonString(), SysSuggestionV2.class)));
+    }
+}

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysSuggestionV2Controller.java

@@ -0,0 +1,111 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.admin.io.request.SysSuggestionVo;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.SysSuggestionV2Service;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("${app-config.url.teacher:}/sysSuggestionV2")
+@Api(tags = "平台建议表")
+public class SysSuggestionV2Controller extends BaseController {
+
+    @Autowired
+    private SysSuggestionV2Service sysSuggestionService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 查询分页
+     *
+     * @param query SysSuggestionWrapper.SysSuggestionQuery
+     * @return R<PageInfo < SysSuggestionWrapper.SysSuggestion>>
+     */
+    @ApiOperation(value = "查询分页", notes = "传入sysSuggestionSearch")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/page')")
+    @PostMapping("/page")
+    public R<PageInfo<SysSuggestionWrapper.SysSuggestion>> page(@RequestBody SysSuggestionWrapper.SysSuggestionQuery query) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        query.setUserId(sysUser.getId());
+        query.setClientType(ClientEnum.TEACHER);
+
+        IPage<SysSuggestionWrapper.SysSuggestion> pages = sysSuggestionService.selectPage(QueryInfo.getPage(query), query);
+
+        List<SysSuggestionWrapper.SysSuggestion> records = pages.getRecords();
+        if (CollectionUtils.isNotEmpty(records)) {
+            List<Long> userIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getUserId)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+
+            List<Long> handUserIdList = records.stream()
+                    .map(SysSuggestionWrapper.SysSuggestion::getHandleBy)
+                    .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            if (!handUserIdList.isEmpty()) {
+                userIdList.addAll(handUserIdList);
+            }
+            Map<Long, SysUser> userIdMap = sysUserService.getMapByIds(userIdList);
+
+            records.forEach(next -> {
+                next.setNickname(userIdMap.getOrDefault(next.getUserId(), new SysUser()).getUsername());
+                next.setHandleName(userIdMap.getOrDefault(next.getHandleBy(), new SysUser()).getUsername());
+            });
+        }
+        return R.from(QueryInfo.pageInfo(pages, records));
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param suggestion SysSuggestionVo.SysSuggestion
+     * @return R<Boolean>
+     */
+    @ApiOperation(value = "新增", notes = "传入sysSuggestion")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/save')")
+    @PostMapping("/save")
+    public R<Boolean> add(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion,
+                          @RequestHeader(name = "user-agent") String userAgent) {
+        com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
+        suggestion.setUserId(sysUser.getId());
+        suggestion.setUserAgent(userAgent);
+        suggestion.setClientType(ClientEnum.TEACHER);
+
+        return R.from(sysSuggestionService.add(JSON.parseObject(suggestion.jsonString(), SysSuggestionV2.class)));
+    }
+}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ESuggestionHandleAttitude.java

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+import lombok.Getter;
+
+/**
+ * 系统建议类型
+ */
+@Getter
+public enum ESuggestionHandleAttitude implements BaseEnum<String,ESuggestionHandleAttitude> {
+
+    NEED("需要处理"),
+    NO("不予处理"),
+    ;
+
+    private final String msg;
+
+    @EnumValue
+    private final String code;
+
+    ESuggestionHandleAttitude(String msg) {
+        this.msg = msg;
+
+        this.code = this.name();
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysSuggestionV2.java

@@ -0,0 +1,88 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.SuggestionType;
+import com.yonge.cooleshow.common.enums.ESuggestionHandleAttitude;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 平台建议表
+ * 2022-11-15 17:59:45
+ */
+@Data
+@TableName("sys_suggestion")
+public class SysSuggestionV2 implements Serializable {
+
+    // 编号
+    @TableId(value = "id_")
+    private Long id;
+
+    @TableField(value = "suggestion_type_id_")
+    private Long suggestionTypeId;
+
+    // 联系方式
+	@TableField(value = "mobile_no_")
+    private String mobileNo;
+
+    // 建议类型
+	@TableField(value = "type_")
+    private SuggestionType type;
+
+    // 标题
+	@TableField(value = "title_")
+    private String title;
+
+    // 内容
+	@TableField(value = "content_")
+    private String content;
+
+    // 附件信息, 多个,隔开
+	@TableField(value = "attachment_urls_")
+    private String attachmentUrls;
+
+    // 用户编号
+	@TableField(value = "user_id_")
+    private Long userId;
+
+    // 客户端类型
+	@TableField(value = "client_type_")
+    private ClientEnum clientType;
+
+    // 客户端信息
+	@TableField(value = "user_agent_")
+    private String userAgent;
+
+    // 提交时间
+	@TableField(value = "create_time_")
+    private Date createTime;
+
+    // 处理状态
+    @TableField(value = "handle_status_")
+    private Boolean handleStatus;
+
+    // 处理时间
+    @TableField(value = "handle_time_")
+    private Date handleTime;
+
+    // 处理人
+    @TableField(value = "handle_by_")
+    private Long handleBy;
+
+    @TableField(value = "handle_attitude_")
+    private ESuggestionHandleAttitude handleAttitude;
+
+    // 是否需要反馈用户
+    @TableField(value = "feedback_")
+    private Boolean feedback;
+
+    // 反馈内容
+    @TableField(value = "feedback_content_")
+    private String feedbackContent;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/SuggestionType.java

@@ -1,11 +1,13 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum SuggestionType implements BaseEnum<String, SuggestionType> {
     APP("软件反馈"),
     SMART_PRACTICE("智能陪练");
 
+    @EnumValue
     private String code;
 
     private String msg;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/SysSuggestionV2Mapper.java

@@ -0,0 +1,25 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 平台建议表
+ * 2022-11-15 17:59:45
+ */
+public interface SysSuggestionV2Mapper extends BaseMapper<SysSuggestionV2> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<SysSuggestionWrapper.SysSuggestionList>
+	 * @param param SysSuggestionWrapper.SysSuggestionQuery
+	 * @return List<SysSuggestionWrapper.SysSuggestion>
+	 */
+	List<SysSuggestionWrapper.SysSuggestion> selectPage(@Param("page") IPage<SysSuggestionWrapper.SysSuggestion> page, @Param("param") SysSuggestionWrapper.SysSuggestionQuery param);
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysSuggestionV2Service.java

@@ -0,0 +1,47 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestion;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+
+/**
+ * 平台建议表
+ * 2022-11-15 17:59:45
+ */
+public interface SysSuggestionV2Service extends IService<SysSuggestionV2> {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return SysSuggestionWrapper.SysSuggestion
+     */
+    SysSuggestionV2 detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<SysSuggestionWrapper.SysSuggestionList>
+     * @param query SysSuggestionWrapper.SysSuggestionQuery
+     * @return IPage<SysSuggestionWrapper.SysSuggestion>
+     */
+    IPage<SysSuggestionWrapper.SysSuggestion> selectPage(IPage<SysSuggestionWrapper.SysSuggestion> page, SysSuggestionWrapper.SysSuggestionQuery query);
+
+    /**
+     * 添加
+     * @param SysSuggestion SysSuggestionWrapper.SysSuggestion
+     * @return Boolean
+     */
+     Boolean add(SysSuggestionV2 SysSuggestion);
+
+    /**
+     * 更新
+     * @param SysSuggestion SysSuggestionWrapper.SysSuggestion
+     * @return Boolean
+     */
+     Boolean update(SysSuggestionV2 SysSuggestion);
+
+
+    Boolean handleSuggestion(SysSuggestionWrapper.HandleSuggestion handleSuggestion);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysSuggestionTypeServiceImpl.java

@@ -20,6 +20,7 @@ public class SysSuggestionTypeServiceImpl extends ServiceImpl<SysSuggestionTypeM
 
     /**
      * 查询详情
+     *
      * @param id 详情ID
      * @return SysSuggestionType
      */
@@ -31,7 +32,8 @@ public class SysSuggestionTypeServiceImpl extends ServiceImpl<SysSuggestionTypeM
 
     /**
      * 分页查询
-     * @param page IPage<SysSuggestionType>
+     *
+     * @param page  IPage<SysSuggestionType>
      * @param query SysSuggestionTypeWrapper.SysSuggestionTypeQuery
      * @return IPage<SysSuggestionType>
      */
@@ -43,6 +45,7 @@ public class SysSuggestionTypeServiceImpl extends ServiceImpl<SysSuggestionTypeM
 
     /**
      * 添加
+     *
      * @param sysSuggestionType SysSuggestionTypeWrapper.SysSuggestionType
      * @return Boolean
      */
@@ -54,11 +57,12 @@ public class SysSuggestionTypeServiceImpl extends ServiceImpl<SysSuggestionTypeM
 
     /**
      * 更新
+     *
      * @param sysSuggestionType SysSuggestionTypeWrapper.SysSuggestionType
      * @return Boolean
      */
     @Override
-    public Boolean update(SysSuggestionTypeWrapper.SysSuggestionType sysSuggestionType){
+    public Boolean update(SysSuggestionTypeWrapper.SysSuggestionType sysSuggestionType) {
 
         return this.updateById(JSON.parseObject(sysSuggestionType.jsonString(), SysSuggestionType.class));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysSuggestionV2ServiceImpl.java

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.microsvc.toolkit.common.webportal.exception.BizException;
+import com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2;
+import com.yonge.cooleshow.biz.dal.mapper.SysSuggestionV2Mapper;
+import com.yonge.cooleshow.biz.dal.service.SysSuggestionV2Service;
+import com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * 平台建议表
+ * 2022-11-15 17:59:45
+ */
+@Slf4j
+@Service
+public class SysSuggestionV2ServiceImpl extends ServiceImpl<SysSuggestionV2Mapper, SysSuggestionV2> implements SysSuggestionV2Service {
+
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return SysSuggestionWrapper.SysSuggestion
+     */
+	@Override
+    public SysSuggestionV2 detail(Long id) {
+
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 分页查询
+     * @param page IPage<SysSuggestionWrapper.SysSuggestionList>
+     * @param query SysSuggestionWrapper.SysSuggestionQuery
+     * @return IPage<SysSuggestionWrapper.SysSuggestion>
+     */
+    @Override
+    public IPage<SysSuggestionWrapper.SysSuggestion> selectPage(IPage<SysSuggestionWrapper.SysSuggestion> page,
+                                                                SysSuggestionWrapper.SysSuggestionQuery query){
+
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+
+    /**
+     * 添加
+     * @param SysSuggestion SysSuggestionWrapper.SysSuggestion
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(SysSuggestionV2 SysSuggestion) {
+
+        return this.save(SysSuggestion);
+    }
+
+    /**
+     * 更新
+     * @param SysSuggestion SysSuggestionWrapper.SysSuggestion
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(SysSuggestionV2 SysSuggestion){
+
+        return this.updateById(SysSuggestion);
+    }
+
+    /**
+     * 处理反馈意见
+     * @param handleSuggestion handleSuggestion
+     * @return true/false
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Boolean handleSuggestion(SysSuggestionWrapper.HandleSuggestion handleSuggestion) {
+        Long id = handleSuggestion.getId();
+        SysSuggestionV2 suggestion = this.getById(id);
+        if (suggestion == null) {
+            throw new BizException("反馈意见不存在");
+        }
+        Boolean handleStatus = suggestion.getHandleStatus();
+        if (Boolean.TRUE.equals(handleStatus)) {
+            throw new BizException("反馈意见已经处理");
+        }
+        this.lambdaUpdate()
+            .set(SysSuggestionV2::getHandleStatus, true)
+            .set(SysSuggestionV2::getHandleTime, new Date())
+            .set(SysSuggestionV2::getFeedback, handleSuggestion.getFeedback())
+            .set(SysSuggestionV2::getFeedbackContent, handleSuggestion.getFeedbackContent())
+            .set(SysSuggestionV2::getHandleBy,handleSuggestion.getHandleBy())
+            .set(SysSuggestionV2::getHandleAttitude, handleSuggestion.getHandleAttitude())
+            .eq(SysSuggestionV2::getId, handleSuggestion.getId())
+            .eq(SysSuggestionV2::getHandleStatus, false)
+            .update();
+        return true;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/SysSuggestionWrapper.java

@@ -1,32 +1,31 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SuggestionType;
+import com.yonge.cooleshow.common.enums.ESuggestionHandleAttitude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.Optional;
 
 /**
  * 平台建议表
- * 2023-12-20 11:27:10
+ * 2022-11-15 17:59:45
  */
-@ApiModel(value = "SysSuggestionWrapper对象", description = "平台建议表查询对象")
 public class SysSuggestionWrapper {
 
     @Data
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
-    @ApiModel(" SysSuggestionQuery-平台建议表")
     public static class SysSuggestionQuery implements QueryInfo {
 
         @ApiModelProperty("当前页")
@@ -35,72 +34,100 @@ public class SysSuggestionWrapper {
         @ApiModelProperty("分页行数")
         private Integer rows;
 
-        @ApiModelProperty("关键字匹配")
+        @ApiModelProperty("关键字")
         private String keyword;
 
-        @ApiModelProperty(value = "建议类型")
+        @ApiModelProperty("客户端类型")
+        private ClientEnum clientType;
+
+        @ApiModelProperty("建议类型")
         private SuggestionType type;
 
-        private String startTime;
+        @TableId(value = "建议类型ID")
+        private Long suggestionTypeId;
 
-        private String endTime;
+        @ApiModelProperty("建议类型")
+        private String suggestionType;
 
-        @ApiModelProperty(value = "客户端类型")
-        private String clientType;
+        @ApiModelProperty("建议类型名称")
+        private String suggestionTypeName;
 
-        public String getKeyword() {
-            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
-        }
+        @ApiModelProperty("开始时间")
+        private Date startTime;
 
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
+        @ApiModelProperty("结束时间")
+        private Date endTime;
 
-        public static SysSuggestionQuery from(String json) {
-            return JSON.parseObject(json, SysSuggestionQuery.class);
-        }
+        @ApiModelProperty("处理状态,true:是，false:否")
+        private Boolean handleStatus;
+
+        @ApiModelProperty("处理人")
+        private Long handleBy;
+
+        @ApiModelProperty("是否反馈用户,true:是，false:否")
+        private Boolean feedback;
+
+        @ApiModelProperty("开始处理时间")
+        private Date handStartTime;
+
+        @ApiModelProperty("结束处理时间")
+        private Date handEndTime;
+
+        @ApiModelProperty("处理态度，NEED:需要处理，NO：不予处理")
+        private ESuggestionHandleAttitude handleAttitude;
+
+        @ApiModelProperty("用户ID")
+        private Long userId;
+
+        @ApiModelProperty("客户端类型,多个用逗号隔开")
+        private String clientTypes;
     }
 
     @Data
-    @ApiModel(" SysSuggestion-平台建议表")
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class SysSuggestion {
 
         @ApiModelProperty("编号")
         private Long id;
 
+        @ApiModelProperty("建议类型ID")
+        private Long suggestionTypeId;
+
+        @ApiModelProperty("建议类型名称")
+        private String suggestionTypeName;
+
         @ApiModelProperty("联系方式")
         private String mobileNo;
 
+        @ApiModelProperty("建议类型")
+        private SuggestionType type;
+
         @ApiModelProperty("标题")
         private String title;
 
         @ApiModelProperty("内容")
         private String content;
 
-        @ApiModelProperty("链接")
-        private String url;
+        @ApiModelProperty("附件信息, 多个,隔开")
+        private String attachmentUrls;
 
         @ApiModelProperty("用户编号")
         private Long userId;
 
-        @ApiModelProperty("提交时间")
-        private Date createTime;
-
         @ApiModelProperty("客户端类型")
-        private String clientId;
-
-        @ApiModelProperty("建议类型")
-        private SuggestionType type;
-
-        @ApiModelProperty("客户端类型")
-        private String clientType;
-
-        @ApiModelProperty("建议类型ID")
-        private Long suggestionTypeId;
+        private ClientEnum clientType;
 
         @ApiModelProperty("客户端信息")
         private String userAgent;
 
+        @ApiModelProperty("提交时间")
+        private Date createTime;
+
+        @ApiModelProperty("用户名")
+        private String nickname;
+
         @ApiModelProperty("处理状态：true:已处理，false:待处理")
         private Boolean handleStatus;
 
@@ -110,52 +137,67 @@ public class SysSuggestionWrapper {
         @ApiModelProperty("处理人")
         private Long handleBy;
 
+        @ApiModelProperty("处理态度")
+        private ESuggestionHandleAttitude handleAttitude;
+
+        @ApiModelProperty("处理人姓名")
+        private String handleName;
+
         @ApiModelProperty("是否反馈用户,true:是，false:否")
         private Boolean feedback;
 
         @ApiModelProperty("反馈内容")
         private String feedbackContent;
 
-//        @ApiModelProperty(value = "用户名")
-//        private String username;
+        @ApiModelProperty("学校ID")
+        private Long schoolId;
 
-        @ApiModelProperty(value = "处理人姓名")
-        private String handleName;
-
-        @ApiModelProperty("建议类型名称")
-        private String suggestionTypeName;
-
-        @ApiModelProperty("用户名")
-        private String nickname;
-
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
+        @ApiModelProperty("学校名称")
+        private String schoolName;
 
         public static SysSuggestion from(String json) {
             return JSON.parseObject(json, SysSuggestion.class);
         }
+
+    }
+
+    /**
+     * 客服
+     */
+    @Data
+    public static class CustomerServiceContact {
+
+        @ApiModelProperty("客服电话")
+        private String phone;
+
+        @ApiModelProperty("客服邮箱")
+        private String email;
     }
 
     @ApiModel("处理反馈意见模型")
     @Data
     public static class HandleSuggestion {
 
-        @ApiModelProperty("id")
+        @ApiModelProperty(value = "id", required = true)
         @NotNull
         private Long id;
 
-        @ApiModelProperty("是否反馈用户,true:是，false:否")
+        @ApiModelProperty(value = "是否反馈用户,true:是，false:否", required = true)
         @NotNull
         private Boolean feedback;
 
-        @ApiModelProperty("反馈内容")
+        @ApiModelProperty(value = "反馈内容", required = true)
         @NotNull
         private String feedbackContent;
 
+        @ApiModelProperty(value = "处理态度", required = true)
+        @NotNull
+        private ESuggestionHandleAttitude handleAttitude;
+
         @ApiModelProperty(value = "处理人", hidden = true)
         private Long handleBy;
 
+
     }
 
-}
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysSuggestionTypeMapper.xml

@@ -2,8 +2,6 @@
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.mapper.SysSuggestionTypeMapper">
 
-
-
     <!-- 表字段 -->
     <sql id="baseColumns">
         t.id_ AS id

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysSuggestionV2Mapper.xml

@@ -0,0 +1,102 @@
+<?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.yonge.cooleshow.biz.dal.mapper.SysSuggestionV2Mapper">
+
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.SysSuggestionV2">
+        <result column="id_" property="id" />
+        <result column="suggestion_type_id_" property="suggestionTypeId" />
+        <result column="mobile_no_" property="mobileNo" />
+        <result column="type_" property="type" />
+        <result column="title_" property="title" />
+        <result column="content_" property="content" />
+        <result column="attachment_urls_" property="attachmentUrls" />
+        <result column="user_id_" property="userId" />
+        <result column="client_type_" property="clientType" />
+        <result column="user_agent_" property="userAgent" />
+        <result column="create_time_" property="createTime" />
+        <result column="handle_status_" property="handleStatus" />
+        <result column="handle_time_" property="handleTime" />
+        <result column="handle_by_" property="handleBy" />
+        <result column="handle_attitude_" property="handleAttitude" />
+        <result column="feedback_" property="feedback" />
+        <result column="feedback_content_" property="feedbackContent" />
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        ,t.suggestion_type_id_ as suggestionTypeId
+        , t.mobile_no_ as mobileNo
+        , t.type_ as type
+        , t.title_ as title
+        , t.content_ as content
+        , t.attachment_urls_ as attachmentUrls
+        , t.user_id_ as userId
+        , t.client_type_ as clientType
+        , t.user_agent_ as userAgent
+        , t.create_time_ as createTime
+        , t.handle_status_ as handleStatus
+        , t.handle_time_ as handleTime
+        , t.handle_by_ as handleBy
+        , t.handle_attitude_ as handleAttitude
+        , t.feedback_ as feedback
+        , t.feedback_content_ as feedbackContent
+    </sql>
+
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.SysSuggestionWrapper$SysSuggestion">
+		SELECT
+        	<include refid="baseColumns" />,
+        sst.name_ as suggestionTypeName
+		FROM sys_suggestion t
+        LEFT JOIN sys_suggestion_type sst on t.suggestion_type_id_ = sst.id_
+        <if test="param.keyword!=null and param.keyword.trim()!=''">
+            LEFT JOIN sys_account su ON su.id_ = t.user_id_
+        </if>
+		<where>
+            <if test="param.keyword!=null and param.keyword.trim()!=''">
+                AND su.username_ LIKE CONCAT('%', #{param.keyword}, '%')
+            </if>
+            <if test="param.type != null">
+                AND t.type_ = #{param.type}
+            </if>
+		    <if test="param.clientType != null">
+                AND t.client_type_ = #{param.clientType}
+            </if>
+            <if test="param.startTime!=null">
+                AND t.create_time_ >= #{param.startTime}
+            </if>
+            <if test="param.endTime!=null">
+                AND #{param.endTime} >= t.create_time_
+            </if>
+            <if test="param.suggestionTypeId != null">
+                AND t.suggestion_type_id_ = #{param.suggestionTypeId}
+            </if>
+            <if test="param.suggestionTypeName != null and param.suggestionTypeName.trim() != ''">
+                AND sst.name_ = #{param.suggestionTypeName}
+            </if>
+            <if test="param.handleStatus != null">
+                AND t.handle_status_ = #{param.handleStatus}
+            </if>
+            <if test="param.handleBy != null">
+                AND t.handle_by_ = #{param.handleBy}
+            </if>
+            <if test="param.handStartTime != null">
+                AND t.handle_time_ >= #{param.handStartTime}
+            </if>
+            <if test="param.handEndTime != null">
+                AND #{param.handEndTime} >= t.handle_time_
+            </if>
+            <if test="param.handleAttitude != null">
+                AND t.handle_attitude_ = #{param.handleAttitude}
+            </if>
+            <if test="param.feedback != null">
+                AND t.feedback_ = #{param.feedback}
+            </if>
+            <if test="param.userId != null">
+                AND t.user_id_ = #{param.userId}
+            </if>
+        </where>
+        ORDER BY t.id_ DESC
+	</select>
+
+</mapper>