意见反馈

mec-application/src/main/java/com/ym/mec/web/controller/SysSuggestionController.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.page.SysSuggestionQueryInfo;
 import com.ym.mec.biz.service.SysSuggestionService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,7 @@ public class SysSuggestionController extends BaseController {
     @ApiOperation(value = "删除")
     @GetMapping("/del")
     @PreAuthorize("@pcs.hasPermissions('sysSuggestion/del')")
-    public Object del(Long id) {
+    public HttpResponseResult<Object> del(Long id) {
         sysSuggestionService.delete(id);
         return succeed();
     }
@@ -45,7 +46,7 @@ public class SysSuggestionController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysSuggestion/queryPage')")
-    public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<SysSuggestion>> queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
         return succeed(sysSuggestionService.queryPage(queryInfo));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/SysSuggestionService.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.SysSuggestion;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysSuggestionService extends BaseService<Long, SysSuggestion> {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysSuggestionServiceImpl.java

@@ -3,14 +3,19 @@ package com.ym.mec.biz.service.impl;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import io.swagger.models.auth.In;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,9 +25,8 @@ import com.ym.mec.biz.service.SysSuggestionService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestion>  implements SysSuggestionService {
@@ -35,6 +39,8 @@ public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestio
 	private SysConfigDao sysConfigDao;
 	@Autowired
 	private SysMessageService sysMessageService;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, SysSuggestion> getDAO() {
@@ -68,4 +74,5 @@ public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestio
 					sb.toString(),content,suggestion.getUserId().toString(),null,0,notifyUrl,"SYSTEM","STUDENT");
 		}
 	}
+
 }

mec-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -22,6 +22,7 @@
         <result column="suggestion_type_" property="suggestionType"/>
         <result column="suggestionTypeName" property="suggestionTypeName"/>
         <result column="operator_id_" property="operatorId"/>
+        <result column="operatorName" property="operatorName"/>
         <result column="operator_time_" property="operatorTime"/>
         <result column="operator_memo_" property="operatorMemo"/>
         <result column="feedback_flag_" property="feedbackFlag"/>
@@ -97,6 +98,9 @@
             <if test="search!=null and search!=''">
                 AND (su.real_name_ LIKE CONCAT('%', #{search}, '%') OR su.username_ LIKE CONCAT('%', #{search}, '%') OR ss.user_id_=#{search} OR su.phone_=#{search})
             </if>
+            <if test="operatorSearch != null and operatorSearch != ''">
+                AND (sue.real_name_ LIKE CONCAT('%', #{operatorSearch}, '%') OR ss.operator_id_ = #{operatorSearch} OR sue.phone_ LIKE CONCAT('%', #{operatorSearch}, '%'))
+            </if>
             <if test="suggestionType != null">
                 AND ss.suggestion_type_ = #{suggestionType}
             </if>
@@ -121,9 +125,10 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysSuggestion" parameterType="map">
         SELECT ss.*,CASE WHEN ss.client_type_='STUDENT' THEN su.username_ ELSE su.real_name_ END username_,
-        sut.type_ suggestionTypeName
+        sut.type_ suggestionTypeName,sue.real_name_ operatorName
         FROM sys_suggestion ss
         LEFT JOIN sys_user su ON su.id_ = ss.user_id_
+        LEFT JOIN sys_user sue ON sue.id_ = ss.operator_id_
         left join sys_suggestion_type sut ON sut.id_ = ss.suggestion_type_
         <include refid="queryCondition" />
         ORDER BY ss.id_ DESC
@@ -134,6 +139,7 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(ss.id_) FROM sys_suggestion ss
         LEFT JOIN sys_user su ON su.id_ = ss.user_id_
+        LEFT JOIN sys_user sue ON sue.id_ = ss.operator_id_
         <include refid="queryCondition" />
 	</select>
     <select id="getDetail" resultMap="SysSuggestion">