日期

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractDto.java

@@ -33,10 +33,16 @@ public class ContractDto extends PageParam {
     private Integer secondType;
 
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private LocalDate contractOn;
+    private LocalDate contractOnStart;
 
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private LocalDate contractOff;
+    private LocalDate contractOnEnd;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate contractOffStart;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate contractOffEnd;
 
     /**
      * 开始签订时间

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

@@ -51,11 +51,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.contractOff != null">
-                AND c.CONTRACT_OFF &lt;= #{params.contractOff}
+            <if test="params != null and params.contractOffEnd != null">
+                AND c.CONTRACT_ON &lt;= #{params.contractOnEnd}
+            </if>
+            <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}
@@ -192,11 +198,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.contractOff != null">
-                AND c.CONTRACT_OFF &lt;= #{params.contractOff}
+            <if test="params != null and params.contractOffEnd != null">
+                AND c.CONTRACT_ON &lt;= #{params.contractOnEnd}
+            </if>
+            <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}