查询条件拆分

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 9333627393ca5101c24221718ee54c603829c4c9
+Subproject commit 262b5b5d9d9ac7f82b303d431f197b2f414ea373

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -2185,19 +2185,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
+            and i.ITEM_STATE = #{itemState}
+        </if>
+        <if test="evaluationState != null and evaluationState != ''">
             <choose>
-                <when test="itemState == '80'">
+                <when test="evaluationState == '80'">
                     and i.EVALUATION_STATE = '1'
                     and i.EVALUATION_TIME IS NULL
                     and i.ITEM_STATE != '10'
                 </when >
-                <when test="itemState == '90'">
+                <when test="evaluationState == '90'">
                     and i.EVALUATION_TIME IS NOT NULL
-                    and i.ITEM_STATE != '10'
                 </when >
-                <otherwise>
-                    and i.ITEM_STATE = #{itemState}
-                </otherwise>
             </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">
@@ -2302,19 +2301,18 @@
             and i.PEOPLE_FLAG = #{appealType}
         </if>
         <if test="itemState != null and itemState != ''">
+            and i.ITEM_STATE = #{itemState}
+        </if>
+        <if test="evaluationState != null and evaluationState != ''">
             <choose>
-                <when test="itemState == '80'">
+                <when test="evaluationState == '80'">
                     and i.EVALUATION_STATE = '1'
                     and i.EVALUATION_TIME IS NULL
                     and i.ITEM_STATE != '10'
                 </when >
-                <when test="itemState == '90'">
+                <when test="evaluationState == '90'">
                     and i.EVALUATION_TIME IS NOT NULL
-                    and i.ITEM_STATE != '10'
                 </when >
-                <otherwise>
-                    and i.ITEM_STATE = #{itemState}
-                </otherwise>
             </choose>
         </if>
         <if test="deptIdList != null and deptIdList.size() > 0">