From d319fa11187cb08c0025f8d53fe6ba1a7d54f5af Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 6 Jul 2021 16:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/modules/item/dao/ItemDao.java   | 2 +-
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 5 ++++-
 .../src/main/resources/mapper/item/ItemDao.xml               | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

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 a53b4a56b..398c5ae2b 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<ItemEntity> {
      * @Author: wanggongfeng
      * @Date: 2021/7/5 16:39
      */
-    List<ItemResultDTO> getQuestionList(ItemByQuestionFormDTO formDto, int[] states);
+    List<ItemResultDTO> getQuestionList(ItemByQuestionFormDTO formDto, int[] states,String[] itemIdArr);
 
     /**
      * 移动端-我的项目列表
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 24e0efd69..24e7a2cbb 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
@@ -286,7 +286,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6));
         // 查询数据状态
         int[] states = {EventIssueItemState.ITEM_HANDLING, EventIssueItemState.ITEM_CLOSEING_CASE};
-        List<ItemResultDTO> data = baseDao.getQuestionList(formDto, states);
+        List<String> itemIdList = formDto.getItemIdList();
+        String[] itemIdArr = new String[itemIdList.size()];
+        itemIdList.toArray(itemIdArr);
+        List<ItemResultDTO> data = baseDao.getQuestionList(formDto, states,itemIdArr);
         return new Result<List<ItemResultDTO>>().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 dc2935f23..c224e7bc6 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
@@ -171,9 +171,12 @@
                     #{state}
                 </foreach>
                 AND t1.id IN
-                <foreach collection="formDto.itemIdList" index="index" item="itemId" open="(" separator="," close=")">
+                <foreach collection="itemIdArr" index="index" item="itemId" open="(" separator="," close=")">
                     #{itemId}
                 </foreach>
+                <if test="formDto.someMonthsAgo != null">
+                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{formDto.someMonthsAgo}
+                </if>
                 <if test="formDto.timestamp != null">
                     <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
                 </if>