问题列表bug修改

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);
 
     /**
      * 移动端-我的项目列表

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);
     }
 

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>