hujh 3 rokov pred
rodič
commit
146d73e71b
43 zmenil súbory, kde vykonal 3429 pridanie a 678 odobranie
  1. 43 317
      .idea/workspace.xml
  2. 1 1
      pom.xml
  3. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java
  4. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java
  5. 4 4
      src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java
  6. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java
  7. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java
  8. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java
  9. 1 1
      src/main/java/com/steerinfo/dil/controller/RmsShipperController.java
  10. 4 3
      src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java
  11. 39 24
      src/main/java/com/steerinfo/dil/model/RmsCarrier.java
  12. 0 2
      src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java
  13. 2 1
      src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java
  14. 21 17
      src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java
  15. 22 5
      src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java
  16. 1 1
      src/main/resources/bootstrap.yml
  17. 109 82
      src/main/resources/com/steerinfo/dil/mapper/RmsCarrierMapper.xml
  18. 110 0
      src/test/java/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.java
  19. 10 0
      src/test/java/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.java
  20. 2149 0
      src/test/java/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.xml
  21. 602 0
      src/test/java/com/steerinfo/dil/rmscarrier/model/RmsCarrier.java
  22. 23 0
      src/test/java/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.java
  23. 36 0
      src/test/java/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.java
  24. BIN
      target/classes/com/steerinfo/dil/controller/RmsCapacityController.class
  25. BIN
      target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class
  26. BIN
      target/classes/com/steerinfo/dil/controller/RmsCarrierController.class
  27. BIN
      target/classes/com/steerinfo/dil/controller/RmsGatepostController.class
  28. BIN
      target/classes/com/steerinfo/dil/controller/RmsMaterialController.class
  29. BIN
      target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class
  30. BIN
      target/classes/com/steerinfo/dil/controller/RmsShipperController.class
  31. BIN
      target/classes/com/steerinfo/dil/controller/RmsSupplierController.class
  32. 109 82
      target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml
  33. BIN
      target/classes/com/steerinfo/dil/model/RmsCarrier.class
  34. BIN
      target/classes/com/steerinfo/dil/service/IRmsSupplierService.class
  35. BIN
      target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class
  36. BIN
      target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class
  37. 131 131
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  38. 7 2
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  39. BIN
      target/test-classes/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.class
  40. BIN
      target/test-classes/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.class
  41. BIN
      target/test-classes/com/steerinfo/dil/rmscarrier/model/RmsCarrier.class
  42. BIN
      target/test-classes/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.class
  43. BIN
      target/test-classes/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.class

+ 43 - 317
.idea/workspace.xml

@@ -20,310 +20,36 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_48.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_48.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_client_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_client_1_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_core_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_core_1_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_javase_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_javase_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_steerinfo_framework_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_steerinfo_framework_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_1_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_1_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_6_0_ALPHA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_6_0_ALPHA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j_1_3_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j_1_3_8_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_10_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dil-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dil-api.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarrierMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarrierMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsGatepostMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsGatepostMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsShipperMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsShipperMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCarrier.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCarrier.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsGatepostService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsGatepostService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsShipperMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsShipperMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsGatepostController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsGatepostController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCapacityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCapacityService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsConsigneeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsConsigneeService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -364,7 +90,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -379,11 +105,11 @@
       <recent name="com.steerinfo.dil.model" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\resources\com\steerinfo\dil\mapper" />
       <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl" />
       <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service" />
       <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\resources\com\steerinfo\dil\mapper" />
       <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model" />
-      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper" />
     </key>
   </component>
   <component name="RunManager">
@@ -459,65 +185,65 @@
     </state>
     <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639965013078" />
     <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1640272173598" />
-    <state width="1237" height="99" key="GridCell.Tab.0.bottom" timestamp="1640338194677">
+    <state width="1237" height="280" key="GridCell.Tab.0.bottom" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1237" height="280" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.0.center" timestamp="1640338194677">
+    <state width="1237" height="280" key="GridCell.Tab.0.center" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1237" height="280" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.0.left" timestamp="1640338194676">
+    <state width="1237" height="280" key="GridCell.Tab.0.left" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194676" />
+    <state width="1237" height="280" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438695" />
-    <state width="1237" height="99" key="GridCell.Tab.0.right" timestamp="1640338194677">
+    <state width="1237" height="280" key="GridCell.Tab.0.right" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1237" height="280" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.1.bottom" timestamp="1640338194348">
+    <state width="1237" height="280" key="GridCell.Tab.1.bottom" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1237" height="280" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.1.center" timestamp="1640338194348">
+    <state width="1237" height="280" key="GridCell.Tab.1.center" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1237" height="280" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.1.left" timestamp="1640338194348">
+    <state width="1237" height="280" key="GridCell.Tab.1.left" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1237" height="280" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.1.right" timestamp="1640338194348">
+    <state width="1237" height="280" key="GridCell.Tab.1.right" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1237" height="280" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="99" key="GridCell.Tab.2.bottom" timestamp="1640338194349">
+    <state width="1237" height="280" key="GridCell.Tab.2.bottom" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <state width="1237" height="280" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="99" key="GridCell.Tab.2.center" timestamp="1640338194349">
+    <state width="1237" height="280" key="GridCell.Tab.2.center" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <state width="1237" height="280" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="99" key="GridCell.Tab.2.left" timestamp="1640338194348">
+    <state width="1237" height="280" key="GridCell.Tab.2.left" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1237" height="280" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="99" key="GridCell.Tab.2.right" timestamp="1640338194349">
+    <state width="1237" height="280" key="GridCell.Tab.2.right" timestamp="1640375147567">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="99" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <state width="1237" height="280" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1640375147567" />
     <state width="1493" height="136" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
     <state x="225" y="0" key="SettingsEditor" timestamp="1640336659804">
       <screen x="0" y="0" width="1280" height="680" />
@@ -546,8 +272,8 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java</url>
-          <line>131</line>
-          <option name="timeStamp" value="43" />
+          <line>214</line>
+          <option name="timeStamp" value="56" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

