oms修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -27,6 +27,16 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long id;
 
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String realCreateBy;

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -42,6 +42,29 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String createCompanyId;
 
+    @ApiModelProperty(value = "创建结束日期")
+    @Excel(name = "创建结束日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createEndTime;
+    /**更新日期*/
+    @ApiModelProperty(value = "创建开始日期")
+    @Excel(name = "创建开始日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createStartTime;
+
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String goodsNumber;

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectBusinessDocumentOrderPo">
-        select ID, REAL_CREATE_BY, REAL_CREATE_NAME, CREATE_BY, CREATE_COMPANY_ID, CREATE_TIME, UPDATE_BY, UPDATE_TIME, GOODS_NUMBER, LOADING_AREA_ID, LOADING_NAME, LOADING_ADDRESS, LOADING_LONGITUDE, LOADING_LATITUDE, LOADING_UNIT, FREIGHTER_NAME, LOADING_PHONE, LOADING_DATE, UNLOAD_AREA_ID, UNLOAD_NAME, UNLOAD_ADDRESS, UNLOAD_LONGITUDE, UNLOAD_LATITUDE, DISCHARGER_NAME, UNLOAD_PHONE, UNLOADING_DATA, GOODS_TYPE_ID, GOODS_TYPE, GOODS_NAME_ID, GOODS_NAME, WEIGHT_MIN, WEIGHT_MAX, GOODS_UNTIS_ID, GOODS_UNTIS, TRANSPORTATION_MODE_ID, TRANSPORTATION_NAME, CAR_TYPE, CAR_TYPE_NAME, SERVICE_REQUIRE_ID, SERVICE_REQUIRE, REMARKS, WAYBILL_FROM, IS_SOURCE, SOURCE_CLOSE_TIME, EXECUTOR_ID, IS_DELETE, LINE_TITLE_LEFT, LINE_TITLE_RIGHT, SYS_ORG_CODE, IS_COMMON, GOODS_TYPE_MAJOR, AUDIT_STATUS, WAYBILL_MODE, LATEST_BIDDING_TIME, DELIVERY_FREIGHT, COLLECTED_FREIGHT, UNCOLLECTED_FREIGHT, COLLECT_LESS_FREIGHT, AUDIT_BY, AUDIT_TIME, BUSINESS_TYPE, TRANSPORTATION_UNIT_PRICE, RADIO_VALUE, CREATER_NAME, CREATER_PHONE, IS_ELECTRIC_FENCE, WXA_QRCODE, APPOINT_SHIPPER_ID, CREATE_USER_ID, APPOINT_SHIPPER, IS_STATUS, SIGNATURE_ADDRESS, QR_CODE_IMG_URL, SHIPPING_NOTE, RECEIVABLE_TYPE, THIRD_PARTY_ORDER_NUMBER, DISPATCH_ORDER_NUMBER, APPOINT_DRIVER_ENTERPRISE_ID, APPOINT_DRIVER_ENTERPRISE, CANCEL_ORDER_REMARK, ORDER_DRIVER_ID, GOODS_QUANTITY, GOODS_QUANTITY_UNIT_ID, GOODS_QUANTITY_UNIT, BIDDING_UNIT, ORDER_STATUS, SPLICING_ORDER_TYPE, SPLICING_STATUS, MAIN_ORDER_ID, MAIN_ORDER_NUM, MERGE_ORDER_ID, MERGE_ORDER_NUM, PAYER_TYPE, MACHINE_NUMBER, STOCK_FLAG, INFO_FEE, INFO_FEE_PAYEE_TYPE, INFO_FEE_PAYEE, INFO_FEE_STATUS, INFO_FEE_DOCUMENT_NUMBER, ORDER_SHIPPING_TYPE, RECIPIENT_ID, RECIPIENT_NAME, SETTLEMENT_STATUS, SETTLEMENT_TIME, PAYMENT_TIME, RECONCILIATION_INNER_NUMBER, RECEIVE_PAYMENT_NUMBER, INVOICE_ID, IS_INVOICE, VEHICLE_TYPE_ID, VEHICLE_TYPE_NAME, CARRIER, CARRIER_NAME, SZWL_USER_ID, FREIGHT_UNIT_PRICE, BIDDING_STATUS, BIDDING_REMARKS, CARGO_INSURANCE_AMOUNT, DESTINATION, FREIGHT_CHARGES, PAYER, SALESMAN_ID, IS_DECLARE, ROUTE, CONTAINER_TYPE, CONTAINER_TYPE_NAME, CARD_TYPE, CARD_TYPE_NAME, EXTERNAL_CONTAINER_NO, TRANSIT_PLACE, SHIPPER, CUSTOMS_SHIPPER, CUSTOMS_SHIPPER_TEL, UNLOADING_COMPANY, CONTRACT_NO, FREIGHT_FEE, UNLOADING_FEE, CUSTOMS_FEE, SHORTAGE_FEE, MISCELLANEOUS_FEE, OTHER_FEE, DETENTION_FEE, TAX_RATE, SETTLEMENT_CURRENCY, VOLUME, DETAIL_CONTENT, CUSTOMS_ROUTE, CUSTOMS_PORT, CUSTOMS_CONTACT, CUSTOMS_CONTACT_PHONE, CUSTOMS_REMARK, ORG_ID, GOODS_CATEGORY, MAKER_CODE_NC, SALESMAN_CODE_NC, CUSTOMER_CODE_NC, SALESMAN_NAME, ORG_NAME, ORGANIZATION_ID, ORGANIZATION_NAME, TOP_ORGANIZATION_ID, DOCUMENT_DATE from business_document_order
+        select * from business_document_order
     </sql>
 
     <sql id="selectBusinessDocumentOrderPo1">
@@ -180,27 +180,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null ">
             and 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="createBy != null  and createBy != ''">
-            and CREATE_BY = #{createBy}
-        </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="createCompanyId != null  and createCompanyId != ''">
             and CREATE_COMPANY_ID = #{createCompanyId}
         </if>
-        <if test="createTime != null ">
-            and CREATE_TIME = #{createTime}
+        <if test="createStartTime != null">
+            and CREATE_TIME &gt;= #{createStartTime}
         </if>
-        <if test="updateBy != null  and updateBy != ''">
-            and UPDATE_BY = #{updateBy}
-        </if>
-        <if test="updateTime != null ">
-            and UPDATE_TIME = #{updateTime}
+        <if test="createEndTime != null">
+            and CREATE_TIME &lt;= DATE_ADD(#{createEndTime}, INTERVAL 1 DAY - 1 SECOND)
         </if>
+
+<!--        <if test="updateTime != null ">-->
+<!--            and UPDATE_TIME = #{updateTime}-->
+<!--        </if>-->
         <if test="goodsNumber != null  and goodsNumber != ''">
             and GOODS_NUMBER = #{goodsNumber}
         </if>
@@ -639,30 +638,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="topOrganizationId != null ">
-            and TOP_ORGANIZATION_ID = #{topOrganizationId}
-        </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>