ljy121 1 year ago
parent
commit
dd23ddb0a1
1 changed files with 20 additions and 8 deletions
  1. 20 8
      zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

+ 20 - 8
zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -349,11 +349,17 @@
             <if test="params != null and params.amountStatus != null">
                 AND c.AMOUNT_STATUS = #{params.amountStatus}
             </if>
-            <if test="params != null and params.contractOn != null">
-                AND c.CONTRACT_OFF &gt;= #{params.contractOn}
+            <if test="params != null and params.contractOnStart != null">
+                AND c.CONTRACT_ON &gt;= #{params.contractOnStart}
+            </if>
+            <if test="params != null and params.contractOnEnd != null">
+                AND c.CONTRACT_ON &lt;= #{params.contractOnEnd}
             </if>
-            <if test="params != null and params.contractOff != null">
-                AND c.CONTRACT_OFF &lt;= #{params.contractOff}
+            <if test="params != null and params.contractOffStart != null">
+                AND c.CONTRACT_OFF &gt;= #{params.contractOffStart}
+            </if>
+            <if test="params != null and params.contractOffEnd != null">
+                AND c.CONTRACT_OFF &lt;= #{params.contractOffEnd}
             </if>
             <if test="params != null and params.signTimeStart != null">
                 AND c.SIGN_TIME &gt;= #{params.signTimeStart}
@@ -430,11 +436,17 @@
             <if test="params != null and params.amountStatus != null">
                 AND c.AMOUNT_STATUS = #{params.amountStatus}
             </if>
-            <if test="params != null and params.contractOn != null">
-                AND c.CONTRACT_OFF &gt;= #{params.contractOn}
+            <if test="params != null and params.contractOnStart != null">
+                AND c.CONTRACT_ON &gt;= #{params.contractOnStart}
+            </if>
+            <if test="params != null and params.contractOnEnd != null">
+                AND c.CONTRACT_ON &lt;= #{params.contractOnEnd}
             </if>
-            <if test="params != null and params.contractOff != null">
-                AND c.CONTRACT_OFF &lt;= #{params.contractOff}
+            <if test="params != null and params.contractOffStart != null">
+                AND c.CONTRACT_OFF &gt;= #{params.contractOffStart}
+            </if>
+            <if test="params != null and params.contractOffEnd != null">
+                AND c.CONTRACT_OFF &lt;= #{params.contractOffEnd}
             </if>
             <if test="params != null and params.signTimeStart != null">
                 AND c.SIGN_TIME &gt;= #{params.signTimeStart}