+ 1 - 1
pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_BID_AREA</param>
+                        <param>RMS_CARRIER</param>
                     </tables>
                 </configuration>
                 <executions>

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -47,7 +47,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     @PostMapping(value = "/insertCapacity")
     public RESTfulResult insertCapacity(@RequestBody(required = false) Map<String,Object> mapValue){
        int result = rmsCapacityService.insertCapacity(mapValue);
-       if (result==-1){
+       if (result <= 0){
            return failed();
        }
         return success(result);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java

@@ -50,7 +50,7 @@ public class RmsCarDriverController extends BaseRESTfulController {
     @PostMapping(value = "/insertCarDriver")
     public RESTfulResult insertCarDriver(@RequestBody(required = false) Map<String,Object> mapValue){
         int result = rmsCarDriverService.insertCarDriver(mapValue);
-        if (result==-1){
+        if (result <= 0){
             return failed();
         }
         return success(result);

+ 4 - 4
src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java

@@ -153,7 +153,7 @@ public class RmsCarrierController extends BaseRESTfulController {
     @PostMapping(value = "/insertCarrier")
     public RESTfulResult insertCarrier(@RequestBody(required = false) Map<String, Object> mapValue) throws ParseException {
         int result = rmsCarrierService.insertCarrier(mapValue);
-        if (result == -1) {
+        if (result <= 0) {
             return failed();
         }
         return success(result);
@@ -276,7 +276,7 @@ public class RmsCarrierController extends BaseRESTfulController {
     public RESTfulResult uploadCarrier1(@RequestParam("file") MultipartFile multipartFile) {
         String str="运输证";
         int result=rmsCarrierService.uploadCarrier(multipartFile,str);
-        if (result==-1){
+        if (result<1){
             return failed();
         }
         return success(result);
@@ -286,7 +286,7 @@ public class RmsCarrierController extends BaseRESTfulController {
     public RESTfulResult uploadCarrier2(@RequestParam("file") MultipartFile multipartFile) {
         String str = "经营许可证";
         Integer result=rmsCarrierService.uploadCarrier(multipartFile,str);
-        if (result==-1){
+        if (result<1){
             return failed();
         }
         return success(result);
@@ -296,7 +296,7 @@ public class RmsCarrierController extends BaseRESTfulController {
     public RESTfulResult uploadCarrier3(@RequestParam("file") MultipartFile  multipartFile) {
         String str = "营业执照";
         Integer result=rmsCarrierService.uploadCarrier(multipartFile,str);
-        if (result==-1){
+        if (result<1){
         return failed();
         }
         return success(result);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java

@@ -118,7 +118,7 @@ public class RmsGatepostController extends BaseRESTfulController {
     @PostMapping(value = "/insertGatepost")
     public RESTfulResult insertGatepost(@RequestBody RmsGatepost rmsGatepost)  {
         int result= rmsGatepostService.insertGatepost(rmsGatepost);
-        if (result==-1){
+        if (result <= 0){
             return failed();
         }
         return success(result);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java

@@ -111,7 +111,7 @@ public class RmsMaterialController extends BaseRESTfulController {
     @PostMapping(value = "/insertMaterial")
     public RESTfulResult insertMaterial(@RequestBody RmsMaterial rmsMaterial){
         int result = rmsMaterialService.insertMaterial(rmsMaterial);
-        if (result==-1){
+        if (result <= 0){
             return failed();
         }
         return success(result);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java

@@ -117,7 +117,7 @@ public class RmsPersonnelController extends BaseRESTfulController {
     @PostMapping(value = "/insertPersonnel")
     public RESTfulResult insertPersonnel(@RequestBody RmsPersonnel rmsPersonnel){
         int result=rmsPersonnelService.insertPersonnel(rmsPersonnel);
-        if (result==-1){
+        if (result <= 0){
             return failed();
         }
         return success(result);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/RmsShipperController.java

@@ -119,7 +119,7 @@ public class RmsShipperController extends BaseRESTfulController {
     @PostMapping(value = "/insertShipper")
     public RESTfulResult insertShipper(@RequestBody RmsShipper rmsShipper){
         int result= rmsShipperService.insertShipper(rmsShipper);
-        if(result==-1){
+        if(result <= 0){
             return failed();
         }
         return success(result);

+ 4 - 3
src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -102,9 +103,9 @@ public class RmsSupplierController extends BaseRESTfulController {
     @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "RmsSupplier")
     //@RequiresPermissions("rmssupplier:create")
     @PostMapping(value = "/insertSupplier")
-    public RESTfulResult insertSupplier(@RequestBody RmsSupplier rmsSupplier){
-        int result= rmsSupplierService.insertSupplier(rmsSupplier);
-        if (result==-1){
+    public RESTfulResult insertSupplier(@RequestBody(required = false) Map<String,Object> mapValue) throws ParseException {
+        int result= rmsSupplierService.insertSupplier(mapValue);
+        if (result <= 0){
             return failed();
         }
         return success(result);

+ 39 - 24
src/main/java/com/steerinfo/dil/model/RmsCarrier.java

@@ -10,7 +10,7 @@ import java.util.Date;
 @ApiModel(value="承运方")
 public class RmsCarrier implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(CARRIER_ID,DECIMAL,38)
+     * 主键ID(CARRIER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal carrierId;
@@ -22,7 +22,7 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
     private String carrierTransportType;
 
     /**
-     * 承运商名称(CARRIER_NAME,VARCHAR,32)
+     * 承运商名称(CARRIER_NAME,VARCHAR,100)
      */
     @ApiModelProperty(value="承运商名称",required=false)
     private String carrierName;
@@ -214,22 +214,28 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
     private String carrierType;
 
     /**
-     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,BLOB,4000)
+     * eas金蝶主键(EAS_CARRIER_ID,VARCHAR,50)
      */
-    @ApiModelProperty(value="运输证(照片)",required=false)
-    private byte[] carrierTransportCertificate;
+    @ApiModelProperty(value="eas金蝶主键",required=false)
+    private String easCarrierId;
+
+    /**
+     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="营业执照",required=false)
+    private String carrierBusinessAblelicense;
 
     /**
-     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,BLOB,4000)
+     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,50)
      */
     @ApiModelProperty(value="经营许可证(照片)",required=false)
-    private byte[] carrierBusinessLicense;
+    private String carrierBusinessLicense;
 
     /**
-     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,BLOB,4000)
+     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,50)
      */
-    @ApiModelProperty(value="营业执照",required=false)
-    private byte[] carrierBusinessAblelicense;
+    @ApiModelProperty(value="运输证(照片)",required=false)
+    private String carrierTransportCertificate;
 
     private static final long serialVersionUID = 1L;
 
@@ -512,31 +518,39 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
     }
 
     public void setCarrierType(String carrierType) {
-        this.carrierType = carrierType;
+        this.carrierType = carrierType == null ? null : carrierType.trim();
     }
 
-    public byte[] getCarrierTransportCertificate() {
-        return carrierTransportCertificate;
+    public String getEasCarrierId() {
+        return easCarrierId;
     }
 
-    public void setCarrierTransportCertificate(byte[] carrierTransportCertificate) {
-        this.carrierTransportCertificate = carrierTransportCertificate;
+    public void setEasCarrierId(String easCarrierId) {
+        this.easCarrierId = easCarrierId == null ? null : easCarrierId.trim();
     }
 
-    public byte[] getCarrierBusinessLicense() {
+    public String getCarrierBusinessAblelicense() {
+        return carrierBusinessAblelicense;
+    }
+
+    public void setCarrierBusinessAblelicense(String carrierBusinessAblelicense) {
+        this.carrierBusinessAblelicense = carrierBusinessAblelicense == null ? null : carrierBusinessAblelicense.trim();
+    }
+
+    public String getCarrierBusinessLicense() {
         return carrierBusinessLicense;
     }
 
-    public void setCarrierBusinessLicense(byte[] carrierBusinessLicense) {
-        this.carrierBusinessLicense = carrierBusinessLicense;
+    public void setCarrierBusinessLicense(String carrierBusinessLicense) {
+        this.carrierBusinessLicense = carrierBusinessLicense == null ? null : carrierBusinessLicense.trim();
     }
 
-    public byte[] getCarrierBusinessAblelicense() {
-        return carrierBusinessAblelicense;
+    public String getCarrierTransportCertificate() {
+        return carrierTransportCertificate;
     }
 
-    public void setCarrierBusinessAblelicense(byte[] carrierBusinessAblelicense) {
-        this.carrierBusinessAblelicense = carrierBusinessAblelicense;
+    public void setCarrierTransportCertificate(String carrierTransportCertificate) {
+        this.carrierTransportCertificate = carrierTransportCertificate == null ? null : carrierTransportCertificate.trim();
     }
 
     @Override
@@ -579,9 +593,10 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
         sb.append(", carrierType=").append(carrierType);
-        sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
-        sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
+        sb.append(", easCarrierId=").append(easCarrierId);
         sb.append(", carrierBusinessAblelicense=").append(carrierBusinessAblelicense);
+        sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
+        sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

+ 0 - 2
src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java

@@ -36,6 +36,4 @@ public interface IRmsCarrierService {
     List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal);
 //    处理承运商照片
     int uploadCarrier(MultipartFile multipartFile, String str);
-//    将承运商照片插入到相对应的字段数据中
-//    int insertCarrierPhoto(Map<String, Object> map);
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service;
 import com.steerinfo.dil.model.RmsSupplier;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@ public interface IRmsSupplierService {
 //    查询供应商列表
     List<Map<String, Object>> getSupplierList(Map<String, Object> mapVal);
 //增加供应商
-    int  insertSupplier(RmsSupplier rmsSupplier);
+    int  insertSupplier(Map<String, Object> mapValue) throws ParseException;
 //更新供应商
     int updateSupplier(RmsSupplier rmsSupplier);
 //删除供应商

+ 21 - 17
src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java

@@ -129,8 +129,8 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
     @Override
     public int insertCarrier(Map<String, Object> mapValue) throws ParseException {
 //        获取用户名以及默认密码
-        String username = (String) mapValue.get("username");
-        String password = "123456";
+//        String username = (String) mapValue.get("username");
+//        String password = "123456";
 
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -215,7 +215,6 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         String name = multipartFile.getName();
         Long workId = 0L;
         Long datacenterId = 0L;
-        byte[] fileNames=null;
 //        id自动生成器
         IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
 //        图片存储的地址
@@ -228,24 +227,29 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
          System.out.println(FileNames);
          //         判断照片是否能上传成功
          if (FileNames!=null){
-             fileNames = UploadUtils.imageToByte(FileNames);
-             map.put(str,fileNames);
+             map.put(str,FileNames);
 //             将照片的二进制插入到数据库
-//             RmsCarrier rmsCarrier=new RmsCarrier();
-//             rmsCarrier.setCarrierId(rmsCarrierMapper.getMaxCarrierId());
-//             if (map.get("运输证")!=null){
-//                 rmsCarrier.setCarrierTransportCertificate((byte[]) map.get("运输证"));
-//             }
-//             if (map.get("经营许可证")!=null){
-//                 rmsCarrier.setCarrierBusinessLicense((byte[])map.get("经营许可证"));
-//             }
-//             if (map.get("营业执照")!=null){
-//                 rmsCarrier.setCarrierBusinessAblelicense((byte[])map.get("营业执照"));
-//             }
-//             result+=rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
+             RmsCarrier rmsCarrier=new RmsCarrier();
+             rmsCarrier.setCarrierId(rmsCarrierMapper.getMaxCarrierId());
+             if (map.get("运输证")!=null){
+                 rmsCarrier.setCarrierTransportCertificate((String) map.get("运输证"));
+             }
+             if (map.get("经营许可证")!=null){
+                 rmsCarrier.setCarrierBusinessLicense((String)map.get("经营许可证"));
+             }
+             if (map.get("营业执照")!=null){
+                 rmsCarrier.setCarrierBusinessAblelicense((String)map.get("营业执照"));
+             }
+             result+=rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
          }else{
              result=-1;
          }
+//         当图片的没有插入成功的时候,代表整条数据没有成功,需要删除
+         if (result<1){
+             RmsCarrier rmsCarrier=new RmsCarrier();
+             rmsCarrier.setCarrierId(new BigDecimal(1));
+             rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
+         }
          return result;
      }
 }

+ 22 - 5
src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java

@@ -5,12 +5,16 @@ import com.steerinfo.dil.model.RmsSupplier;
 import com.steerinfo.dil.service.IRmsSupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 /**
  * RmsSupplier服务实现:
@@ -108,21 +112,34 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
 
     /**
      * 添加供应商列表
-     * @param rmsSupplier
+     * @param mapValue
      * @return
      */
     @Override
-    public int insertSupplier(RmsSupplier rmsSupplier) {
+    public int insertSupplier(Map<String,Object> mapValue) throws ParseException {
+//        获取日期,进行格式转换
+        String supplierRegisterDate=(String) mapValue.get("supplierRegisterDate");
 //        新增用户名和密码将其传到SSO接口
 //        String username=mapValue.get("username");
 //        String password="123456";
-
+        RmsSupplier rmsSupplier=new RmsSupplier();
+        System.out.println(supplierRegisterDate);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date registerDate=simpleDateFormat.parse(supplierRegisterDate);
         int i=0;
+        Date date=new Date(0);
 //            判断用户输入的船名在数据库中是否存在
-        String supplierName=rmsSupplier.getSupplierName();
-
+        String supplierName=(String) mapValue.get("supplierName");
         int size = rmsSupplierMapper.selectByParametersSupplierName(supplierName);
         if (size == 0 ) {
+            rmsSupplier.setSupplierName(supplierName);
+            rmsSupplier.setSupplierAddress((String) mapValue.get("supplierAddress"));
+            rmsSupplier.setSupplierContactsName((String) mapValue.get("supplierContactsName"));
+            rmsSupplier.setSupplierContactNumber((String) mapValue.get("supplierContactNumber"));
+            rmsSupplier.setSupplierRegisterDate(registerDate);
+            if (mapValue.get("supplierRegisterDate").equals(date)) {
+                rmsSupplier.setSupplierRegisterDate(null);
+            }
             rmsSupplier.setInsertTime(new Date());
             rmsSupplier.setInsertUsername("admin");
             rmsSupplier.setDeleted(new BigDecimal(0));

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8060
+  port: 8070

+ 109 - 82
src/main/resources/com/steerinfo/dil/mapper/RmsCarrierMapper.xml

@@ -36,9 +36,10 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="CARRIER_TYPE" jdbcType="VARCHAR" property="carrierType" />
-    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="BLOB" property="carrierTransportCertificate" />
-    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="BLOB" property="carrierBusinessLicense" />
-    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="carrierBusinessAblelicense" />
+    <result column="EAS_CARRIER_ID" jdbcType="VARCHAR" property="easCarrierId" />
+    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="VARCHAR" property="carrierBusinessAblelicense" />
+    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="VARCHAR" property="carrierBusinessLicense" />
+    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="VARCHAR" property="carrierTransportCertificate" />
   </resultMap>
   <sql id="columns">
     CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
@@ -47,8 +48,8 @@
     CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
     COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, REGISTER_DATE, REGISTER_ORGANIZATION, 
     REGISTER_APTITUDES, CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, CARRIER_TRANSPORT_CERTIFICATE, 
-    CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+    CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
   </sql>
   <sql id="columns_alias">
     t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
@@ -58,8 +59,8 @@
     t.ANNUAL_DATE, t.COMPANY_STATUS_DESC, t.COMPANY_TYPE_DESC, t.OPERATION_PERIOD, t.REGISTER_DATE, 
     t.REGISTER_ORGANIZATION, t.REGISTER_APTITUDES, t.CREDENTIAL_DESC, t.CONTACTS_NAME, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.DELETED, t.CARRIER_TYPE, t.CARRIER_TRANSPORT_CERTIFICATE, t.CARRIER_BUSINESS_LICENSE, 
-    t.CARRIER_BUSINESS_ABLELICENSE
+    t.DELETED, t.CARRIER_TYPE, t.EAS_CARRIER_ID, t.CARRIER_BUSINESS_ABLELICENSE, t.CARRIER_BUSINESS_LICENSE, 
+    t.CARRIER_TRANSPORT_CERTIFICATE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CARRIER
@@ -171,14 +172,17 @@
       <if test="carrierType != null and carrierType != ''">
         and CARRIER_TYPE = #{carrierType}
       </if>
-      <if test="carrierTransportCertificate != null">
-        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID = #{easCarrierId}
       </if>
-      <if test="carrierBusinessLicense != null">
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
         and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
       </if>
     </where>
   </sql>
@@ -286,14 +290,17 @@
       <if test="carrierType != null and carrierType != ''">
         and CARRIER_TYPE LIKE '%${carrierType}%'
       </if>
-      <if test="carrierTransportCertificate != null">
-        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID LIKE '%${easCarrierId}%'
       </if>
-      <if test="carrierBusinessLicense != null">
-        and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE LIKE '%${carrierBusinessAblelicense}%'
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        and CARRIER_BUSINESS_LICENSE LIKE '%${carrierBusinessLicense}%'
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE LIKE '%${carrierTransportCertificate}%'
       </if>
     </where>
   </sql>
@@ -403,14 +410,17 @@
       <if test="carrierType != null and carrierType != ''">
         or CARRIER_TYPE = #{carrierType}
       </if>
-      <if test="carrierTransportCertificate != null">
-        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        or EAS_CARRIER_ID = #{easCarrierId}
       </if>
-      <if test="carrierBusinessLicense != null">
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
         or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -426,8 +436,9 @@
       CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, 
       INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, 
-      CARRIER_TRANSPORT_CERTIFICATE, CARRIER_BUSINESS_LICENSE, 
-      CARRIER_BUSINESS_ABLELICENSE)
+      EAS_CARRIER_ID, CARRIER_BUSINESS_ABLELICENSE, 
+      CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
+      )
     values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR}, 
       #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR}, 
       #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR}, 
@@ -440,8 +451,9 @@
       #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
       #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR}, 
-      #{carrierTransportCertificate,jdbcType=BLOB}, #{carrierBusinessLicense,jdbcType=BLOB}, 
-      #{carrierBusinessAblelicense,jdbcType=BLOB})
+      #{easCarrierId,jdbcType=VARCHAR}, #{carrierBusinessAblelicense,jdbcType=VARCHAR}, 
+      #{carrierBusinessLicense,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
     insert into RMS_CARRIER
@@ -548,14 +560,17 @@
       <if test="carrierType != null">
         CARRIER_TYPE,
       </if>
-      <if test="carrierTransportCertificate != null">
-        CARRIER_TRANSPORT_CERTIFICATE,
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID,
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE,
       </if>
       <if test="carrierBusinessLicense != null">
         CARRIER_BUSINESS_LICENSE,
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        CARRIER_BUSINESS_ABLELICENSE,
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -661,14 +676,17 @@
       <if test="carrierType != null">
         #{carrierType,jdbcType=VARCHAR},
       </if>
-      <if test="carrierTransportCertificate != null">
-        #{carrierTransportCertificate,jdbcType=BLOB},
+      <if test="easCarrierId != null">
+        #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        #{carrierBusinessAblelicense,jdbcType=VARCHAR},
       </if>
       <if test="carrierBusinessLicense != null">
-        #{carrierBusinessLicense,jdbcType=BLOB},
+        #{carrierBusinessLicense,jdbcType=VARCHAR},
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        #{carrierBusinessAblelicense,jdbcType=BLOB},
+      <if test="carrierTransportCertificate != null">
+        #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -707,9 +725,10 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       DELETED = #{deleted,jdbcType=DECIMAL},
       CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
-      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
-      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
-      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB}
+      EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
+      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR}
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -814,14 +833,17 @@
       <if test="carrierType != null">
         CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
       </if>
-      <if test="carrierTransportCertificate != null">
-        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
       </if>
       <if test="carrierBusinessLicense != null">
-        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
+        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB},
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
@@ -856,9 +878,9 @@
       CONTACTS_NAME, INSERT_USERNAME, 
       INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, CARRIER_TYPE, CARRIER_TRANSPORT_CERTIFICATE, 
-      CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
-      )
+      DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+      CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, 
+      CARRIER_TRANSPORT_CERTIFICATE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.carrierId,jdbcType=DECIMAL}, 
@@ -877,9 +899,9 @@
       #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
       #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.carrierTransportCertificate,jdbcType=BLOB}, 
-      #{item.carrierBusinessLicense,jdbcType=BLOB}, #{item.carrierBusinessAblelicense,jdbcType=BLOB}
-       from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR}, 
+      #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}, #{item.carrierBusinessLicense,jdbcType=VARCHAR}, 
+      #{item.carrierTransportCertificate,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1021,17 +1043,21 @@
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
           when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
        </foreach>
-       ,CARRIER_TRANSPORT_CERTIFICATE=
+       ,EAS_CARRIER_ID=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_ABLELICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}
        </foreach>
        ,CARRIER_BUSINESS_LICENSE=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=VARCHAR}
        </foreach>
-       ,CARRIER_BUSINESS_ABLELICENSE=
+       ,CARRIER_TRANSPORT_CERTIFICATE=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=VARCHAR}
        </foreach>
      where CARRIER_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -1226,43 +1252,44 @@
   <!--  根据id值获取承运商信息-->
   <select id="selectCarrierById"  resultType="java.util.LinkedHashMap">
     select
-    RC.CARRIER_ID as "carrierId",
-    RC.CARRIER_NAME as "carrierName",
-    RC.CARRIER_TRANSPORT_CERTIFICATE as "carrierTransportCertificate",
-    RC.CARRIER_BUSINESS_LICENSE as "carrierBusinessLicense",
-    RC.CARRIER_BUSINESS_ABLELICENSE as "carrierBusinessAblelicense",
-    RC.CARRIER_ABBREVIATION as "carrierAbbreviation",
-    RC.CARRIER_ADDRESS as "carrierAddress",
-    RC.REGISTER_NO as "registerNo",
-    RC.CARRIER_BID_AREA_ID as "carrierBidAreaId",
-    RC.CARRIER_LEGAL_REPRESENTATIVE as "carrierLegalRepresentative",
-    RC.REGISTER_CAPITAL as "registerCapital",
-    RC.BUSINESS_SCOPE as "businessScope",
-    RC.ANNUAL_DATE as "annualDate",
-    RC.CARRIER_TYPE as "carrierType",
-    RC.COMPANY_STATUS_DESC as "companyStatusDesc",
-    RC.COMPANY_TYPE_DESC as "companyTypeDesc",
-    RC.OPERATION_PERIOD as "operationPeriod",
-    RC.REGISTER_DATE as "registerDate",
-    RC.REGISTER_ORGANIZATION as "registerOrganization",
-    RC.REGISTER_APTITUDES as "registerAptitudes",
-    RC.CARRIER_TRANSPORT_TYPE as "carrierTransportType",
-    RC.CONTACTS_NAME as "contactsName",
-    RC.CARRIER_CONTACT_NUMBER as "carrierContactNumber"
+      RC.CARRIER_ID as "carrierId",
+      RC.CARRIER_NAME as "carrierName",
+      RC.CARRIER_TRANSPORT_CERTIFICATE as "carrierTransportCertificate",
+      RC.CARRIER_BUSINESS_LICENSE as "carrierBusinessLicense",
+      RC.CARRIER_BUSINESS_ABLELICENSE as "carrierBusinessAblelicense",
+      RC.CARRIER_ABBREVIATION as "carrierAbbreviation",
+      RC.CARRIER_ADDRESS as "carrierAddress",
+      RC.REGISTER_NO as "registerNo",
+      RC.CARRIER_BID_AREA_ID as "carrierBidAreaId",
+      RC.CARRIER_LEGAL_REPRESENTATIVE as "carrierLegalRepresentative",
+      RC.REGISTER_CAPITAL as "registerCapital",
+      RC.BUSINESS_SCOPE as "businessScope",
+      RC.ANNUAL_DATE as "annualDate",
+      RC.CARRIER_TYPE as "carrierType",
+      RC.COMPANY_STATUS_DESC as "companyStatusDesc",
+      RC.COMPANY_TYPE_DESC as "companyTypeDesc",
+      RC.OPERATION_PERIOD as "operationPeriod",
+      RC.REGISTER_DATE as "registerDate",
+      RC.REGISTER_ORGANIZATION as "registerOrganization",
+      RC.REGISTER_APTITUDES as "registerAptitudes",
+      RC.CARRIER_TRANSPORT_TYPE as "carrierTransportType",
+      RC.CONTACTS_NAME as "contactsName",
+      RC.CARRIER_CONTACT_NUMBER as "carrierContactNumber"
     from RMS_CARRIER RC
     where  RC.CARRIER_ID=#{id}
   </select>
 
-<!--  通过传入的值判断当前表是否存在相同的数量-->
+  <!--  通过传入的值判断当前表是否存在相同的数量-->
   <select id="selectParameterCarrierName" resultType="java.lang.Integer">
     SELECT COUNT(*)
     FROM RMS_CARRIER RC
     WHERE RC.CARRIER_NAME = #{carrierName}
-    AND RC.DELETED =0
+      AND RC.DELETED =0
   </select>
-<!--  获取表中的最大id-->
+  <!--  获取表中的最大id-->
   <select id="getMaxCarrierId" resultType="java.math.BigDecimal">
     SELECT MAX(RC.CARRIER_ID)
-        FROM RMS_CARRIER RC
+    FROM RMS_CARRIER RC
   </select>
+  
 </mapper>

+ 110 - 0
src/test/java/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.rmscarrier.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.rmscarrier.model.RmsCarrier;
+import com.steerinfo.dil.rmscarrier.service.IRmsCarrierService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * RmsCarrier RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-25
+ * 作者:generator
+ * 参考:
+ * 描述:RmsCarrier RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/rmscarriers")
+public class RmsCarrierController extends BaseRESTfulController {
+
+    @Autowired
+    IRmsCarrierService rmsCarrierService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("rmscarrier:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<RmsCarrier> list = rmsCarrierService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("rmscarrier:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<RmsCarrier> list = rmsCarrierService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据RmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "RmsCarrier")
+    //@RequiresPermissions("rmscarrier:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute RmsCarrier model){
+        RmsCarrier rmsCarrier = rmsCarrierService.add(model);
+        return success(rmsCarrier);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+    //@RequiresPermissions("rmscarrier:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable Short id){
+        RmsCarrier rmsCarrier = rmsCarrierService.getById(id);
+        return success(rmsCarrier);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的rmsCarrier信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+        @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "RmsCarrier")
+    })
+    //@RequiresPermissions("rmscarrier:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable Short id, @RequestBody RmsCarrier model){
+        model.setId(id);
+        RmsCarrier rmsCarrier = rmsCarrierService.modify(model);
+        return success(rmsCarrier);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+    //@RequiresPermissions("rmscarrier:delete")
+    @DeleteMapping(value = "/{id}")//Short
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<Short> ids = ListUtils.convertList(list);
+			  rmsCarrierService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/test/java/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.dil.rmscarrier.mapper;
+
+import com.steerinfo.dil.rmscarrier.model.RmsCarrier;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RmsCarrierMapper extends IBaseMapper<RmsCarrier, Short> {
+}

+ 2149 - 0
src/test/java/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.xml

@@ -0,0 +1,2149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.rmscarrier.mapper.RmsCarrierMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    <id column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+    <result column="CARRIER_TRANSPORT_TYPE" jdbcType="VARCHAR" property="carrierTransportType" />
+    <result column="CARRIER_NAME" jdbcType="VARCHAR" property="carrierName" />
+    <result column="CARRIER_ABBREVIATION" jdbcType="VARCHAR" property="carrierAbbreviation" />
+    <result column="CARRIER_ADDRESS" jdbcType="VARCHAR" property="carrierAddress" />
+    <result column="CARRIER_BID_AREA_ID" jdbcType="DECIMAL" property="carrierBidAreaId" />
+    <result column="CARRIER_BID_TIME" jdbcType="TIMESTAMP" property="carrierBidTime" />
+    <result column="CARRIER_LEGAL_REPRESENTATIVE" jdbcType="VARCHAR" property="carrierLegalRepresentative" />
+    <result column="REGISTER_NO" jdbcType="VARCHAR" property="registerNo" />
+    <result column="CARRIER_AGENT" jdbcType="VARCHAR" property="carrierAgent" />
+    <result column="CARRIER_CONTACT_NUMBER" jdbcType="VARCHAR" property="carrierContactNumber" />
+    <result column="CARRIER_FAX" jdbcType="VARCHAR" property="carrierFax" />
+    <result column="CARRIER_ACCOUNT" jdbcType="VARCHAR" property="carrierAccount" />
+    <result column="CARRIER_ACCOUNT_BLANK" jdbcType="VARCHAR" property="carrierAccountBlank" />
+    <result column="CARRIER_DUTY_PARAGRAPH" jdbcType="VARCHAR" property="carrierDutyParagraph" />
+    <result column="CARRIER_POSTAL_CODE" jdbcType="VARCHAR" property="carrierPostalCode" />
+    <result column="REGISTER_CAPITAL" jdbcType="VARCHAR" property="registerCapital" />
+    <result column="BUSINESS_SCOPE" jdbcType="VARCHAR" property="businessScope" />
+    <result column="ANNUAL_DATE" jdbcType="VARCHAR" property="annualDate" />
+    <result column="COMPANY_STATUS_DESC" jdbcType="VARCHAR" property="companyStatusDesc" />
+    <result column="COMPANY_TYPE_DESC" jdbcType="VARCHAR" property="companyTypeDesc" />
+    <result column="OPERATION_PERIOD" jdbcType="VARCHAR" property="operationPeriod" />
+    <result column="REGISTER_DATE" jdbcType="TIMESTAMP" property="registerDate" />
+    <result column="REGISTER_ORGANIZATION" jdbcType="VARCHAR" property="registerOrganization" />
+    <result column="REGISTER_APTITUDES" jdbcType="VARCHAR" property="registerAptitudes" />
+    <result column="CREDENTIAL_DESC" jdbcType="VARCHAR" property="credentialDesc" />
+    <result column="CONTACTS_NAME" jdbcType="VARCHAR" property="contactsName" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="CARRIER_TYPE" jdbcType="VARCHAR" property="carrierType" />
+    <result column="EAS_CARRIER_ID" jdbcType="VARCHAR" property="easCarrierId" />
+    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="VARCHAR" property="carrierBusinessAblelicense" />
+    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="VARCHAR" property="carrierBusinessLicense" />
+    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="VARCHAR" property="carrierTransportCertificate" />
+  </resultMap>
+  <sql id="columns">
+    CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+    CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO, 
+    CARRIER_AGENT, CARRIER_CONTACT_NUMBER, CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+    CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
+    COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, REGISTER_DATE, REGISTER_ORGANIZATION, 
+    REGISTER_APTITUDES, CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+    CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
+  </sql>
+  <sql id="columns_alias">
+    t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
+    t.CARRIER_BID_AREA_ID, t.CARRIER_BID_TIME, t.CARRIER_LEGAL_REPRESENTATIVE, t.REGISTER_NO, 
+    t.CARRIER_AGENT, t.CARRIER_CONTACT_NUMBER, t.CARRIER_FAX, t.CARRIER_ACCOUNT, t.CARRIER_ACCOUNT_BLANK, 
+    t.CARRIER_DUTY_PARAGRAPH, t.CARRIER_POSTAL_CODE, t.REGISTER_CAPITAL, t.BUSINESS_SCOPE, 
+    t.ANNUAL_DATE, t.COMPANY_STATUS_DESC, t.COMPANY_TYPE_DESC, t.OPERATION_PERIOD, t.REGISTER_DATE, 
+    t.REGISTER_ORGANIZATION, t.REGISTER_APTITUDES, t.CREDENTIAL_DESC, t.CONTACTS_NAME, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DELETED, t.CARRIER_TYPE, t.EAS_CARRIER_ID, t.CARRIER_BUSINESS_ABLELICENSE, t.CARRIER_BUSINESS_LICENSE, 
+    t.CARRIER_TRANSPORT_CERTIFICATE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_CARRIER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_CARRIER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        and CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        and CARRIER_NAME = #{carrierName}
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        and CARRIER_ABBREVIATION = #{carrierAbbreviation}
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        and CARRIER_ADDRESS = #{carrierAddress}
+      </if>
+      <if test="carrierBidAreaId != null">
+        and CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        and TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = #{carrierBidTime}
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        and CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        and REGISTER_NO = #{registerNo}
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        and CARRIER_AGENT = #{carrierAgent}
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        and CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        and CARRIER_FAX = #{carrierFax}
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        and CARRIER_ACCOUNT = #{carrierAccount}
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        and CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        and CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        and CARRIER_POSTAL_CODE = #{carrierPostalCode}
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        and REGISTER_CAPITAL = #{registerCapital}
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        and BUSINESS_SCOPE = #{businessScope}
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        and ANNUAL_DATE = #{annualDate}
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        and COMPANY_STATUS_DESC = #{companyStatusDesc}
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        and COMPANY_TYPE_DESC = #{companyTypeDesc}
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        and OPERATION_PERIOD = #{operationPeriod}
+      </if>
+      <if test="registerDate != null">
+        and TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = #{registerDate}
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        and REGISTER_ORGANIZATION = #{registerOrganization}
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        and REGISTER_APTITUDES = #{registerAptitudes}
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        and CREDENTIAL_DESC = #{credentialDesc}
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        and CONTACTS_NAME = #{contactsName}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        and CARRIER_TYPE = #{carrierType}
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID = #{easCarrierId}
+      </if>
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        and CARRIER_TRANSPORT_TYPE LIKE '%${carrierTransportType}%'
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        and CARRIER_NAME LIKE '%${carrierName}%'
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        and CARRIER_ABBREVIATION LIKE '%${carrierAbbreviation}%'
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        and CARRIER_ADDRESS LIKE '%${carrierAddress}%'
+      </if>
+      <if test="carrierBidAreaId != null">
+        and CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        and TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = #{carrierBidTime}
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        and CARRIER_LEGAL_REPRESENTATIVE LIKE '%${carrierLegalRepresentative}%'
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        and REGISTER_NO LIKE '%${registerNo}%'
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        and CARRIER_AGENT LIKE '%${carrierAgent}%'
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        and CARRIER_CONTACT_NUMBER LIKE '%${carrierContactNumber}%'
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        and CARRIER_FAX LIKE '%${carrierFax}%'
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        and CARRIER_ACCOUNT LIKE '%${carrierAccount}%'
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        and CARRIER_ACCOUNT_BLANK LIKE '%${carrierAccountBlank}%'
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        and CARRIER_DUTY_PARAGRAPH LIKE '%${carrierDutyParagraph}%'
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        and CARRIER_POSTAL_CODE LIKE '%${carrierPostalCode}%'
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        and REGISTER_CAPITAL LIKE '%${registerCapital}%'
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        and BUSINESS_SCOPE LIKE '%${businessScope}%'
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        and ANNUAL_DATE LIKE '%${annualDate}%'
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        and COMPANY_STATUS_DESC LIKE '%${companyStatusDesc}%'
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        and COMPANY_TYPE_DESC LIKE '%${companyTypeDesc}%'
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        and OPERATION_PERIOD LIKE '%${operationPeriod}%'
+      </if>
+      <if test="registerDate != null">
+        and TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = #{registerDate}
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        and REGISTER_ORGANIZATION LIKE '%${registerOrganization}%'
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        and REGISTER_APTITUDES LIKE '%${registerAptitudes}%'
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        and CREDENTIAL_DESC LIKE '%${credentialDesc}%'
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        and CONTACTS_NAME LIKE '%${contactsName}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        and CARRIER_TYPE LIKE '%${carrierType}%'
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID LIKE '%${easCarrierId}%'
+      </if>
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE LIKE '%${carrierBusinessAblelicense}%'
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        and CARRIER_BUSINESS_LICENSE LIKE '%${carrierBusinessLicense}%'
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE LIKE '%${carrierTransportCertificate}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_CARRIER
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_CARRIER
+    where 1!=1 
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        or CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        or CARRIER_NAME = #{carrierName}
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        or CARRIER_ABBREVIATION = #{carrierAbbreviation}
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        or CARRIER_ADDRESS = #{carrierAddress}
+      </if>
+      <if test="carrierBidAreaId != null">
+        or CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        or TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = '#{carrierBidTime}'
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        or CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        or REGISTER_NO = #{registerNo}
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        or CARRIER_AGENT = #{carrierAgent}
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        or CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        or CARRIER_FAX = #{carrierFax}
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        or CARRIER_ACCOUNT = #{carrierAccount}
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        or CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        or CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        or CARRIER_POSTAL_CODE = #{carrierPostalCode}
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        or REGISTER_CAPITAL = #{registerCapital}
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        or BUSINESS_SCOPE = #{businessScope}
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        or ANNUAL_DATE = #{annualDate}
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        or COMPANY_STATUS_DESC = #{companyStatusDesc}
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        or COMPANY_TYPE_DESC = #{companyTypeDesc}
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        or OPERATION_PERIOD = #{operationPeriod}
+      </if>
+      <if test="registerDate != null">
+        or TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = '#{registerDate}'
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        or REGISTER_ORGANIZATION = #{registerOrganization}
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        or REGISTER_APTITUDES = #{registerAptitudes}
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        or CREDENTIAL_DESC = #{credentialDesc}
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        or CONTACTS_NAME = #{contactsName}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        or CARRIER_TYPE = #{carrierType}
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        or EAS_CARRIER_ID = #{easCarrierId}
+      </if>
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    insert into RMS_CARRIER (CARRIER_ID, CARRIER_TRANSPORT_TYPE, 
+      CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE, 
+      REGISTER_NO, CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
+      COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, REGISTER_APTITUDES, 
+      CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, 
+      EAS_CARRIER_ID, CARRIER_BUSINESS_ABLELICENSE, 
+      CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
+      )
+    values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR}, 
+      #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR}, 
+      #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR}, 
+      #{registerNo,jdbcType=VARCHAR}, #{carrierAgent,jdbcType=VARCHAR}, #{carrierContactNumber,jdbcType=VARCHAR}, 
+      #{carrierFax,jdbcType=VARCHAR}, #{carrierAccount,jdbcType=VARCHAR}, #{carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{carrierDutyParagraph,jdbcType=VARCHAR}, #{carrierPostalCode,jdbcType=VARCHAR}, 
+      #{registerCapital,jdbcType=VARCHAR}, #{businessScope,jdbcType=VARCHAR}, #{annualDate,jdbcType=VARCHAR}, 
+      #{companyStatusDesc,jdbcType=VARCHAR}, #{companyTypeDesc,jdbcType=VARCHAR}, #{operationPeriod,jdbcType=VARCHAR}, 
+      #{registerDate,jdbcType=TIMESTAMP}, #{registerOrganization,jdbcType=VARCHAR}, #{registerAptitudes,jdbcType=VARCHAR}, 
+      #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR}, 
+      #{easCarrierId,jdbcType=VARCHAR}, #{carrierBusinessAblelicense,jdbcType=VARCHAR}, 
+      #{carrierBusinessLicense,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    insert into RMS_CARRIER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+      <if test="carrierTransportType != null">
+        CARRIER_TRANSPORT_TYPE,
+      </if>
+      <if test="carrierName != null">
+        CARRIER_NAME,
+      </if>
+      <if test="carrierAbbreviation != null">
+        CARRIER_ABBREVIATION,
+      </if>
+      <if test="carrierAddress != null">
+        CARRIER_ADDRESS,
+      </if>
+      <if test="carrierBidAreaId != null">
+        CARRIER_BID_AREA_ID,
+      </if>
+      <if test="carrierBidTime != null">
+        CARRIER_BID_TIME,
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        CARRIER_LEGAL_REPRESENTATIVE,
+      </if>
+      <if test="registerNo != null">
+        REGISTER_NO,
+      </if>
+      <if test="carrierAgent != null">
+        CARRIER_AGENT,
+      </if>
+      <if test="carrierContactNumber != null">
+        CARRIER_CONTACT_NUMBER,
+      </if>
+      <if test="carrierFax != null">
+        CARRIER_FAX,
+      </if>
+      <if test="carrierAccount != null">
+        CARRIER_ACCOUNT,
+      </if>
+      <if test="carrierAccountBlank != null">
+        CARRIER_ACCOUNT_BLANK,
+      </if>
+      <if test="carrierDutyParagraph != null">
+        CARRIER_DUTY_PARAGRAPH,
+      </if>
+      <if test="carrierPostalCode != null">
+        CARRIER_POSTAL_CODE,
+      </if>
+      <if test="registerCapital != null">
+        REGISTER_CAPITAL,
+      </if>
+      <if test="businessScope != null">
+        BUSINESS_SCOPE,
+      </if>
+      <if test="annualDate != null">
+        ANNUAL_DATE,
+      </if>
+      <if test="companyStatusDesc != null">
+        COMPANY_STATUS_DESC,
+      </if>
+      <if test="companyTypeDesc != null">
+        COMPANY_TYPE_DESC,
+      </if>
+      <if test="operationPeriod != null">
+        OPERATION_PERIOD,
+      </if>
+      <if test="registerDate != null">
+        REGISTER_DATE,
+      </if>
+      <if test="registerOrganization != null">
+        REGISTER_ORGANIZATION,
+      </if>
+      <if test="registerAptitudes != null">
+        REGISTER_APTITUDES,
+      </if>
+      <if test="credentialDesc != null">
+        CREDENTIAL_DESC,
+      </if>
+      <if test="contactsName != null">
+        CONTACTS_NAME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="carrierType != null">
+        CARRIER_TYPE,
+      </if>
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID,
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE,
+      </if>
+      <if test="carrierBusinessLicense != null">
+        CARRIER_BUSINESS_LICENSE,
+      </if>
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierTransportType != null">
+        #{carrierTransportType,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierName != null">
+        #{carrierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAbbreviation != null">
+        #{carrierAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAddress != null">
+        #{carrierAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBidAreaId != null">
+        #{carrierBidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierBidTime != null">
+        #{carrierBidTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      </if>
+      <if test="registerNo != null">
+        #{registerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAgent != null">
+        #{carrierAgent,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierContactNumber != null">
+        #{carrierContactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierFax != null">
+        #{carrierFax,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccount != null">
+        #{carrierAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccountBlank != null">
+        #{carrierAccountBlank,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierDutyParagraph != null">
+        #{carrierDutyParagraph,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierPostalCode != null">
+        #{carrierPostalCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registerCapital != null">
+        #{registerCapital,jdbcType=VARCHAR},
+      </if>
+      <if test="businessScope != null">
+        #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="annualDate != null">
+        #{annualDate,jdbcType=VARCHAR},
+      </if>
+      <if test="companyStatusDesc != null">
+        #{companyStatusDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="companyTypeDesc != null">
+        #{companyTypeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="operationPeriod != null">
+        #{operationPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="registerDate != null">
+        #{registerDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registerOrganization != null">
+        #{registerOrganization,jdbcType=VARCHAR},
+      </if>
+      <if test="registerAptitudes != null">
+        #{registerAptitudes,jdbcType=VARCHAR},
+      </if>
+      <if test="credentialDesc != null">
+        #{credentialDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsName != null">
+        #{contactsName,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierType != null">
+        #{carrierType,jdbcType=VARCHAR},
+      </if>
+      <if test="easCarrierId != null">
+        #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessLicense != null">
+        #{carrierBusinessLicense,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierTransportCertificate != null">
+        #{carrierTransportCertificate,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    update RMS_CARRIER
+    set CARRIER_TRANSPORT_TYPE = #{carrierTransportType,jdbcType=VARCHAR},
+      CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
+      CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
+      CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
+      CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
+      CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
+      CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
+      CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
+      CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
+      CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
+      CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
+      CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
+      REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
+      BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
+      ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
+      COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
+      COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
+      OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
+      REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
+      REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
+      REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
+      CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
+      CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
+      EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
+      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR}
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    update RMS_CARRIER
+    <set>
+      <if test="carrierTransportType != null">
+        CARRIER_TRANSPORT_TYPE = #{carrierTransportType,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierName != null">
+        CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAbbreviation != null">
+        CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAddress != null">
+        CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBidAreaId != null">
+        CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierBidTime != null">
+        CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      </if>
+      <if test="registerNo != null">
+        REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAgent != null">
+        CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierContactNumber != null">
+        CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierFax != null">
+        CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccount != null">
+        CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccountBlank != null">
+        CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierDutyParagraph != null">
+        CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierPostalCode != null">
+        CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registerCapital != null">
+        REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
+      </if>
+      <if test="businessScope != null">
+        BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="annualDate != null">
+        ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
+      </if>
+      <if test="companyStatusDesc != null">
+        COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="companyTypeDesc != null">
+        COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="operationPeriod != null">
+        OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="registerDate != null">
+        REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registerOrganization != null">
+        REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
+      </if>
+      <if test="registerAptitudes != null">
+        REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
+      </if>
+      <if test="credentialDesc != null">
+        CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsName != null">
+        CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierType != null">
+        CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
+      </if>
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessLicense != null">
+        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_CARRIER 
+      (CARRIER_ID, 
+      CARRIER_TRANSPORT_TYPE, CARRIER_NAME, 
+      CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, 
+      CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO, 
+      CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, 
+      ANNUAL_DATE, COMPANY_STATUS_DESC, 
+      COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, 
+      REGISTER_APTITUDES, CREDENTIAL_DESC, 
+      CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+      CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, 
+      CARRIER_TRANSPORT_CERTIFICATE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carrierId,jdbcType=DECIMAL}, 
+      #{item.carrierTransportType,jdbcType=VARCHAR}, #{item.carrierName,jdbcType=VARCHAR}, 
+      #{item.carrierAbbreviation,jdbcType=VARCHAR}, #{item.carrierAddress,jdbcType=VARCHAR}, 
+      #{item.carrierBidAreaId,jdbcType=DECIMAL}, #{item.carrierBidTime,jdbcType=TIMESTAMP}, 
+      #{item.carrierLegalRepresentative,jdbcType=VARCHAR}, #{item.registerNo,jdbcType=VARCHAR}, 
+      #{item.carrierAgent,jdbcType=VARCHAR}, #{item.carrierContactNumber,jdbcType=VARCHAR}, 
+      #{item.carrierFax,jdbcType=VARCHAR}, #{item.carrierAccount,jdbcType=VARCHAR}, #{item.carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{item.carrierDutyParagraph,jdbcType=VARCHAR}, #{item.carrierPostalCode,jdbcType=VARCHAR}, 
+      #{item.registerCapital,jdbcType=VARCHAR}, #{item.businessScope,jdbcType=VARCHAR}, 
+      #{item.annualDate,jdbcType=VARCHAR}, #{item.companyStatusDesc,jdbcType=VARCHAR}, 
+      #{item.companyTypeDesc,jdbcType=VARCHAR}, #{item.operationPeriod,jdbcType=VARCHAR}, 
+      #{item.registerDate,jdbcType=TIMESTAMP}, #{item.registerOrganization,jdbcType=VARCHAR}, 
+      #{item.registerAptitudes,jdbcType=VARCHAR}, #{item.credentialDesc,jdbcType=VARCHAR}, 
+      #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR}, 
+      #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}, #{item.carrierBusinessLicense,jdbcType=VARCHAR}, 
+      #{item.carrierTransportCertificate,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_CARRIER
+     set
+       CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TRANSPORT_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportType,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierName,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ABBREVIATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAbbreviation,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ADDRESS=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAddress,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_BID_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CARRIER_LEGAL_REPRESENTATIVE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierLegalRepresentative,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_AGENT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAgent,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_CONTACT_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierContactNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_FAX=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierFax,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccount,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT_BLANK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccountBlank,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_DUTY_PARAGRAPH=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierDutyParagraph,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_POSTAL_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierPostalCode,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_CAPITAL=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerCapital,jdbcType=VARCHAR}
+       </foreach>
+       ,BUSINESS_SCOPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.businessScope,jdbcType=VARCHAR}
+       </foreach>
+       ,ANNUAL_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.annualDate,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_STATUS_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyStatusDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_TYPE_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyTypeDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_PERIOD=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.operationPeriod,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,REGISTER_ORGANIZATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerOrganization,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_APTITUDES=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerAptitudes,jdbcType=VARCHAR}
+       </foreach>
+       ,CREDENTIAL_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.credentialDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,CONTACTS_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.contactsName,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
+       </foreach>
+       ,EAS_CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_ABLELICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_LICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_TRANSPORT_CERTIFICATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=VARCHAR}
+       </foreach>
+     where CARRIER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.carrierId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_CARRIER
+    where CARRIER_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    <id column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+    <result column="CARRIER_TRANSPORT_TYPE" jdbcType="VARCHAR" property="carrierTransportType" />
+    <result column="CARRIER_NAME" jdbcType="VARCHAR" property="carrierName" />
+    <result column="CARRIER_ABBREVIATION" jdbcType="VARCHAR" property="carrierAbbreviation" />
+    <result column="CARRIER_ADDRESS" jdbcType="VARCHAR" property="carrierAddress" />
+    <result column="CARRIER_BID_AREA_ID" jdbcType="DECIMAL" property="carrierBidAreaId" />
+    <result column="CARRIER_BID_TIME" jdbcType="TIMESTAMP" property="carrierBidTime" />
+    <result column="CARRIER_LEGAL_REPRESENTATIVE" jdbcType="VARCHAR" property="carrierLegalRepresentative" />
+    <result column="REGISTER_NO" jdbcType="VARCHAR" property="registerNo" />
+    <result column="CARRIER_AGENT" jdbcType="VARCHAR" property="carrierAgent" />
+    <result column="CARRIER_CONTACT_NUMBER" jdbcType="VARCHAR" property="carrierContactNumber" />
+    <result column="CARRIER_FAX" jdbcType="VARCHAR" property="carrierFax" />
+    <result column="CARRIER_ACCOUNT" jdbcType="VARCHAR" property="carrierAccount" />
+    <result column="CARRIER_ACCOUNT_BLANK" jdbcType="VARCHAR" property="carrierAccountBlank" />
+    <result column="CARRIER_DUTY_PARAGRAPH" jdbcType="VARCHAR" property="carrierDutyParagraph" />
+    <result column="CARRIER_POSTAL_CODE" jdbcType="VARCHAR" property="carrierPostalCode" />
+    <result column="REGISTER_CAPITAL" jdbcType="VARCHAR" property="registerCapital" />
+    <result column="BUSINESS_SCOPE" jdbcType="VARCHAR" property="businessScope" />
+    <result column="ANNUAL_DATE" jdbcType="VARCHAR" property="annualDate" />
+    <result column="COMPANY_STATUS_DESC" jdbcType="VARCHAR" property="companyStatusDesc" />
+    <result column="COMPANY_TYPE_DESC" jdbcType="VARCHAR" property="companyTypeDesc" />
+    <result column="OPERATION_PERIOD" jdbcType="VARCHAR" property="operationPeriod" />
+    <result column="REGISTER_DATE" jdbcType="TIMESTAMP" property="registerDate" />
+    <result column="REGISTER_ORGANIZATION" jdbcType="VARCHAR" property="registerOrganization" />
+    <result column="REGISTER_APTITUDES" jdbcType="VARCHAR" property="registerAptitudes" />
+    <result column="CREDENTIAL_DESC" jdbcType="VARCHAR" property="credentialDesc" />
+    <result column="CONTACTS_NAME" jdbcType="VARCHAR" property="contactsName" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="CARRIER_TYPE" jdbcType="VARCHAR" property="carrierType" />
+    <result column="EAS_CARRIER_ID" jdbcType="VARCHAR" property="easCarrierId" />
+    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="BLOB" property="carrierTransportCertificate" />
+    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="BLOB" property="carrierBusinessLicense" />
+    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="carrierBusinessAblelicense" />
+  </resultMap>
+  <sql id="columns">
+    CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+    CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO, 
+    CARRIER_AGENT, CARRIER_CONTACT_NUMBER, CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+    CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
+    COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, REGISTER_DATE, REGISTER_ORGANIZATION, 
+    REGISTER_APTITUDES, CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+    CARRIER_TRANSPORT_CERTIFICATE, CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
+  </sql>
+  <sql id="columns_alias">
+    t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
+    t.CARRIER_BID_AREA_ID, t.CARRIER_BID_TIME, t.CARRIER_LEGAL_REPRESENTATIVE, t.REGISTER_NO, 
+    t.CARRIER_AGENT, t.CARRIER_CONTACT_NUMBER, t.CARRIER_FAX, t.CARRIER_ACCOUNT, t.CARRIER_ACCOUNT_BLANK, 
+    t.CARRIER_DUTY_PARAGRAPH, t.CARRIER_POSTAL_CODE, t.REGISTER_CAPITAL, t.BUSINESS_SCOPE, 
+    t.ANNUAL_DATE, t.COMPANY_STATUS_DESC, t.COMPANY_TYPE_DESC, t.OPERATION_PERIOD, t.REGISTER_DATE, 
+    t.REGISTER_ORGANIZATION, t.REGISTER_APTITUDES, t.CREDENTIAL_DESC, t.CONTACTS_NAME, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DELETED, t.CARRIER_TYPE, t.EAS_CARRIER_ID, t.CARRIER_TRANSPORT_CERTIFICATE, t.CARRIER_BUSINESS_LICENSE, 
+    t.CARRIER_BUSINESS_ABLELICENSE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_CARRIER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_CARRIER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        and CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        and CARRIER_NAME = #{carrierName}
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        and CARRIER_ABBREVIATION = #{carrierAbbreviation}
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        and CARRIER_ADDRESS = #{carrierAddress}
+      </if>
+      <if test="carrierBidAreaId != null">
+        and CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        and TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = #{carrierBidTime}
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        and CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        and REGISTER_NO = #{registerNo}
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        and CARRIER_AGENT = #{carrierAgent}
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        and CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        and CARRIER_FAX = #{carrierFax}
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        and CARRIER_ACCOUNT = #{carrierAccount}
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        and CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        and CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        and CARRIER_POSTAL_CODE = #{carrierPostalCode}
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        and REGISTER_CAPITAL = #{registerCapital}
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        and BUSINESS_SCOPE = #{businessScope}
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        and ANNUAL_DATE = #{annualDate}
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        and COMPANY_STATUS_DESC = #{companyStatusDesc}
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        and COMPANY_TYPE_DESC = #{companyTypeDesc}
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        and OPERATION_PERIOD = #{operationPeriod}
+      </if>
+      <if test="registerDate != null">
+        and TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = #{registerDate}
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        and REGISTER_ORGANIZATION = #{registerOrganization}
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        and REGISTER_APTITUDES = #{registerAptitudes}
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        and CREDENTIAL_DESC = #{credentialDesc}
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        and CONTACTS_NAME = #{contactsName}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        and CARRIER_TYPE = #{carrierType}
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID = #{easCarrierId}
+      </if>
+      <if test="carrierTransportCertificate != null">
+        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+      <if test="carrierBusinessLicense != null">
+        and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        and CARRIER_TRANSPORT_TYPE LIKE '%${carrierTransportType}%'
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        and CARRIER_NAME LIKE '%${carrierName}%'
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        and CARRIER_ABBREVIATION LIKE '%${carrierAbbreviation}%'
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        and CARRIER_ADDRESS LIKE '%${carrierAddress}%'
+      </if>
+      <if test="carrierBidAreaId != null">
+        and CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        and TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = #{carrierBidTime}
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        and CARRIER_LEGAL_REPRESENTATIVE LIKE '%${carrierLegalRepresentative}%'
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        and REGISTER_NO LIKE '%${registerNo}%'
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        and CARRIER_AGENT LIKE '%${carrierAgent}%'
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        and CARRIER_CONTACT_NUMBER LIKE '%${carrierContactNumber}%'
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        and CARRIER_FAX LIKE '%${carrierFax}%'
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        and CARRIER_ACCOUNT LIKE '%${carrierAccount}%'
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        and CARRIER_ACCOUNT_BLANK LIKE '%${carrierAccountBlank}%'
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        and CARRIER_DUTY_PARAGRAPH LIKE '%${carrierDutyParagraph}%'
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        and CARRIER_POSTAL_CODE LIKE '%${carrierPostalCode}%'
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        and REGISTER_CAPITAL LIKE '%${registerCapital}%'
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        and BUSINESS_SCOPE LIKE '%${businessScope}%'
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        and ANNUAL_DATE LIKE '%${annualDate}%'
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        and COMPANY_STATUS_DESC LIKE '%${companyStatusDesc}%'
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        and COMPANY_TYPE_DESC LIKE '%${companyTypeDesc}%'
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        and OPERATION_PERIOD LIKE '%${operationPeriod}%'
+      </if>
+      <if test="registerDate != null">
+        and TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = #{registerDate}
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        and REGISTER_ORGANIZATION LIKE '%${registerOrganization}%'
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        and REGISTER_APTITUDES LIKE '%${registerAptitudes}%'
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        and CREDENTIAL_DESC LIKE '%${credentialDesc}%'
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        and CONTACTS_NAME LIKE '%${contactsName}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        and CARRIER_TYPE LIKE '%${carrierType}%'
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID LIKE '%${easCarrierId}%'
+      </if>
+      <if test="carrierTransportCertificate != null">
+        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+      <if test="carrierBusinessLicense != null">
+        and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_CARRIER
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_CARRIER
+    where 1!=1 
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        or CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        or CARRIER_NAME = #{carrierName}
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        or CARRIER_ABBREVIATION = #{carrierAbbreviation}
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        or CARRIER_ADDRESS = #{carrierAddress}
+      </if>
+      <if test="carrierBidAreaId != null">
+        or CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        or TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = '#{carrierBidTime}'
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        or CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        or REGISTER_NO = #{registerNo}
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        or CARRIER_AGENT = #{carrierAgent}
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        or CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        or CARRIER_FAX = #{carrierFax}
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        or CARRIER_ACCOUNT = #{carrierAccount}
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        or CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        or CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        or CARRIER_POSTAL_CODE = #{carrierPostalCode}
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        or REGISTER_CAPITAL = #{registerCapital}
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        or BUSINESS_SCOPE = #{businessScope}
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        or ANNUAL_DATE = #{annualDate}
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        or COMPANY_STATUS_DESC = #{companyStatusDesc}
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        or COMPANY_TYPE_DESC = #{companyTypeDesc}
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        or OPERATION_PERIOD = #{operationPeriod}
+      </if>
+      <if test="registerDate != null">
+        or TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = '#{registerDate}'
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        or REGISTER_ORGANIZATION = #{registerOrganization}
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        or REGISTER_APTITUDES = #{registerAptitudes}
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        or CREDENTIAL_DESC = #{credentialDesc}
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        or CONTACTS_NAME = #{contactsName}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        or CARRIER_TYPE = #{carrierType}
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        or EAS_CARRIER_ID = #{easCarrierId}
+      </if>
+      <if test="carrierTransportCertificate != null">
+        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+      <if test="carrierBusinessLicense != null">
+        or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    insert into RMS_CARRIER (CARRIER_ID, CARRIER_TRANSPORT_TYPE, 
+      CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE, 
+      REGISTER_NO, CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
+      COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, REGISTER_APTITUDES, 
+      CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, 
+      EAS_CARRIER_ID, CARRIER_TRANSPORT_CERTIFICATE, 
+      CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
+      )
+    values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR}, 
+      #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR}, 
+      #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR}, 
+      #{registerNo,jdbcType=VARCHAR}, #{carrierAgent,jdbcType=VARCHAR}, #{carrierContactNumber,jdbcType=VARCHAR}, 
+      #{carrierFax,jdbcType=VARCHAR}, #{carrierAccount,jdbcType=VARCHAR}, #{carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{carrierDutyParagraph,jdbcType=VARCHAR}, #{carrierPostalCode,jdbcType=VARCHAR}, 
+      #{registerCapital,jdbcType=VARCHAR}, #{businessScope,jdbcType=VARCHAR}, #{annualDate,jdbcType=VARCHAR}, 
+      #{companyStatusDesc,jdbcType=VARCHAR}, #{companyTypeDesc,jdbcType=VARCHAR}, #{operationPeriod,jdbcType=VARCHAR}, 
+      #{registerDate,jdbcType=TIMESTAMP}, #{registerOrganization,jdbcType=VARCHAR}, #{registerAptitudes,jdbcType=VARCHAR}, 
+      #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR}, 
+      #{easCarrierId,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=BLOB}, 
+      #{carrierBusinessLicense,jdbcType=BLOB}, #{carrierBusinessAblelicense,jdbcType=BLOB}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    insert into RMS_CARRIER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+      <if test="carrierTransportType != null">
+        CARRIER_TRANSPORT_TYPE,
+      </if>
+      <if test="carrierName != null">
+        CARRIER_NAME,
+      </if>
+      <if test="carrierAbbreviation != null">
+        CARRIER_ABBREVIATION,
+      </if>
+      <if test="carrierAddress != null">
+        CARRIER_ADDRESS,
+      </if>
+      <if test="carrierBidAreaId != null">
+        CARRIER_BID_AREA_ID,
+      </if>
+      <if test="carrierBidTime != null">
+        CARRIER_BID_TIME,
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        CARRIER_LEGAL_REPRESENTATIVE,
+      </if>
+      <if test="registerNo != null">
+        REGISTER_NO,
+      </if>
+      <if test="carrierAgent != null">
+        CARRIER_AGENT,
+      </if>
+      <if test="carrierContactNumber != null">
+        CARRIER_CONTACT_NUMBER,
+      </if>
+      <if test="carrierFax != null">
+        CARRIER_FAX,
+      </if>
+      <if test="carrierAccount != null">
+        CARRIER_ACCOUNT,
+      </if>
+      <if test="carrierAccountBlank != null">
+        CARRIER_ACCOUNT_BLANK,
+      </if>
+      <if test="carrierDutyParagraph != null">
+        CARRIER_DUTY_PARAGRAPH,
+      </if>
+      <if test="carrierPostalCode != null">
+        CARRIER_POSTAL_CODE,
+      </if>
+      <if test="registerCapital != null">
+        REGISTER_CAPITAL,
+      </if>
+      <if test="businessScope != null">
+        BUSINESS_SCOPE,
+      </if>
+      <if test="annualDate != null">
+        ANNUAL_DATE,
+      </if>
+      <if test="companyStatusDesc != null">
+        COMPANY_STATUS_DESC,
+      </if>
+      <if test="companyTypeDesc != null">
+        COMPANY_TYPE_DESC,
+      </if>
+      <if test="operationPeriod != null">
+        OPERATION_PERIOD,
+      </if>
+      <if test="registerDate != null">
+        REGISTER_DATE,
+      </if>
+      <if test="registerOrganization != null">
+        REGISTER_ORGANIZATION,
+      </if>
+      <if test="registerAptitudes != null">
+        REGISTER_APTITUDES,
+      </if>
+      <if test="credentialDesc != null">
+        CREDENTIAL_DESC,
+      </if>
+      <if test="contactsName != null">
+        CONTACTS_NAME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="carrierType != null">
+        CARRIER_TYPE,
+      </if>
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID,
+      </if>
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE,
+      </if>
+      <if test="carrierBusinessLicense != null">
+        CARRIER_BUSINESS_LICENSE,
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierTransportType != null">
+        #{carrierTransportType,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierName != null">
+        #{carrierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAbbreviation != null">
+        #{carrierAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAddress != null">
+        #{carrierAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBidAreaId != null">
+        #{carrierBidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierBidTime != null">
+        #{carrierBidTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      </if>
+      <if test="registerNo != null">
+        #{registerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAgent != null">
+        #{carrierAgent,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierContactNumber != null">
+        #{carrierContactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierFax != null">
+        #{carrierFax,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccount != null">
+        #{carrierAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccountBlank != null">
+        #{carrierAccountBlank,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierDutyParagraph != null">
+        #{carrierDutyParagraph,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierPostalCode != null">
+        #{carrierPostalCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registerCapital != null">
+        #{registerCapital,jdbcType=VARCHAR},
+      </if>
+      <if test="businessScope != null">
+        #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="annualDate != null">
+        #{annualDate,jdbcType=VARCHAR},
+      </if>
+      <if test="companyStatusDesc != null">
+        #{companyStatusDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="companyTypeDesc != null">
+        #{companyTypeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="operationPeriod != null">
+        #{operationPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="registerDate != null">
+        #{registerDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registerOrganization != null">
+        #{registerOrganization,jdbcType=VARCHAR},
+      </if>
+      <if test="registerAptitudes != null">
+        #{registerAptitudes,jdbcType=VARCHAR},
+      </if>
+      <if test="credentialDesc != null">
+        #{credentialDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsName != null">
+        #{contactsName,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierType != null">
+        #{carrierType,jdbcType=VARCHAR},
+      </if>
+      <if test="easCarrierId != null">
+        #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierTransportCertificate != null">
+        #{carrierTransportCertificate,jdbcType=BLOB},
+      </if>
+      <if test="carrierBusinessLicense != null">
+        #{carrierBusinessLicense,jdbcType=BLOB},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        #{carrierBusinessAblelicense,jdbcType=BLOB},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    update RMS_CARRIER
+    set CARRIER_TRANSPORT_TYPE = #{carrierTransportType,jdbcType=VARCHAR},
+      CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
+      CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
+      CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
+      CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
+      CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
+      CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
+      CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
+      CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
+      CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
+      CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
+      CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
+      REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
+      BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
+      ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
+      COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
+      COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
+      OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
+      REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
+      REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
+      REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
+      CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
+      CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
+      EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
+      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
+      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB}
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.rmscarrier.model.RmsCarrier">
+    update RMS_CARRIER
+    <set>
+      <if test="carrierTransportType != null">
+        CARRIER_TRANSPORT_TYPE = #{carrierTransportType,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierName != null">
+        CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAbbreviation != null">
+        CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAddress != null">
+        CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBidAreaId != null">
+        CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierBidTime != null">
+        CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carrierLegalRepresentative != null">
+        CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      </if>
+      <if test="registerNo != null">
+        REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAgent != null">
+        CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierContactNumber != null">
+        CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierFax != null">
+        CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccount != null">
+        CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierAccountBlank != null">
+        CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierDutyParagraph != null">
+        CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierPostalCode != null">
+        CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registerCapital != null">
+        REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
+      </if>
+      <if test="businessScope != null">
+        BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="annualDate != null">
+        ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
+      </if>
+      <if test="companyStatusDesc != null">
+        COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="companyTypeDesc != null">
+        COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="operationPeriod != null">
+        OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="registerDate != null">
+        REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registerOrganization != null">
+        REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
+      </if>
+      <if test="registerAptitudes != null">
+        REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
+      </if>
+      <if test="credentialDesc != null">
+        CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsName != null">
+        CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierType != null">
+        CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
+      </if>
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
+      </if>
+      <if test="carrierBusinessLicense != null">
+        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB},
+      </if>
+    </set>
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_CARRIER 
+      (CARRIER_ID, 
+      CARRIER_TRANSPORT_TYPE, CARRIER_NAME, 
+      CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, 
+      CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO, 
+      CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, 
+      ANNUAL_DATE, COMPANY_STATUS_DESC, 
+      COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, 
+      REGISTER_APTITUDES, CREDENTIAL_DESC, 
+      CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+      CARRIER_TRANSPORT_CERTIFICATE, CARRIER_BUSINESS_LICENSE, 
+      CARRIER_BUSINESS_ABLELICENSE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carrierId,jdbcType=DECIMAL}, 
+      #{item.carrierTransportType,jdbcType=VARCHAR}, #{item.carrierName,jdbcType=VARCHAR}, 
+      #{item.carrierAbbreviation,jdbcType=VARCHAR}, #{item.carrierAddress,jdbcType=VARCHAR}, 
+      #{item.carrierBidAreaId,jdbcType=DECIMAL}, #{item.carrierBidTime,jdbcType=TIMESTAMP}, 
+      #{item.carrierLegalRepresentative,jdbcType=VARCHAR}, #{item.registerNo,jdbcType=VARCHAR}, 
+      #{item.carrierAgent,jdbcType=VARCHAR}, #{item.carrierContactNumber,jdbcType=VARCHAR}, 
+      #{item.carrierFax,jdbcType=VARCHAR}, #{item.carrierAccount,jdbcType=VARCHAR}, #{item.carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{item.carrierDutyParagraph,jdbcType=VARCHAR}, #{item.carrierPostalCode,jdbcType=VARCHAR}, 
+      #{item.registerCapital,jdbcType=VARCHAR}, #{item.businessScope,jdbcType=VARCHAR}, 
+      #{item.annualDate,jdbcType=VARCHAR}, #{item.companyStatusDesc,jdbcType=VARCHAR}, 
+      #{item.companyTypeDesc,jdbcType=VARCHAR}, #{item.operationPeriod,jdbcType=VARCHAR}, 
+      #{item.registerDate,jdbcType=TIMESTAMP}, #{item.registerOrganization,jdbcType=VARCHAR}, 
+      #{item.registerAptitudes,jdbcType=VARCHAR}, #{item.credentialDesc,jdbcType=VARCHAR}, 
+      #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR}, 
+      #{item.carrierTransportCertificate,jdbcType=BLOB}, #{item.carrierBusinessLicense,jdbcType=BLOB}, 
+      #{item.carrierBusinessAblelicense,jdbcType=BLOB} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_CARRIER
+     set
+       CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TRANSPORT_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportType,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierName,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ABBREVIATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAbbreviation,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ADDRESS=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAddress,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_BID_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CARRIER_LEGAL_REPRESENTATIVE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierLegalRepresentative,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_AGENT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAgent,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_CONTACT_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierContactNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_FAX=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierFax,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccount,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT_BLANK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccountBlank,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_DUTY_PARAGRAPH=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierDutyParagraph,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_POSTAL_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierPostalCode,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_CAPITAL=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerCapital,jdbcType=VARCHAR}
+       </foreach>
+       ,BUSINESS_SCOPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.businessScope,jdbcType=VARCHAR}
+       </foreach>
+       ,ANNUAL_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.annualDate,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_STATUS_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyStatusDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_TYPE_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyTypeDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_PERIOD=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.operationPeriod,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,REGISTER_ORGANIZATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerOrganization,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_APTITUDES=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerAptitudes,jdbcType=VARCHAR}
+       </foreach>
+       ,CREDENTIAL_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.credentialDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,CONTACTS_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.contactsName,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
+       </foreach>
+       ,EAS_CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_TRANSPORT_CERTIFICATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=BLOB}
+       </foreach>
+       ,CARRIER_BUSINESS_LICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=BLOB}
+       </foreach>
+       ,CARRIER_BUSINESS_ABLELICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=BLOB}
+       </foreach>
+     where CARRIER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.carrierId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_CARRIER
+    where CARRIER_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 602 - 0
src/test/java/com/steerinfo/dil/rmscarrier/model/RmsCarrier.java

@@ -0,0 +1,602 @@
+package com.steerinfo.dil.rmscarrier.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="承运方")
+public class RmsCarrier implements IBasePO<Short> {
+    /**
+     * 主键ID(CARRIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private Short carrierId;
+
+    /**
+     * 运输类型:0危化品;1:其他(CARRIER_TRANSPORT_TYPE,VARCHAR,32)
+     */
+    @ApiModelProperty(value="运输类型:0危化品;1:其他",required=false)
+    private String carrierTransportType;
+
+    /**
+     * 承运商名称(CARRIER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="承运商名称",required=false)
+    private String carrierName;
+
+    /**
+     * 承运人简称(CARRIER_ABBREVIATION,VARCHAR,32)
+     */
+    @ApiModelProperty(value="承运人简称",required=false)
+    private String carrierAbbreviation;
+
+    /**
+     * 地址(CARRIER_ADDRESS,VARCHAR,64)
+     */
+    @ApiModelProperty(value="地址",required=false)
+    private String carrierAddress;
+
+    /**
+     * 中标区域ID(CARRIER_BID_AREA_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="中标区域ID",required=false)
+    private Short carrierBidAreaId;
+
+    /**
+     * 中标时间(CARRIER_BID_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="中标时间",required=false)
+    private Date carrierBidTime;
+
+    /**
+     * 法人代表(CARRIER_LEGAL_REPRESENTATIVE,VARCHAR,16)
+     */
+    @ApiModelProperty(value="法人代表",required=false)
+    private String carrierLegalRepresentative;
+
+    /**
+     * 注册号(REGISTER_NO,VARCHAR,32)
+     */
+    @ApiModelProperty(value="注册号",required=false)
+    private String registerNo;
+
+    /**
+     * 委托代理人(CARRIER_AGENT,VARCHAR,16)
+     */
+    @ApiModelProperty(value="委托代理人",required=false)
+    private String carrierAgent;
+
+    /**
+     * 联系电话(CARRIER_CONTACT_NUMBER,VARCHAR,32)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String carrierContactNumber;
+
+    /**
+     * 传真(CARRIER_FAX,VARCHAR,32)
+     */
+    @ApiModelProperty(value="传真",required=false)
+    private String carrierFax;
+
+    /**
+     * 账户(CARRIER_ACCOUNT,VARCHAR,32)
+     */
+    @ApiModelProperty(value="账户",required=false)
+    private String carrierAccount;
+
+    /**
+     * 开户行(CARRIER_ACCOUNT_BLANK,VARCHAR,32)
+     */
+    @ApiModelProperty(value="开户行",required=false)
+    private String carrierAccountBlank;
+
+    /**
+     * 税号(CARRIER_DUTY_PARAGRAPH,VARCHAR,32)
+     */
+    @ApiModelProperty(value="税号",required=false)
+    private String carrierDutyParagraph;
+
+    /**
+     * 邮政编码(CARRIER_POSTAL_CODE,VARCHAR,16)
+     */
+    @ApiModelProperty(value="邮政编码",required=false)
+    private String carrierPostalCode;
+
+    /**
+     * 注册资本(REGISTER_CAPITAL,VARCHAR,16)
+     */
+    @ApiModelProperty(value="注册资本",required=false)
+    private String registerCapital;
+
+    /**
+     * 经营范围(BUSINESS_SCOPE,VARCHAR,256)
+     */
+    @ApiModelProperty(value="经营范围",required=false)
+    private String businessScope;
+
+    /**
+     * 年检年度(ANNUAL_DATE,VARCHAR,16)
+     */
+    @ApiModelProperty(value="年检年度",required=false)
+    private String annualDate;
+
+    /**
+     * 企业状态(COMPANY_STATUS_DESC,VARCHAR,16)
+     */
+    @ApiModelProperty(value="企业状态",required=false)
+    private String companyStatusDesc;
+
+    /**
+     * 企业类型(COMPANY_TYPE_DESC,VARCHAR,16)
+     */
+    @ApiModelProperty(value="企业类型",required=false)
+    private String companyTypeDesc;
+
+    /**
+     * 经营期限(OPERATION_PERIOD,VARCHAR,16)
+     */
+    @ApiModelProperty(value="经营期限",required=false)
+    private String operationPeriod;
+
+    /**
+     * 成立日期(REGISTER_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="成立日期",required=false)
+    private Date registerDate;
+
+    /**
+     * 登记机构(REGISTER_ORGANIZATION,VARCHAR,16)
+     */
+    @ApiModelProperty(value="登记机构",required=false)
+    private String registerOrganization;
+
+    /**
+     * 相关资质(REGISTER_APTITUDES,VARCHAR,16)
+     */
+    @ApiModelProperty(value="相关资质",required=false)
+    private String registerAptitudes;
+
+    /**
+     * 企业资信等级(CREDENTIAL_DESC,VARCHAR,16)
+     */
+    @ApiModelProperty(value="企业资信等级",required=false)
+    private String credentialDesc;
+
+    /**
+     * 联系人(CONTACTS_NAME,VARCHAR,8)
+     */
+    @ApiModelProperty(value="联系人",required=false)
+    private String contactsName;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private Short deleted;
+
+    /**
+     * 承运商类型:0外协承运商;1虚拟承运商;2销售承运商;3原料供应承运商(CARRIER_TYPE,VARCHAR,32)
+     */
+    @ApiModelProperty(value="承运商类型:0外协承运商;1虚拟承运商;2销售承运商;3原料供应承运商",required=false)
+    private String carrierType;
+
+    /**
+     * eas金蝶主键(EAS_CARRIER_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="eas金蝶主键",required=false)
+    private String easCarrierId;
+
+    /**
+     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="营业执照",required=false)
+    private String carrierBusinessAblelicense;
+
+    /**
+     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="经营许可证(照片)",required=false)
+    private String carrierBusinessLicense;
+
+    /**
+     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="运输证(照片)",required=false)
+    private String carrierTransportCertificate;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Short getId() {
+        return this.carrierId;
+    }
+
+    @Override
+    public void setId(Short carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public Short getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(Short carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getCarrierTransportType() {
+        return carrierTransportType;
+    }
+
+    public void setCarrierTransportType(String carrierTransportType) {
+        this.carrierTransportType = carrierTransportType == null ? null : carrierTransportType.trim();
+    }
+
+    public String getCarrierName() {
+        return carrierName;
+    }
+
+    public void setCarrierName(String carrierName) {
+        this.carrierName = carrierName == null ? null : carrierName.trim();
+    }
+
+    public String getCarrierAbbreviation() {
+        return carrierAbbreviation;
+    }
+
+    public void setCarrierAbbreviation(String carrierAbbreviation) {
+        this.carrierAbbreviation = carrierAbbreviation == null ? null : carrierAbbreviation.trim();
+    }
+
+    public String getCarrierAddress() {
+        return carrierAddress;
+    }
+
+    public void setCarrierAddress(String carrierAddress) {
+        this.carrierAddress = carrierAddress == null ? null : carrierAddress.trim();
+    }
+
+    public Short getCarrierBidAreaId() {
+        return carrierBidAreaId;
+    }
+
+    public void setCarrierBidAreaId(Short carrierBidAreaId) {
+        this.carrierBidAreaId = carrierBidAreaId;
+    }
+
+    public Date getCarrierBidTime() {
+        return carrierBidTime;
+    }
+
+    public void setCarrierBidTime(Date carrierBidTime) {
+        this.carrierBidTime = carrierBidTime;
+    }
+
+    public String getCarrierLegalRepresentative() {
+        return carrierLegalRepresentative;
+    }
+
+    public void setCarrierLegalRepresentative(String carrierLegalRepresentative) {
+        this.carrierLegalRepresentative = carrierLegalRepresentative == null ? null : carrierLegalRepresentative.trim();
+    }
+
+    public String getRegisterNo() {
+        return registerNo;
+    }
+
+    public void setRegisterNo(String registerNo) {
+        this.registerNo = registerNo == null ? null : registerNo.trim();
+    }
+
+    public String getCarrierAgent() {
+        return carrierAgent;
+    }
+
+    public void setCarrierAgent(String carrierAgent) {
+        this.carrierAgent = carrierAgent == null ? null : carrierAgent.trim();
+    }
+
+    public String getCarrierContactNumber() {
+        return carrierContactNumber;
+    }
+
+    public void setCarrierContactNumber(String carrierContactNumber) {
+        this.carrierContactNumber = carrierContactNumber == null ? null : carrierContactNumber.trim();
+    }
+
+    public String getCarrierFax() {
+        return carrierFax;
+    }
+
+    public void setCarrierFax(String carrierFax) {
+        this.carrierFax = carrierFax == null ? null : carrierFax.trim();
+    }
+
+    public String getCarrierAccount() {
+        return carrierAccount;
+    }
+
+    public void setCarrierAccount(String carrierAccount) {
+        this.carrierAccount = carrierAccount == null ? null : carrierAccount.trim();
+    }
+
+    public String getCarrierAccountBlank() {
+        return carrierAccountBlank;
+    }
+
+    public void setCarrierAccountBlank(String carrierAccountBlank) {
+        this.carrierAccountBlank = carrierAccountBlank == null ? null : carrierAccountBlank.trim();
+    }
+
+    public String getCarrierDutyParagraph() {
+        return carrierDutyParagraph;
+    }
+
+    public void setCarrierDutyParagraph(String carrierDutyParagraph) {
+        this.carrierDutyParagraph = carrierDutyParagraph == null ? null : carrierDutyParagraph.trim();
+    }
+
+    public String getCarrierPostalCode() {
+        return carrierPostalCode;
+    }
+
+    public void setCarrierPostalCode(String carrierPostalCode) {
+        this.carrierPostalCode = carrierPostalCode == null ? null : carrierPostalCode.trim();
+    }
+
+    public String getRegisterCapital() {
+        return registerCapital;
+    }
+
+    public void setRegisterCapital(String registerCapital) {
+        this.registerCapital = registerCapital == null ? null : registerCapital.trim();
+    }
+
+    public String getBusinessScope() {
+        return businessScope;
+    }
+
+    public void setBusinessScope(String businessScope) {
+        this.businessScope = businessScope == null ? null : businessScope.trim();
+    }
+
+    public String getAnnualDate() {
+        return annualDate;
+    }
+
+    public void setAnnualDate(String annualDate) {
+        this.annualDate = annualDate == null ? null : annualDate.trim();
+    }
+
+    public String getCompanyStatusDesc() {
+        return companyStatusDesc;
+    }
+
+    public void setCompanyStatusDesc(String companyStatusDesc) {
+        this.companyStatusDesc = companyStatusDesc == null ? null : companyStatusDesc.trim();
+    }
+
+    public String getCompanyTypeDesc() {
+        return companyTypeDesc;
+    }
+
+    public void setCompanyTypeDesc(String companyTypeDesc) {
+        this.companyTypeDesc = companyTypeDesc == null ? null : companyTypeDesc.trim();
+    }
+
+    public String getOperationPeriod() {
+        return operationPeriod;
+    }
+
+    public void setOperationPeriod(String operationPeriod) {
+        this.operationPeriod = operationPeriod == null ? null : operationPeriod.trim();
+    }
+
+    public Date getRegisterDate() {
+        return registerDate;
+    }
+
+    public void setRegisterDate(Date registerDate) {
+        this.registerDate = registerDate;
+    }
+
+    public String getRegisterOrganization() {
+        return registerOrganization;
+    }
+
+    public void setRegisterOrganization(String registerOrganization) {
+        this.registerOrganization = registerOrganization == null ? null : registerOrganization.trim();
+    }
+
+    public String getRegisterAptitudes() {
+        return registerAptitudes;
+    }
+
+    public void setRegisterAptitudes(String registerAptitudes) {
+        this.registerAptitudes = registerAptitudes == null ? null : registerAptitudes.trim();
+    }
+
+    public String getCredentialDesc() {
+        return credentialDesc;
+    }
+
+    public void setCredentialDesc(String credentialDesc) {
+        this.credentialDesc = credentialDesc == null ? null : credentialDesc.trim();
+    }
+
+    public String getContactsName() {
+        return contactsName;
+    }
+
+    public void setContactsName(String contactsName) {
+        this.contactsName = contactsName == null ? null : contactsName.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Short getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Short deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getCarrierType() {
+        return carrierType;
+    }
+
+    public void setCarrierType(String carrierType) {
+        this.carrierType = carrierType == null ? null : carrierType.trim();
+    }
+
+    public String getEasCarrierId() {
+        return easCarrierId;
+    }
+
+    public void setEasCarrierId(String easCarrierId) {
+        this.easCarrierId = easCarrierId == null ? null : easCarrierId.trim();
+    }
+
+    public String getCarrierBusinessAblelicense() {
+        return carrierBusinessAblelicense;
+    }
+
+    public void setCarrierBusinessAblelicense(String carrierBusinessAblelicense) {
+        this.carrierBusinessAblelicense = carrierBusinessAblelicense == null ? null : carrierBusinessAblelicense.trim();
+    }
+
+    public String getCarrierBusinessLicense() {
+        return carrierBusinessLicense;
+    }
+
+    public void setCarrierBusinessLicense(String carrierBusinessLicense) {
+        this.carrierBusinessLicense = carrierBusinessLicense == null ? null : carrierBusinessLicense.trim();
+    }
+
+    public String getCarrierTransportCertificate() {
+        return carrierTransportCertificate;
+    }
+
+    public void setCarrierTransportCertificate(String carrierTransportCertificate) {
+        this.carrierTransportCertificate = carrierTransportCertificate == null ? null : carrierTransportCertificate.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", carrierTransportType=").append(carrierTransportType);
+        sb.append(", carrierName=").append(carrierName);
+        sb.append(", carrierAbbreviation=").append(carrierAbbreviation);
+        sb.append(", carrierAddress=").append(carrierAddress);
+        sb.append(", carrierBidAreaId=").append(carrierBidAreaId);
+        sb.append(", carrierBidTime=").append(carrierBidTime);
+        sb.append(", carrierLegalRepresentative=").append(carrierLegalRepresentative);
+        sb.append(", registerNo=").append(registerNo);
+        sb.append(", carrierAgent=").append(carrierAgent);
+        sb.append(", carrierContactNumber=").append(carrierContactNumber);
+        sb.append(", carrierFax=").append(carrierFax);
+        sb.append(", carrierAccount=").append(carrierAccount);
+        sb.append(", carrierAccountBlank=").append(carrierAccountBlank);
+        sb.append(", carrierDutyParagraph=").append(carrierDutyParagraph);
+        sb.append(", carrierPostalCode=").append(carrierPostalCode);
+        sb.append(", registerCapital=").append(registerCapital);
+        sb.append(", businessScope=").append(businessScope);
+        sb.append(", annualDate=").append(annualDate);
+        sb.append(", companyStatusDesc=").append(companyStatusDesc);
+        sb.append(", companyTypeDesc=").append(companyTypeDesc);
+        sb.append(", operationPeriod=").append(operationPeriod);
+        sb.append(", registerDate=").append(registerDate);
+        sb.append(", registerOrganization=").append(registerOrganization);
+        sb.append(", registerAptitudes=").append(registerAptitudes);
+        sb.append(", credentialDesc=").append(credentialDesc);
+        sb.append(", contactsName=").append(contactsName);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", carrierType=").append(carrierType);
+        sb.append(", easCarrierId=").append(easCarrierId);
+        sb.append(", carrierBusinessAblelicense=").append(carrierBusinessAblelicense);
+        sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
+        sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/test/java/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.rmscarrier.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.rmscarrier.model.RmsCarrier;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * RmsCarrier服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-25
+ * 作者:generator
+ * 参考:
+ * 描述:RmsCarrier服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsCarrierService extends IBaseService<RmsCarrier, Short>{
+
+}

+ 36 - 0
src/test/java/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.rmscarrier.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.rmscarrier.model.RmsCarrier;
+import com.steerinfo.dil.rmscarrier.mapper.RmsCarrierMapper;
+import com.steerinfo.dil.rmscarrier.service.IRmsCarrierService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * RmsCarrier服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * 类描述
+ * 修订历史:
+ * 日期:2021-12-25
+ * 作者:generator
+ * 参考:
+ * 描述:RmsCarrier服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsCarrierService")
+public class RmsCarrierServiceImpl extends BaseServiceImpl<RmsCarrier, Short> implements IRmsCarrierService {
+
+    @Autowired
+    private RmsCarrierMapper rmsCarrierMapper;
+
+    @Override
+    protected IBaseMapper<RmsCarrier, Short> getMapper() {
+        return rmsCarrierMapper;
+    }
+}

BIN
target/classes/com/steerinfo/dil/controller/RmsCapacityController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsCarrierController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsGatepostController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsMaterialController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsShipperController.class


BIN
target/classes/com/steerinfo/dil/controller/RmsSupplierController.class


+ 109 - 82
target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml

@@ -36,9 +36,10 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="CARRIER_TYPE" jdbcType="VARCHAR" property="carrierType" />
-    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="BLOB" property="carrierTransportCertificate" />
-    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="BLOB" property="carrierBusinessLicense" />
-    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="carrierBusinessAblelicense" />
+    <result column="EAS_CARRIER_ID" jdbcType="VARCHAR" property="easCarrierId" />
+    <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="VARCHAR" property="carrierBusinessAblelicense" />
+    <result column="CARRIER_BUSINESS_LICENSE" jdbcType="VARCHAR" property="carrierBusinessLicense" />
+    <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="VARCHAR" property="carrierTransportCertificate" />
   </resultMap>
   <sql id="columns">
     CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
@@ -47,8 +48,8 @@
     CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
     COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, REGISTER_DATE, REGISTER_ORGANIZATION, 
     REGISTER_APTITUDES, CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, CARRIER_TRANSPORT_CERTIFICATE, 
-    CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+    CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
   </sql>
   <sql id="columns_alias">
     t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
@@ -58,8 +59,8 @@
     t.ANNUAL_DATE, t.COMPANY_STATUS_DESC, t.COMPANY_TYPE_DESC, t.OPERATION_PERIOD, t.REGISTER_DATE, 
     t.REGISTER_ORGANIZATION, t.REGISTER_APTITUDES, t.CREDENTIAL_DESC, t.CONTACTS_NAME, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.DELETED, t.CARRIER_TYPE, t.CARRIER_TRANSPORT_CERTIFICATE, t.CARRIER_BUSINESS_LICENSE, 
-    t.CARRIER_BUSINESS_ABLELICENSE
+    t.DELETED, t.CARRIER_TYPE, t.EAS_CARRIER_ID, t.CARRIER_BUSINESS_ABLELICENSE, t.CARRIER_BUSINESS_LICENSE, 
+    t.CARRIER_TRANSPORT_CERTIFICATE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CARRIER
@@ -171,14 +172,17 @@
       <if test="carrierType != null and carrierType != ''">
         and CARRIER_TYPE = #{carrierType}
       </if>
-      <if test="carrierTransportCertificate != null">
-        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID = #{easCarrierId}
       </if>
-      <if test="carrierBusinessLicense != null">
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
         and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
       </if>
     </where>
   </sql>
@@ -286,14 +290,17 @@
       <if test="carrierType != null and carrierType != ''">
         and CARRIER_TYPE LIKE '%${carrierType}%'
       </if>
-      <if test="carrierTransportCertificate != null">
-        and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        and EAS_CARRIER_ID LIKE '%${easCarrierId}%'
       </if>
-      <if test="carrierBusinessLicense != null">
-        and CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        and CARRIER_BUSINESS_ABLELICENSE LIKE '%${carrierBusinessAblelicense}%'
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        and CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        and CARRIER_BUSINESS_LICENSE LIKE '%${carrierBusinessLicense}%'
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        and CARRIER_TRANSPORT_CERTIFICATE LIKE '%${carrierTransportCertificate}%'
       </if>
     </where>
   </sql>
@@ -403,14 +410,17 @@
       <if test="carrierType != null and carrierType != ''">
         or CARRIER_TYPE = #{carrierType}
       </if>
-      <if test="carrierTransportCertificate != null">
-        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      <if test="easCarrierId != null and easCarrierId != ''">
+        or EAS_CARRIER_ID = #{easCarrierId}
       </if>
-      <if test="carrierBusinessLicense != null">
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
         or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -426,8 +436,9 @@
       CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, 
       INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, 
-      CARRIER_TRANSPORT_CERTIFICATE, CARRIER_BUSINESS_LICENSE, 
-      CARRIER_BUSINESS_ABLELICENSE)
+      EAS_CARRIER_ID, CARRIER_BUSINESS_ABLELICENSE, 
+      CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE
+      )
     values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR}, 
       #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR}, 
       #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR}, 
@@ -440,8 +451,9 @@
       #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
       #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR}, 
-      #{carrierTransportCertificate,jdbcType=BLOB}, #{carrierBusinessLicense,jdbcType=BLOB}, 
-      #{carrierBusinessAblelicense,jdbcType=BLOB})
+      #{easCarrierId,jdbcType=VARCHAR}, #{carrierBusinessAblelicense,jdbcType=VARCHAR}, 
+      #{carrierBusinessLicense,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
     insert into RMS_CARRIER
@@ -548,14 +560,17 @@
       <if test="carrierType != null">
         CARRIER_TYPE,
       </if>
-      <if test="carrierTransportCertificate != null">
-        CARRIER_TRANSPORT_CERTIFICATE,
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID,
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE,
       </if>
       <if test="carrierBusinessLicense != null">
         CARRIER_BUSINESS_LICENSE,
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        CARRIER_BUSINESS_ABLELICENSE,
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -661,14 +676,17 @@
       <if test="carrierType != null">
         #{carrierType,jdbcType=VARCHAR},
       </if>
-      <if test="carrierTransportCertificate != null">
-        #{carrierTransportCertificate,jdbcType=BLOB},
+      <if test="easCarrierId != null">
+        #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        #{carrierBusinessAblelicense,jdbcType=VARCHAR},
       </if>
       <if test="carrierBusinessLicense != null">
-        #{carrierBusinessLicense,jdbcType=BLOB},
+        #{carrierBusinessLicense,jdbcType=VARCHAR},
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        #{carrierBusinessAblelicense,jdbcType=BLOB},
+      <if test="carrierTransportCertificate != null">
+        #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -707,9 +725,10 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       DELETED = #{deleted,jdbcType=DECIMAL},
       CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
-      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
-      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
-      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB}
+      EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
+      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR}
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -814,14 +833,17 @@
       <if test="carrierType != null">
         CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
       </if>
-      <if test="carrierTransportCertificate != null">
-        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=BLOB},
+      <if test="easCarrierId != null">
+        EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierBusinessAblelicense != null">
+        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
       </if>
       <if test="carrierBusinessLicense != null">
-        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=BLOB},
+        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
       </if>
-      <if test="carrierBusinessAblelicense != null">
-        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=BLOB},
+      <if test="carrierTransportCertificate != null">
+        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
@@ -856,9 +878,9 @@
       CONTACTS_NAME, INSERT_USERNAME, 
       INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, CARRIER_TYPE, CARRIER_TRANSPORT_CERTIFICATE, 
-      CARRIER_BUSINESS_LICENSE, CARRIER_BUSINESS_ABLELICENSE
-      )
+      DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+      CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, 
+      CARRIER_TRANSPORT_CERTIFICATE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.carrierId,jdbcType=DECIMAL}, 
@@ -877,9 +899,9 @@
       #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
       #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.carrierTransportCertificate,jdbcType=BLOB}, 
-      #{item.carrierBusinessLicense,jdbcType=BLOB}, #{item.carrierBusinessAblelicense,jdbcType=BLOB}
-       from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR}, 
+      #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}, #{item.carrierBusinessLicense,jdbcType=VARCHAR}, 
+      #{item.carrierTransportCertificate,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1021,17 +1043,21 @@
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
           when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
        </foreach>
-       ,CARRIER_TRANSPORT_CERTIFICATE=
+       ,EAS_CARRIER_ID=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_ABLELICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}
        </foreach>
        ,CARRIER_BUSINESS_LICENSE=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=VARCHAR}
        </foreach>
-       ,CARRIER_BUSINESS_ABLELICENSE=
+       ,CARRIER_TRANSPORT_CERTIFICATE=
        <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=BLOB}
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=VARCHAR}
        </foreach>
      where CARRIER_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -1226,43 +1252,44 @@
   <!--  根据id值获取承运商信息-->
   <select id="selectCarrierById"  resultType="java.util.LinkedHashMap">
     select
-    RC.CARRIER_ID as "carrierId",
-    RC.CARRIER_NAME as "carrierName",
-    RC.CARRIER_TRANSPORT_CERTIFICATE as "carrierTransportCertificate",
-    RC.CARRIER_BUSINESS_LICENSE as "carrierBusinessLicense",
-    RC.CARRIER_BUSINESS_ABLELICENSE as "carrierBusinessAblelicense",
-    RC.CARRIER_ABBREVIATION as "carrierAbbreviation",
-    RC.CARRIER_ADDRESS as "carrierAddress",
-    RC.REGISTER_NO as "registerNo",
-    RC.CARRIER_BID_AREA_ID as "carrierBidAreaId",
-    RC.CARRIER_LEGAL_REPRESENTATIVE as "carrierLegalRepresentative",
-    RC.REGISTER_CAPITAL as "registerCapital",
-    RC.BUSINESS_SCOPE as "businessScope",
-    RC.ANNUAL_DATE as "annualDate",
-    RC.CARRIER_TYPE as "carrierType",
-    RC.COMPANY_STATUS_DESC as "companyStatusDesc",
-    RC.COMPANY_TYPE_DESC as "companyTypeDesc",
-    RC.OPERATION_PERIOD as "operationPeriod",
-    RC.REGISTER_DATE as "registerDate",
-    RC.REGISTER_ORGANIZATION as "registerOrganization",
-    RC.REGISTER_APTITUDES as "registerAptitudes",
-    RC.CARRIER_TRANSPORT_TYPE as "carrierTransportType",
-    RC.CONTACTS_NAME as "contactsName",
-    RC.CARRIER_CONTACT_NUMBER as "carrierContactNumber"
+      RC.CARRIER_ID as "carrierId",
+      RC.CARRIER_NAME as "carrierName",
+      RC.CARRIER_TRANSPORT_CERTIFICATE as "carrierTransportCertificate",
+      RC.CARRIER_BUSINESS_LICENSE as "carrierBusinessLicense",
+      RC.CARRIER_BUSINESS_ABLELICENSE as "carrierBusinessAblelicense",
+      RC.CARRIER_ABBREVIATION as "carrierAbbreviation",
+      RC.CARRIER_ADDRESS as "carrierAddress",
+      RC.REGISTER_NO as "registerNo",
+      RC.CARRIER_BID_AREA_ID as "carrierBidAreaId",
+      RC.CARRIER_LEGAL_REPRESENTATIVE as "carrierLegalRepresentative",
+      RC.REGISTER_CAPITAL as "registerCapital",
+      RC.BUSINESS_SCOPE as "businessScope",
+      RC.ANNUAL_DATE as "annualDate",
+      RC.CARRIER_TYPE as "carrierType",
+      RC.COMPANY_STATUS_DESC as "companyStatusDesc",
+      RC.COMPANY_TYPE_DESC as "companyTypeDesc",
+      RC.OPERATION_PERIOD as "operationPeriod",
+      RC.REGISTER_DATE as "registerDate",
+      RC.REGISTER_ORGANIZATION as "registerOrganization",
+      RC.REGISTER_APTITUDES as "registerAptitudes",
+      RC.CARRIER_TRANSPORT_TYPE as "carrierTransportType",
+      RC.CONTACTS_NAME as "contactsName",
+      RC.CARRIER_CONTACT_NUMBER as "carrierContactNumber"
     from RMS_CARRIER RC
     where  RC.CARRIER_ID=#{id}
   </select>
 
-<!--  通过传入的值判断当前表是否存在相同的数量-->
+  <!--  通过传入的值判断当前表是否存在相同的数量-->
   <select id="selectParameterCarrierName" resultType="java.lang.Integer">
     SELECT COUNT(*)
     FROM RMS_CARRIER RC
     WHERE RC.CARRIER_NAME = #{carrierName}
-    AND RC.DELETED =0
+      AND RC.DELETED =0
   </select>
-<!--  获取表中的最大id-->
+  <!--  获取表中的最大id-->
   <select id="getMaxCarrierId" resultType="java.math.BigDecimal">
     SELECT MAX(RC.CARRIER_ID)
-        FROM RMS_CARRIER RC
+    FROM RMS_CARRIER RC
   </select>
+  
 </mapper>

BIN
target/classes/com/steerinfo/dil/model/RmsCarrier.class


BIN
target/classes/com/steerinfo/dil/service/IRmsSupplierService.class


BIN
target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class


BIN
target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class


+ 131 - 131
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,131 +1,131 @@
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarrier.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarDriverServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCapacityMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPierMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortStorageYardService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsConsignee.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLine.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLinkServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\DilNoticeController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsSupplierMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\CorsConfig1.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\interceptors\MyLocaleChangeInterceptor.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsWarehouseController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsBidAreaService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsShipperService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsSupplierService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialType.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsDriverCapacityServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsConsigneeController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsOilPrice.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostRulesMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataConversionTool.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsBidAreaServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsTruckCalculateController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsOilPriceService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostRulesServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\util.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepost.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsUnitOfMeasure.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsUnitOfMeasureMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsDriverCapacityMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPersonnel.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLinkController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPersonnelServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPortMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarDriverMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarrierService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCapacityController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLineSegemnt.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialTypeService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsShipperController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarDriverController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsWarehouse.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPersonnelController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsShipper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarrierController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IDilNoticeService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialTypeMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepostRules.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsGatepostController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\BaseRESTfulController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\ColumnDataUtil.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCapacityService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsSupplierServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterial.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsSupplierController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\WebSocketConfig.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineSegemntMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\PageListAdd.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarDriverService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsWarehouseServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarDriver.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ESFeign.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostRulesService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineSegemntService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\DilNoticeServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPersonnelService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\DilNoticeMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPierController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineSegemntController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataChange.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\DilApplicationMain.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLink.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortStorageYardService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsConsigneeService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsConsigneeMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPierServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLinkService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsConsigneeServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialSteelMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\DilNotice.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsDriverCapacityService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLinkMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarrierServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsBidArea.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsSupplier.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsWarehouseMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\CommonSeq.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsWarehouseService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineSegemntServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsOilPriceServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculateMaterial.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCapacityServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPierService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMaterialMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCapacity.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPersonnelMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsShipperServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsTruckCalculateServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsTruckCalculateService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialSteel.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPier.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\AmsFeign.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ColumnDataFeign.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarrierMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostService.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialTypeController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsBidAreaMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortStorageYard.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPort.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculate.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsDriverCapacityController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsShipperMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialTypeServiceImpl.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsOilPriceController.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsOilPriceMapper.java
-C:\stworkspace\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsDriverCapacity.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IDilNoticeService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsShipperMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarrierMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\CorsConfig1.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\interceptors\MyLocaleChangeInterceptor.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\WebSocketConfig.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCapacityController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsConsignee.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\DilNoticeMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPortMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLinkService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLine.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\DilNotice.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterial.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsWarehouse.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsConsigneeServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialSteelMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsConsigneeService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCapacityService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsSupplierService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataChange.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\CommonSeq.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPersonnelController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPierService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostRulesServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarDriver.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMaterialMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarDriverService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLinkMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPierServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsShipperServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPersonnelService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsOilPriceMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsUnitOfMeasure.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsWarehouseService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLinkController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCapacity.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsOilPriceService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineSegemntMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsOilPrice.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPort.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarDriverServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsSupplierMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsDriverCapacityService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsShipperService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsTruckCalculateController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarrierServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\DilNoticeController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\util.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialTypeMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepostRules.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCapacityServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsOilPriceServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsSupplierController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortStorageYardService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPier.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLineSegemnt.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortStorageYardService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsShipperController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialTypeService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ESFeign.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialType.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsUnitOfMeasureMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineSegemntService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarrierController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPierController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortStorageYard.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPersonnelMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsWarehouseServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsOilPriceController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\AmsFeign.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialSteel.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLink.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostRulesService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsBidAreaMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsDriverCapacity.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsGatepostController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsDriverCapacityController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialTypeController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsShipper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsTruckCalculateServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsWarehouseMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculate.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\BaseRESTfulController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsDriverCapacityServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsDriverCapacityMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialTypeServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ColumnDataFeign.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\DilNoticeServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsTruckCalculateService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostRulesMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarrier.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLinkServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsBidAreaServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsConsigneeMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPierMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsBidArea.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsSupplier.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepost.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\DilApplicationMain.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPersonnelServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\PageListAdd.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsWarehouseController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsConsigneeController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPersonnel.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\ColumnDataUtil.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarDriverMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarDriverController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineSegemntController.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataConversionTool.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculateMaterial.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsBidAreaService.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineSegemntServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCapacityMapper.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsSupplierServiceImpl.java
+C:\workspaces\stworkspace\12.23\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarrierService.java

+ 7 - 2
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,5 +1,10 @@
-com\steerinfo\dil\rmsbidarea\service\impl\RmsBidAreaServiceImpl.class
+com\steerinfo\dil\rmscarrier\mapper\RmsCarrierMapper.class
 com\steerinfo\dil\rmsbidarea\service\IRmsBidAreaService.class
-com\steerinfo\dil\rmsbidarea\mapper\RmsBidAreaMapper.class
 com\steerinfo\dil\rmsbidarea\model\RmsBidArea.class
 com\steerinfo\dil\rmsbidarea\controller\RmsBidAreaController.class
+com\steerinfo\dil\rmscarrier\service\IRmsCarrierService.class
+com\steerinfo\dil\rmscarrier\model\RmsCarrier.class
+com\steerinfo\dil\rmsbidarea\service\impl\RmsBidAreaServiceImpl.class
+com\steerinfo\dil\rmscarrier\service\impl\RmsCarrierServiceImpl.class
+com\steerinfo\dil\rmsbidarea\mapper\RmsBidAreaMapper.class
+com\steerinfo\dil\rmscarrier\controller\RmsCarrierController.class

BIN
target/test-classes/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.class


BIN
target/test-classes/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.class


BIN
target/test-classes/com/steerinfo/dil/rmscarrier/model/RmsCarrier.class


BIN
target/test-classes/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.class


BIN
target/test-classes/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.class