修改交换分页不同查询条件

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -65,17 +65,28 @@
         <where>
             cd.bz is null
             and cd.qyxz!='10'
-            and cd.DELETED=0   and (t1.cfnum!=0   or  t2.yxcfnum!=0)
+            and cd.DELETED=0
+            <choose>
+                <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
+                         or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
+                         or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
+                         or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
+                    and t1.cfnum !=0
+                </when>
+                <otherwise>
+                   and  (t1.cfnum !=0  or t2.yxcfnum !=0)
+                </otherwise>
+            </choose>
             <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
                 and ck.xzqhdm like #{pageReqVO.areaCode}
             </if>
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null ">
                 and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+            <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd==null ">
                 and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
-            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null ">
                 and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
             </if>           
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
@@ -139,13 +150,24 @@
         <where>
             cd.qyxz!='10'
             and cd.DELETED=0
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <choose>
+                <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
+                         or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
+                         or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
+                         or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
+                    and t1.cfnum !=0
+                </when>
+                <otherwise>
+                   and  (t1.cfnum !=0  or t2.yxcfnum !=0)
+                </otherwise>
+            </choose>
+            <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd!=null">
                 and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+            <if test="pageReqVO.kqStart!=null  and pageReqVO.kqEnd==null">
                 and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
-            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null">
                 and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
             </if>
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
@@ -246,13 +268,24 @@
         ) t3 on t3.KQ_ID=ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <choose>
+                <when test=" (pageReqVO.cflx!=null and pageReqVO.cflx!='')
+                         or (pageReqVO.cfzt!=null and pageReqVO.cfzt!='')
+                         or (pageReqVO.cfStart!=null and pageReqVO.cfStart !='')
+                         or (pageReqVO.cfEnd!=null and pageReqVO.cfEnd !='') ">
+                    and t1.cfnum !=0
+                </when>
+                <otherwise>
+                   and  (t1.cfnum !=0  or t2.yxcfnum !=0)
+                </otherwise>
+            </choose>
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd!=null">
                 and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqEnd==null ">
                 and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
-            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+            <if test="pageReqVO.kqStart==null  and pageReqVO.kqEnd!=null">
                 and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
             </if>
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">