From 0f0b7f24c989d48fc6f0e732b6b396cd003c06c7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Jul 2021 18:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E9=87=87=E9=9B=86-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E3=80=91-=E7=8E=8B?= =?UTF-8?q?=E5=85=AC=E5=B3=B0-2021-07-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/controller/EpdcAppItemController.java | 6 +++--- .../java/com/elink/esua/epdc/modules/item/dao/ItemDao.java | 2 +- .../elink/esua/epdc/modules/item/service/ItemService.java | 2 +- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 072d0dfef..f8c4a70cb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -46,10 +46,10 @@ public class EpdcAppItemController { * @Author: wanggongfeng * @Date: 2021/7/5 16:39 */ - @GetMapping("listByQuestion") - public Result> listByQuestion(@RequestBody ItemByQuestionFormDTO formDto) { + @GetMapping("getQuestionList") + public Result> getQuestionList(@RequestBody ItemByQuestionFormDTO formDto) { ValidatorUtils.validateEntity(formDto); - return this.itemService.listByQuestion(formDto); + return this.itemService.getQuestionList(formDto); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 63f608b08..a53b4a56b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -71,7 +71,7 @@ public interface ItemDao extends BaseDao { * @Author: wanggongfeng * @Date: 2021/7/5 16:39 */ - List selectListOfItemsByQuestion(ItemByQuestionFormDTO formDto, int[] states); + List getQuestionList(ItemByQuestionFormDTO formDto, int[] states); /** * 移动端-我的项目列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 02a4eb591..1c445dbe5 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -164,7 +164,7 @@ public interface ItemService extends BaseService { * @Author: wanggongfeng * @Date: 2021/7/5 16:39 */ - Result> listByQuestion(ItemByQuestionFormDTO formDto); + Result> getQuestionList(ItemByQuestionFormDTO formDto); /** * @describe: 新增问题采集-关联新增项目表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 1da9e7eb2..0122bd775 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -279,14 +279,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem } @Override - public Result> listByQuestion(ItemByQuestionFormDTO formDto) { + public Result> getQuestionList(ItemByQuestionFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); // 查询半年内的数据 formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6)); // 查询数据状态 int[] states = {EventIssueItemState.ITEM_HANDLING, EventIssueItemState.ITEM_CLOSEING_CASE}; - List data = baseDao.selectListOfItemsByQuestion(formDto, states); + List data = baseDao.getQuestionList(formDto, states); return new Result>().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index f2cf353d8..32411e4d6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -116,7 +116,7 @@ item.CREATED_TIME DESC, img.IMG_URL - SELECT item.ID, item.EVENT_ID,