From 9469c140d77bec60718110edf72f6cc1721cdf0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 19 Nov 2019 16:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/controller/WorkItemController.java   |  1 +
 .../main/resources/mapper/item/ItemDao.xml    | 37 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
index c481523db..3defd7432 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
@@ -10,6 +10,7 @@ import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
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 7572059ab..80e7b4be5 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
@@ -577,7 +577,7 @@
     <select id="selectOneItemStatistics" resultType="com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO">
         SELECT
             pendingTable.pendingHandleNum,
-	        closingTable.closeingCaseNum,
+	        closingTable.closingCaseNum,
             closedTable.closedNum
         FROM
 	           (
@@ -591,20 +591,19 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '0'
-            AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
-
-        <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND dept.DEPT_ID = #{formDto.deptId}
+               AND dept.DEPT_ID IN
+        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+            #{deptIdItem}
+        </foreach>
+        <if test='deptId != null and deptId != ""'>
+            AND dept.DEPT_ID = #{deptId}
         </if>
 
 	           ) pendingTable
 	    INNER JOIN (
            SELECT
 	           'ITEM_COUNT' AS keystr,
-	           COUNT( * ) AS closeingCaseNum
+	           COUNT( * ) AS closingCaseNum
            FROM
 	           epdc_item item
 	           LEFT JOIN epdc_item_dept dept ON item.id = dept.ITEM_ID
@@ -612,12 +611,12 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '10'
-            AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
-        <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND dept.DEPT_ID = #{formDto.deptId}
+	           AND dept.DEPT_ID IN
+        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+            #{deptIdItem}
+        </foreach>
+        <if test='deptId != null and deptId != ""'>
+            AND dept.DEPT_ID = #{deptId}
         </if>
 	           ) closingTable ON pendingTable.keystr = closingTable.keystr
 	    INNER JOIN (
@@ -633,11 +632,11 @@
 	           AND item.ITEM_STATE = '5'
 
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
-                #{deptId}
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
             </foreach>
-        <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND dept.DEPT_ID = #{formDto.deptId}
+        <if test='deptId != null and deptId != ""'>
+            AND dept.DEPT_ID = #{deptId}
         </if>
 	           ) closedTable ON pendingTable.keystr = closedTable.keystr
     </select>