From d78884745566805eadf6c82ac8f683f3d1220a80 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Thu, 16 Sep 2021 17:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=A6=81=E6=8F=90=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SuggestionFeedbackController.java | 13 +++ .../controller/SuggestionMakeController.java | 2 +- .../controller/SuggestionTypeController.java | 16 +++- .../suggestion/dao/SuggestionMakeDao.java | 21 +++++ .../suggestion/dao/SuggestionTypeDao.java | 29 +++++++ .../entity/SuggestionTypeEntity.java | 28 ++++++- .../service/SuggestionFeedbackService.java | 11 +++ .../service/SuggestionTypeService.java | 2 + .../impl/SuggestionFeedbackServiceImpl.java | 27 ++++++ .../impl/SuggestionMakeServiceImpl.java | 35 +++++--- .../impl/SuggestionTypeServiceImpl.java | 67 +++++++++++++-- .../suggestion/SuggestionFeedbackDao.xml | 2 +- .../mapper/suggestion/SuggestionMakeDao.xml | 83 ++++++++++++++++++- .../mapper/suggestion/SuggestionTypeDao.xml | 21 +++++ 14 files changed, 325 insertions(+), 32 deletions(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionFeedbackController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionFeedbackController.java index 2c5aa32..8376de8 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionFeedbackController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionFeedbackController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.FeedbackInfoDTO; import com.elink.esua.epdc.dto.suggestion.SuggestionFeedbackDTO; import com.elink.esua.epdc.modules.suggestion.excel.SuggestionFeedbackExcel; import com.elink.esua.epdc.modules.suggestion.service.SuggestionFeedbackService; @@ -91,4 +92,16 @@ public class SuggestionFeedbackController { ExcelUtils.exportExcelToTarget(response, null, list, SuggestionFeedbackExcel.class); } + /** + * 查询 回馈信息 + * + * @param suggestionMarkId + * @return java.util.List + * @Author zhangyong + * @Date 15:33 2021-09-16 + **/ + @GetMapping("feedbackInfo/{suggestionMarkId}") + public Result> feedbackInfo(@PathVariable("suggestionMarkId") String suggestionMarkId) { + return new Result>().ok(suggestionFeedbackService.getFeedbackInfo(suggestionMarkId)); + } } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionMakeController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionMakeController.java index e6fb78c..a24ce29 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionMakeController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionMakeController.java @@ -130,7 +130,7 @@ public class SuggestionMakeController { * @Author zhangyong * @Date 15:58 2021-09-14 **/ - @PostMapping("mySuggestion") + @GetMapping("mySuggestion") public Result> mySuggestion(@RequestBody MySuggestionFormDTO formDTO) { return suggestionMakeService.getMySuggestion(formDTO); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionTypeController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionTypeController.java index 529665e..8c08080 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionTypeController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/controller/SuggestionTypeController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.suggestion.SuggestionTypeDTO; import com.elink.esua.epdc.modules.suggestion.excel.SuggestionTypeExcel; @@ -33,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -56,6 +58,12 @@ public class SuggestionTypeController { return new Result>().ok(page); } + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = suggestionTypeService.list(params); + return new Result>().ok(list); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id){ SuggestionTypeDTO data = suggestionTypeService.get(id); @@ -78,11 +86,11 @@ public class SuggestionTypeController { return new Result(); } - @DeleteMapping - public Result delete(@RequestBody String[] ids){ + @DeleteMapping("{id}") + public Result delete(@PathVariable("id") Long id){ //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - suggestionTypeService.delete(ids); + AssertUtils.isNull(id, "id"); + suggestionTypeService.deleteBatchIds(Arrays.asList(new Long[]{id})); return new Result(); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionMakeDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionMakeDao.java index d8ea1b2..f6a4293 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionMakeDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionMakeDao.java @@ -18,12 +18,15 @@ package com.elink.esua.epdc.modules.suggestion.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.suggestion.SuggestionMakeDTO; import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO; import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; import com.elink.esua.epdc.modules.suggestion.entity.SuggestionMakeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 我有建议要提 @@ -43,4 +46,22 @@ public interface SuggestionMakeDao extends BaseDao { * @Date 16:29 2021-09-14 **/ List selectListMySuggestion(MySuggestionFormDTO formDTO); + + /** + * PC 首页查询 + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 14:10 2021-09-16 + **/ + List selectListPage(Map params); + + /** + * 详情查询 + * @param id + * @return com.elink.esua.epdc.dto.suggestion.SuggestionMakeDTO + * @Author zhangyong + * @Date 15:13 2021-09-16 + **/ + SuggestionMakeDTO selectDetailById(@Param("id") String id); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionTypeDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionTypeDao.java index ed2d50b..6691bdd 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionTypeDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/dao/SuggestionTypeDao.java @@ -22,6 +22,7 @@ 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 org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; @@ -44,4 +45,32 @@ public interface SuggestionTypeDao extends BaseDao { * @Date 14:23 2021-09-14 **/ List selectListSuggestionTypeTree(); + + /** + * 查询所有 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 15:10 2021-09-15 + **/ + List getList(Map params); + + /** + * 所有部门的id、pid列表 + * @param + * @return java.util.List + * @Author zhangyong + * @Date 17:49 2021-09-15 + **/ + List getIdAndPidList(); + + /** + * 详情查询 + * @param id + * @return com.elink.esua.epdc.dto.suggestion.SuggestionTypeDTO + * @Author zhangyong + * @Date 18:05 2021-09-15 + **/ + SuggestionTypeDTO getById(@PathVariable("id") String id); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/entity/SuggestionTypeEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/entity/SuggestionTypeEntity.java index c54ae5d..5442a09 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/entity/SuggestionTypeEntity.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/entity/SuggestionTypeEntity.java @@ -17,9 +17,11 @@ package com.elink.esua.epdc.modules.suggestion.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +36,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("epdc_suggestion_type") -public class SuggestionTypeEntity extends BaseEpdcEntity { +public class SuggestionTypeEntity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -46,7 +48,7 @@ public class SuggestionTypeEntity extends BaseEpdcEntity { /** * 上级ID */ - private String pid; + private Long pid; /** * 所有上级ID，用逗号分开 @@ -63,4 +65,22 @@ public class SuggestionTypeEntity extends BaseEpdcEntity { */ private String enableFlag; + /** + * 删除标识 0：未删除 1：删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private Integer delFlag; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateDate; } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionFeedbackService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionFeedbackService.java index cc3a8c4..6096a02 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionFeedbackService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionFeedbackService.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.suggestion.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.FeedbackInfoDTO; import com.elink.esua.epdc.dto.suggestion.SuggestionFeedbackDTO; import com.elink.esua.epdc.modules.suggestion.entity.SuggestionFeedbackEntity; @@ -92,4 +93,14 @@ public interface SuggestionFeedbackService extends BaseService + * @Author zhangyong + * @Date 15:34 2021-09-16 + **/ + List getFeedbackInfo(String suggestionMarkId); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionTypeService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionTypeService.java index 7549635..36af55a 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionTypeService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/SuggestionTypeService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.suggestion.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.suggestion.SuggestionTypeDTO; import com.elink.esua.epdc.modules.suggestion.entity.SuggestionTypeEntity; @@ -104,4 +105,5 @@ public interface SuggestionTypeService extends BaseService * @Date 14:15 2021-09-14 **/ Result> getSuggestionTypeTree(); + } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionFeedbackServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionFeedbackServiceImpl.java index 264c5ec..d19d6b1 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionFeedbackServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionFeedbackServiceImpl.java @@ -20,14 +20,20 @@ package com.elink.esua.epdc.modules.suggestion.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dto.FeedbackInfoDTO; import com.elink.esua.epdc.dto.suggestion.SuggestionFeedbackDTO; import com.elink.esua.epdc.modules.suggestion.dao.SuggestionFeedbackDao; import com.elink.esua.epdc.modules.suggestion.entity.SuggestionFeedbackEntity; +import com.elink.esua.epdc.modules.suggestion.entity.SuggestionMakeEntity; import com.elink.esua.epdc.modules.suggestion.redis.SuggestionFeedbackRedis; import com.elink.esua.epdc.modules.suggestion.service.SuggestionFeedbackService; +import com.elink.esua.epdc.modules.suggestion.service.SuggestionMakeService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,6 +54,8 @@ public class SuggestionFeedbackServiceImpl extends BaseServiceImpl page(Map params) { @@ -84,16 +92,31 @@ public class SuggestionFeedbackServiceImpl extends BaseServiceImpl getFeedbackInfo(String suggestionMarkId) { + return baseDao.selectListMyFeedbackContent(suggestionMarkId); + } } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionMakeServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionMakeServiceImpl.java index 8ba6037..5569445 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionMakeServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/suggestion/service/impl/SuggestionMakeServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.suggestion.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.StrConstant; 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.constant.ImageConstant; import com.elink.esua.epdc.dto.suggestion.SuggestionMakeDTO; @@ -34,19 +34,18 @@ import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; import com.elink.esua.epdc.modules.suggestion.dao.CustomImgDao; import com.elink.esua.epdc.modules.suggestion.dao.SuggestionFeedbackDao; import com.elink.esua.epdc.modules.suggestion.dao.SuggestionMakeDao; +import com.elink.esua.epdc.modules.suggestion.dao.SuggestionTypeDao; import com.elink.esua.epdc.modules.suggestion.entity.SuggestionMakeEntity; +import com.elink.esua.epdc.modules.suggestion.entity.SuggestionTypeEntity; import com.elink.esua.epdc.modules.suggestion.redis.SuggestionMakeRedis; import com.elink.esua.epdc.modules.suggestion.service.CustomImgService; import com.elink.esua.epdc.modules.suggestion.service.SuggestionMakeService; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 我有建议要提 @@ -65,14 +64,14 @@ public class SuggestionMakeServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, SuggestionMakeDTO.class); + IPage page = getPage(params); + List list = baseDao.selectListPage(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -93,8 +92,18 @@ public class SuggestionMakeServiceImpl extends BaseServiceImpl> suggestionPicList = new ArrayList<>(); + for (int i = 0; i < urls.length; i++) { + Map map = new HashMap<>(); + map.put("name", i + ""); + map.put("url", urls[i]); + suggestionPicList.add(map); + } + result.setSuggestionPicList(suggestionPicList); + return result; } @Override @@ -172,6 +181,8 @@ public class SuggestionMakeServiceImpl extends BaseServiceImpl list(Map params) { -// List result = baseDao.getList(params); - return null;//TreeUtils.build(result); + List dtos = baseDao.getList(params); + + return TreeUtils.build(dtos); } private QueryWrapper getWrapper(Map params){ @@ -80,14 +85,14 @@ public class SuggestionTypeServiceImpl extends BaseServiceImpl> getSuggestionTypeTree() { List nodes = baseDao.selectListSuggestionTypeTree(); - Map> children = nodes.stream().filter(node -> !(node.getPid().equals(NumConstant.ZERO_STR))) + Map> children = nodes.stream().filter(node -> !(node.getPid().equals(NumConstant.ZERO))) .collect(Collectors.groupingBy(node -> node.getPid())); nodes.forEach(node -> node.setChildren(children.get(node.getValue()))); List result = nodes.stream().filter(node -> node.getPid().equals(NumConstant.ZERO_STR)).collect(Collectors.toList()); return new Result>().ok(result); } + + /** + * 获取所有上级部门ID + * + * @param pid 上级ID + */ + private String getPidList(Long pid) { + //顶级部门，无上级部门 + if (Constant.DEPT_ROOT.equals(pid)) { + return Constant.DEPT_ROOT + ""; + } + + //所有部门的id、pid列表 + List deptList = baseDao.getIdAndPidList(); + + //list转map + Map map = new HashMap<>(deptList.size()); + for (SuggestionTypeEntity entity : deptList) { + map.put(entity.getId(), entity); + } + + //递归查询所有上级部门ID列表 + List pidList = new ArrayList<>(); + getPidTree(pid, map, pidList); + + return StringUtils.join(pidList, ","); + } + + private void getPidTree(Long pid, Map map, List pidList) { + //顶级部门，无上级部门 + if (Constant.DEPT_ROOT.equals(pid)) { + return; + } + + //上级部门存在 + SuggestionTypeEntity parent = map.get(pid); + if (parent != null) { + getPidTree(parent.getPid(), map, pidList); + } + + pidList.add(pid); + } + + } diff --git a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionFeedbackDao.xml b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionFeedbackDao.xml index e8486cf..19bafdd 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionFeedbackDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionFeedbackDao.xml @@ -23,7 +23,7 @@ FEEDBACK_CONTENT, DEPT_ID, DEPT_NAME, - DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') createTime + DATE_FORMAT(CREATED_TIME, '%Y.%m.%d') createdTime FROM epdc_suggestion_feedback WHERE DEL_FLAG ='0' diff --git a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionMakeDao.xml b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionMakeDao.xml index 746e33d..7e0205d 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionMakeDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionMakeDao.xml @@ -43,7 +43,7 @@ m.PARTY_FLAG, m.IS_FEEDBACK, t.SUGGESTION_NAME suggestionTypeName, - DATE_FORMAT(m.CREATED_TIME, '%Y-%m-%d') createTime + DATE_FORMAT(m.CREATED_TIME, '%Y.%m.%d') createdTime 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' @@ -53,4 +53,85 @@ ORDER BY m.IS_FEEDBACK DESC, m.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} + + + + diff --git a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionTypeDao.xml b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionTypeDao.xml index 72b2dbe..54826b1 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionTypeDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/suggestion/SuggestionTypeDao.xml @@ -29,4 +29,25 @@ AND ENABLE_FLAG ='1' ORDER BY SORT + + + + + +