增加反参

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionTypeDao.java

@@ -19,10 +19,12 @@ package com.elink.esua.epdc.modules.suggestion.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.TypeNode;
+import com.elink.esua.epdc.dto.suggestion.SuggestionTypeDTO;
 import com.elink.esua.epdc.modules.suggestion.entity.SuggestionTypeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 建议类别表

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionTypeServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dto.TypeNode;
 import com.elink.esua.epdc.dto.suggestion.SuggestionTypeDTO;
 import com.elink.esua.epdc.modules.suggestion.dao.SuggestionTypeDao;
@@ -64,9 +65,8 @@ public class SuggestionTypeServiceImpl extends BaseServiceImpl<SuggestionTypeDao
 
     @Override
     public List<SuggestionTypeDTO> list(Map<String, Object> params) {
-        List<SuggestionTypeEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, SuggestionTypeDTO.class);
+//        List<SuggestionTypeDTO> result = baseDao.getList(params);
+        return null;//TreeUtils.build(result);
     }
 
     private QueryWrapper<SuggestionTypeEntity> getWrapper(Map<String, Object> params){

epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionFeedbackDao.xml

@@ -22,7 +22,8 @@
             ID,
             FEEDBACK_CONTENT,
             DEPT_ID,
-            DEPT_NAME
+            DEPT_NAME,
+            DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') createTime
         FROM epdc_suggestion_feedback
         WHERE DEL_FLAG ='0'
         <if test="suggestionId != null and suggestionId != ''">

epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionMakeDao.xml

@@ -42,14 +42,15 @@
             m.MOBILE,
             m.PARTY_FLAG,
             m.IS_FEEDBACK,
-            t.SUGGESTION_NAME suggestionTypeName
+            t.SUGGESTION_NAME suggestionTypeName,
+            DATE_FORMAT(m.CREATED_TIME, '%Y-%m-%d') createTime
         FROM epdc_suggestion_make m
         LEFT JOIN epdc_suggestion_type t ON m.SUGGESTION_TYPE_ID = t.ID AND t.DEL_FLAG = '0'
         WHERE m.DEL_FLAG = '0'
         <if test="userId != null and userId != ''">
             AND USER_ID = #{userId}
         </if>
-        ORDER BY m.CREATED_TIME DESC
+        ORDER BY m.IS_FEEDBACK DESC, m.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 </mapper>