销售订单添加类型

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -109,4 +109,9 @@ public class ContractSelectDto extends BaseSelectDto {
      * 交期结束
      */
     private Date deliveryTimeEnd;
+
+    /**
+     * 订单类型 0销售合同 1样品单
+     */
+    private Integer type;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -443,4 +443,9 @@ public class Contract extends BasePo {
      */
     private Long deptId;
 
+    /**
+     * 订单类型 0销售合同 1样品单
+     */
+    private Integer type;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -394,6 +394,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         //交期时间范围过滤
         wrapper.ge("t1", Contract::getDeliveryTime, dto.getDeliveryTimeSta());
         wrapper.le("t1", Contract::getDeliveryTime, dto.getDeliveryTimeEnd());
+
+        //订单类型过滤
+        wrapper.eq("t1", Contract::getType, dto.getType());
     }
 
     /**