合同取消查询条件修改

src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm

@@ -75,6 +75,15 @@
         <bm:query-field field="contract_status" queryOperator="="/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="((t1.sign_contract_status='NEW' and t1.contract_status='NEW') or (t1.sign_contract_status='SIGN_RETURN' and t1.contract_status='NEW') or (t1.sign_contract_status='SIGN_RETURN' and t1.contract_status='INCEPT_RETURN'))"/>
+        <bm:data-filter name="query" expression=" ((t1.sign_contract_status = 'NEW' AND t1.contract_status = 'NEW') OR
+        (t1.sign_contract_status = 'SIGN_RETURN' AND
+        t1.contract_status = 'NEW') OR
+        (t1.sign_contract_status = 'SIGN_RETURN' AND
+        t1.contract_status = 'INCEPT_RETURN')OR
+        (t1.sign_contract_status = 'SIGN' AND
+        t1.contract_status = 'NEW') OR
+        (t1.sign_contract_status = 'SIGN' AND
+        t1.contract_status = 'INCEPT_RETURN'))
+        and nvl(t1.sign_type,'PAPER_SIGN')='PAPER_SIGN'"/>
     </bm:data-filters>
 </bm:model>