进出口查询条件添加

This commit is contained in:
zhaoqing
2026-05-15 11:34:50 +08:00
parent dba352b2f2
commit 6e78c30676
3 changed files with 568 additions and 1 deletions
@@ -823,4 +823,24 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
private List<BusinessDocumentAddressMultiDTO> loadingAddressList;
@ApiModelProperty(value = "卸货地址集合")
private List<BusinessDocumentAddressMultiDTO> unloadAddressList;
@ApiModelProperty(value = "单证日期起")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date documentDateStart;
@ApiModelProperty(value = "单证日期止")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date documentDateEnd;
@ApiModelProperty(value = "推送时间起")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeStart;
@ApiModelProperty(value = "推送时间止")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeEnd;
}
@@ -840,4 +840,24 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty(value = "物料明细列表")
private List<OrderWithMaterialDTO> orderWithMaterialDTOList;
@ApiModelProperty(value = "单证日期起")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date documentDateStart;
@ApiModelProperty(value = "单证日期止")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date documentDateEnd;
@ApiModelProperty(value = "推送时间起")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeStart;
@ApiModelProperty(value = "推送时间止")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeEnd;
}
@@ -676,6 +676,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="documentDate != null ">
and DOCUMENT_DATE = #{documentDate}
</if>
<if test="documentDateStart != null">
and DOCUMENT_DATE <![CDATA[>=]]> #{documentDateStart}
</if>
<if test="documentDateEnd != null">
and DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd}
</if>
<if test="pushTimeStart != null">
and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
</if>
<if test="pushTimeEnd != null">
and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
</if>
<if test="ieType != null ">
and IE_TYPE = #{ieType}
</if>
@@ -696,8 +708,523 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select o.*,a.material_code , a.material_base_info_id ,a.product_type
from business_document_order as o
left join business_document_cargo_multi as a ON o.id = a.order_id
<include refid="selectBusinessDocumentOrderPo1"/>
<include refid="selectBusinessDocumentOrderPo3"/>
order by create_time desc
</select>
<sql id="selectBusinessDocumentOrderPo3">
<where>
<if test="id != null ">
and o.ID = #{id}
</if>
<!-- <if test="realCreateBy != null and realCreateBy != ''">-->
<!-- and REAL_CREATE_BY = #{realCreateBy}-->
<!-- </if>-->
<!-- <if test="realCreateName != null and realCreateName != ''">-->
<!-- and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%')-->
<!-- </if>-->
<if test="orderSource != null and orderSource != ''">
and ORDER_SOURCE = #{orderSource}
</if>
<if test="inOrderNumber != null and inOrderNumber != ''">
AND IN_ORDER_NUMBER LIKE CONCAT('%', #{inOrderNumber}, '%')
</if>
<if test="createCompanyId != null and createCompanyId != ''">
and CREATE_COMPANY_ID = #{createCompanyId}
</if>
<if test="createStartTime != null">
and CREATE_TIME &gt;= #{createStartTime}
</if>
<if test="createEndTime != null">
and CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
</if>
<!-- <if test="updateTime != null ">-->
<!-- and UPDATE_TIME = #{updateTime}-->
<!-- </if>-->
<if test="goodsNumber != null and goodsNumber != ''">
AND GOODS_NUMBER LIKE CONCAT('%', #{goodsNumber}, '%')
</if>
<if test="loadingAreaId != null and loadingAreaId != ''">
and LOADING_AREA_ID = #{loadingAreaId}
</if>
<if test="loadingName != null and loadingName != ''">
and LOADING_NAME like concat('%', #{loadingName}, '%')
</if>
<if test="loadingAddress != null and loadingAddress != ''">
and LOADING_ADDRESS = #{loadingAddress}
</if>
<if test="loadingLongitude != null and loadingLongitude != ''">
and LOADING_LONGITUDE = #{loadingLongitude}
</if>
<if test="loadingLatitude != null and loadingLatitude != ''">
and LOADING_LATITUDE = #{loadingLatitude}
</if>
<if test="loadingUnit != null and loadingUnit != ''">
and LOADING_UNIT = #{loadingUnit}
</if>
<if test="freighterName != null and freighterName != ''">
and FREIGHTER_NAME like concat('%', #{freighterName}, '%')
</if>
<if test="loadingPhone != null and loadingPhone != ''">
and LOADING_PHONE = #{loadingPhone}
</if>
<if test="loadingDate != null ">
and LOADING_DATE = #{loadingDate}
</if>
<if test="unloadAreaId != null and unloadAreaId != ''">
and UNLOAD_AREA_ID = #{unloadAreaId}
</if>
<if test="unloadName != null and unloadName != ''">
and UNLOAD_NAME like concat('%', #{unloadName}, '%')
</if>
<if test="unloadAddress != null and unloadAddress != ''">
and UNLOAD_ADDRESS = #{unloadAddress}
</if>
<if test="unloadLongitude != null and unloadLongitude != ''">
and UNLOAD_LONGITUDE = #{unloadLongitude}
</if>
<if test="unloadLatitude != null and unloadLatitude != ''">
and UNLOAD_LATITUDE = #{unloadLatitude}
</if>
<if test="dischargerName != null and dischargerName != ''">
and DISCHARGER_NAME like concat('%', #{dischargerName}, '%')
</if>
<if test="unloadPhone != null and unloadPhone != ''">
and UNLOAD_PHONE = #{unloadPhone}
</if>
<if test="unloadingData != null ">
and UNLOADING_DATA = #{unloadingData}
</if>
<if test="goodsTypeId != null and goodsTypeId != ''">
and GOODS_TYPE_ID = #{goodsTypeId}
</if>
<if test="goodsType != null and goodsType != ''">
and GOODS_TYPE = #{goodsType}
</if>
<if test="goodsNameId != null and goodsNameId != ''">
and GOODS_NAME_ID = #{goodsNameId}
</if>
<if test="goodsName != null and goodsName != ''">
and GOODS_NAME like concat('%', #{goodsName}, '%')
</if>
<if test="weightMin != null ">
and WEIGHT_MIN = #{weightMin}
</if>
<if test="weightMax != null ">
and WEIGHT_MAX = #{weightMax}
</if>
<if test="goodsUntisId != null and goodsUntisId != ''">
and GOODS_UNTIS_ID = #{goodsUntisId}
</if>
<if test="goodsUntis != null and goodsUntis != ''">
and GOODS_UNTIS = #{goodsUntis}
</if>
<if test="transportationModeId != null ">
and TRANSPORTATION_MODE_ID = #{transportationModeId}
</if>
<if test="transportationName != null and transportationName != ''">
and TRANSPORTATION_NAME like concat('%', #{transportationName}, '%')
</if>
<if test="carType != null and carType != ''">
and CAR_TYPE = #{carType}
</if>
<if test="carTypeName != null and carTypeName != ''">
and CAR_TYPE_NAME like concat('%', #{carTypeName}, '%')
</if>
<if test="serviceRequireId != null and serviceRequireId != ''">
and SERVICE_REQUIRE_ID = #{serviceRequireId}
</if>
<if test="serviceRequire != null and serviceRequire != ''">
and SERVICE_REQUIRE = #{serviceRequire}
</if>
<if test="remarks != null and remarks != ''">
and REMARKS = #{remarks}
</if>
<if test="waybillFrom != null ">
and WAYBILL_FROM = #{waybillFrom}
</if>
<if test="isSource != null ">
and IS_SOURCE = #{isSource}
</if>
<if test="sourceCloseTime != null ">
and SOURCE_CLOSE_TIME = #{sourceCloseTime}
</if>
<if test="executorId != null and executorId != ''">
and EXECUTOR_ID = #{executorId}
</if>
<if test="isDelete != null ">
and IS_DELETE = #{isDelete}
</if>
<if test="lineTitleLeft != null and lineTitleLeft != ''">
and LINE_TITLE_LEFT = #{lineTitleLeft}
</if>
<if test="lineTitleRight != null and lineTitleRight != ''">
and LINE_TITLE_RIGHT = #{lineTitleRight}
</if>
<if test="sysOrgCode != null and sysOrgCode != ''">
and SYS_ORG_CODE = #{sysOrgCode}
</if>
<if test="isCommon != null ">
and IS_COMMON = #{isCommon}
</if>
<if test="goodsTypeMajor != null and goodsTypeMajor != ''">
and GOODS_TYPE_MAJOR = #{goodsTypeMajor}
</if>
<if test="auditStatus != null ">
and AUDIT_STATUS = #{auditStatus}
</if>
<if test="waybillMode != null ">
and WAYBILL_MODE = #{waybillMode}
</if>
<if test="latestBiddingTime != null ">
and LATEST_BIDDING_TIME = #{latestBiddingTime}
</if>
<if test="deliveryFreight != null ">
and DELIVERY_FREIGHT = #{deliveryFreight}
</if>
<if test="collectedFreight != null ">
and COLLECTED_FREIGHT = #{collectedFreight}
</if>
<if test="uncollectedFreight != null ">
and UNCOLLECTED_FREIGHT = #{uncollectedFreight}
</if>
<if test="collectLessFreight != null ">
and COLLECT_LESS_FREIGHT = #{collectLessFreight}
</if>
<if test="auditBy != null and auditBy != ''">
and AUDIT_BY = #{auditBy}
</if>
<if test="auditTime != null ">
and AUDIT_TIME = #{auditTime}
</if>
<if test="businessType != null and businessType != ''">
and BUSINESS_TYPE = #{businessType}
</if>
<if test="transportationUnitPrice != null ">
and TRANSPORTATION_UNIT_PRICE = #{transportationUnitPrice}
</if>
<if test="radioValue != null ">
and RADIO_VALUE = #{radioValue}
</if>
<if test="createrName != null and createrName != ''">
and CREATER_NAME like concat('%', #{createrName}, '%')
</if>
<if test="createrPhone != null and createrPhone != ''">
and CREATER_PHONE = #{createrPhone}
</if>
<if test="isElectricFence != null ">
and IS_ELECTRIC_FENCE = #{isElectricFence}
</if>
<if test="wxaQrcode != null and wxaQrcode != ''">
and WXA_QRCODE = #{wxaQrcode}
</if>
<if test="appointShipperId != null and appointShipperId != ''">
and APPOINT_SHIPPER_ID = #{appointShipperId}
</if>
<if test="createUserId != null and createUserId != ''">
and CREATE_USER_ID = #{createUserId}
</if>
<if test="appointShipper != null and appointShipper != ''">
AND APPOINT_SHIPPER LIKE CONCAT('%', #{appointShipper}, '%')
</if>
<if test="isStatus != null ">
and IS_STATUS = #{isStatus}
</if>
<if test="signatureAddress != null and signatureAddress != ''">
and SIGNATURE_ADDRESS = #{signatureAddress}
</if>
<if test="qrCodeImgUrl != null and qrCodeImgUrl != ''">
and QR_CODE_IMG_URL = #{qrCodeImgUrl}
</if>
<if test="shippingNote != null and shippingNote != ''">
and SHIPPING_NOTE = #{shippingNote}
</if>
<if test="receivableType != null ">
and RECEIVABLE_TYPE = #{receivableType}
</if>
<if test="thirdPartyOrderNumber != null and thirdPartyOrderNumber != ''">
and THIRD_PARTY_ORDER_NUMBER = #{thirdPartyOrderNumber}
</if>
<if test="dispatchOrderNumber != null and dispatchOrderNumber != ''">
and DISPATCH_ORDER_NUMBER = #{dispatchOrderNumber}
</if>
<if test="appointDriverEnterpriseId != null and appointDriverEnterpriseId != ''">
and APPOINT_DRIVER_ENTERPRISE_ID = #{appointDriverEnterpriseId}
</if>
<if test="appointDriverEnterprise != null and appointDriverEnterprise != ''">
and APPOINT_DRIVER_ENTERPRISE = #{appointDriverEnterprise}
</if>
<if test="cancelOrderRemark != null and cancelOrderRemark != ''">
and CANCEL_ORDER_REMARK = #{cancelOrderRemark}
</if>
<if test="orderDriverId != null and orderDriverId != ''">
and ORDER_DRIVER_ID = #{orderDriverId}
</if>
<if test="goodsQuantity != null ">
and GOODS_QUANTITY = #{goodsQuantity}
</if>
<if test="goodsQuantityUnitId != null and goodsQuantityUnitId != ''">
and GOODS_QUANTITY_UNIT_ID = #{goodsQuantityUnitId}
</if>
<if test="goodsQuantityUnit != null and goodsQuantityUnit != ''">
and GOODS_QUANTITY_UNIT = #{goodsQuantityUnit}
</if>
<if test="biddingUnit != null and biddingUnit != ''">
and BIDDING_UNIT = #{biddingUnit}
</if>
<if test="orderStatus != null ">
and ORDER_STATUS = #{orderStatus}
</if>
<if test="splicingOrderType != null ">
and SPLICING_ORDER_TYPE = #{splicingOrderType}
</if>
<if test="splicingStatus != null ">
and SPLICING_STATUS = #{splicingStatus}
</if>
<if test="mainOrderId != null and mainOrderId != ''">
and MAIN_ORDER_ID = #{mainOrderId}
</if>
<if test="mainOrderNum != null and mainOrderNum != ''">
and MAIN_ORDER_NUM = #{mainOrderNum}
</if>
<if test="mergeOrderId != null and mergeOrderId != ''">
and MERGE_ORDER_ID = #{mergeOrderId}
</if>
<if test="mergeOrderNum != null and mergeOrderNum != ''">
and MERGE_ORDER_NUM = #{mergeOrderNum}
</if>
<if test="payerType != null ">
and PAYER_TYPE = #{payerType}
</if>
<if test="machineNumber != null and machineNumber != ''">
and MACHINE_NUMBER = #{machineNumber}
</if>
<if test="stockFlag != null ">
and STOCK_FLAG = #{stockFlag}
</if>
<if test="infoFee != null ">
and INFO_FEE = #{infoFee}
</if>
<if test="infoFeePayeeType != null ">
and INFO_FEE_PAYEE_TYPE = #{infoFeePayeeType}
</if>
<if test="infoFeePayee != null and infoFeePayee != ''">
and INFO_FEE_PAYEE = #{infoFeePayee}
</if>
<if test="infoFeeStatus != null ">
and INFO_FEE_STATUS = #{infoFeeStatus}
</if>
<if test="infoFeeDocumentNumber != null and infoFeeDocumentNumber != ''">
and INFO_FEE_DOCUMENT_NUMBER = #{infoFeeDocumentNumber}
</if>
<if test="orderShippingType != null ">
and ORDER_SHIPPING_TYPE = #{orderShippingType}
</if>
<if test="recipientId != null and recipientId != ''">
and RECIPIENT_ID = #{recipientId}
</if>
<if test="recipientName != null and recipientName != ''">
and RECIPIENT_NAME like concat('%', #{recipientName}, '%')
</if>
<if test="settlementStatus != null ">
and SETTLEMENT_STATUS = #{settlementStatus}
</if>
<if test="settlementTime != null ">
and SETTLEMENT_TIME = #{settlementTime}
</if>
<if test="paymentTime != null ">
and PAYMENT_TIME = #{paymentTime}
</if>
<if test="reconciliationInnerNumber != null and reconciliationInnerNumber != ''">
and RECONCILIATION_INNER_NUMBER = #{reconciliationInnerNumber}
</if>
<if test="receivePaymentNumber != null and receivePaymentNumber != ''">
and RECEIVE_PAYMENT_NUMBER = #{receivePaymentNumber}
</if>
<if test="invoiceId != null and invoiceId != ''">
and INVOICE_ID = #{invoiceId}
</if>
<if test="isInvoice != null ">
and IS_INVOICE = #{isInvoice}
</if>
<if test="vehicleTypeId != null and vehicleTypeId != ''">
and VEHICLE_TYPE_ID = #{vehicleTypeId}
</if>
<if test="vehicleTypeName != null and vehicleTypeName != ''">
and VEHICLE_TYPE_NAME like concat('%', #{vehicleTypeName}, '%')
</if>
<if test="carrier != null and carrier != ''">
and CARRIER = #{carrier}
</if>
<if test="carrierName != null and carrierName != ''">
and CARRIER_NAME like concat('%', #{carrierName}, '%')
</if>
<if test="szwlUserId != null ">
and SZWL_USER_ID = #{szwlUserId}
</if>
<if test="freightUnitPrice != null ">
and FREIGHT_UNIT_PRICE = #{freightUnitPrice}
</if>
<if test="biddingStatus != null ">
and BIDDING_STATUS = #{biddingStatus}
</if>
<if test="biddingRemarks != null and biddingRemarks != ''">
and BIDDING_REMARKS = #{biddingRemarks}
</if>
<if test="cargoInsuranceAmount != null ">
and CARGO_INSURANCE_AMOUNT = #{cargoInsuranceAmount}
</if>
<if test="destination != null and destination != ''">
and DESTINATION = #{destination}
</if>
<if test="freightCharges != null ">
and FREIGHT_CHARGES = #{freightCharges}
</if>
<if test="payer != null and payer != ''">
and PAYER = #{payer}
</if>
<if test="salesmanId != null and salesmanId != ''">
and SALESMAN_ID = #{salesmanId}
</if>
<if test="isDeclare != null ">
and IS_DECLARE = #{isDeclare}
</if>
<if test="route != null and route != ''">
and ROUTE = #{route}
</if>
<if test="containerType != null and containerType != ''">
and CONTAINER_TYPE = #{containerType}
</if>
<if test="containerTypeName != null and containerTypeName != ''">
and CONTAINER_TYPE_NAME like concat('%', #{containerTypeName}, '%')
</if>
<if test="cardType != null and cardType != ''">
and CARD_TYPE = #{cardType}
</if>
<if test="cardTypeName != null and cardTypeName != ''">
and CARD_TYPE_NAME like concat('%', #{cardTypeName}, '%')
</if>
<if test="externalContainerNo != null and externalContainerNo != ''">
and EXTERNAL_CONTAINER_NO = #{externalContainerNo}
</if>
<if test="transitPlace != null and transitPlace != ''">
and TRANSIT_PLACE = #{transitPlace}
</if>
<if test="shipper != null and shipper != ''">
and SHIPPER = #{shipper}
</if>
<if test="customsShipper != null and customsShipper != ''">
and CUSTOMS_SHIPPER = #{customsShipper}
</if>
<if test="customsShipperTel != null and customsShipperTel != ''">
and CUSTOMS_SHIPPER_TEL = #{customsShipperTel}
</if>
<if test="unloadingCompany != null and unloadingCompany != ''">
and UNLOADING_COMPANY = #{unloadingCompany}
</if>
<if test="contractNo != null and contractNo != ''">
and CONTRACT_NO = #{contractNo}
</if>
<if test="freightFee != null ">
and FREIGHT_FEE = #{freightFee}
</if>
<if test="unloadingFee != null ">
and UNLOADING_FEE = #{unloadingFee}
</if>
<if test="customsFee != null ">
and CUSTOMS_FEE = #{customsFee}
</if>
<if test="shortageFee != null ">
and SHORTAGE_FEE = #{shortageFee}
</if>
<if test="miscellaneousFee != null ">
and MISCELLANEOUS_FEE = #{miscellaneousFee}
</if>
<if test="otherFee != null ">
and OTHER_FEE = #{otherFee}
</if>
<if test="detentionFee != null ">
and DETENTION_FEE = #{detentionFee}
</if>
<if test="taxRate != null ">
and TAX_RATE = #{taxRate}
</if>
<if test="settlementCurrency != null and settlementCurrency != ''">
and SETTLEMENT_CURRENCY = #{settlementCurrency}
</if>
<if test="volume != null ">
and VOLUME = #{volume}
</if>
<if test="detailContent != null and detailContent != ''">
and DETAIL_CONTENT = #{detailContent}
</if>
<if test="customsRoute != null and customsRoute != ''">
and CUSTOMS_ROUTE = #{customsRoute}
</if>
<if test="customsPort != null and customsPort != ''">
and CUSTOMS_PORT = #{customsPort}
</if>
<if test="customsContact != null and customsContact != ''">
and CUSTOMS_CONTACT = #{customsContact}
</if>
<if test="customsContactPhone != null and customsContactPhone != ''">
and CUSTOMS_CONTACT_PHONE = #{customsContactPhone}
</if>
<if test="customsRemark != null and customsRemark != ''">
and CUSTOMS_REMARK = #{customsRemark}
</if>
<if test="orgId != null and orgId != ''">
and ORG_ID = #{orgId}
</if>
<if test="goodsCategory != null and goodsCategory != ''">
and GOODS_CATEGORY = #{goodsCategory}
</if>
<!-- <if test="makerCodeNc != null and makerCodeNc != ''">-->
<!-- and MAKER_CODE_NC = #{makerCodeNc}-->
<!-- </if>-->
<!-- <if test="salesmanCodeNc != null and salesmanCodeNc != ''">-->
<!-- and SALESMAN_CODE_NC = #{salesmanCodeNc}-->
<!-- </if>-->
<!-- <if test="customerCodeNc != null and customerCodeNc != ''">-->
<!-- and CUSTOMER_CODE_NC = #{customerCodeNc}-->
<!-- </if>-->
<!-- <if test="salesmanName != null and salesmanName != ''">-->
<!-- and SALESMAN_NAME like concat('%', #{salesmanName}, '%')-->
<!-- </if>-->
<!-- <if test="orgName != null and orgName != ''">-->
<!-- and ORG_NAME like concat('%', #{orgName}, '%')-->
<!-- </if>-->
<if test="organizationId != null ">
and ORGANIZATION_ID = #{organizationId}
</if>
<!-- <if test="organizationName != null and organizationName != ''">-->
<!-- and ORGANIZATION_NAME like concat('%', #{organizationName}, '%')-->
<!-- </if>-->
<if test="documentDate != null ">
and DOCUMENT_DATE = #{documentDate}
</if>
<if test="documentDateStart != null">
and DOCUMENT_DATE <![CDATA[>=]]> #{documentDateStart}
</if>
<if test="documentDateEnd != null">
and DOCUMENT_DATE <![CDATA[<=]]> #{documentDateEnd}
</if>
<if test="pushTimeStart != null">
and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
</if>
<if test="pushTimeEnd != null">
and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
</if>
<if test="ieType != null ">
and IE_TYPE = #{ieType}
</if>
</where>
</sql>
</mapper>