Browse Source

资源管理

hujh 3 years ago
parent
commit
8cd3186ea9
100 changed files with 2788 additions and 11739 deletions
  1. 8 0
      .gitignore
  2. 5 0
      .idea/jarRepositories.xml
  3. 480 90
      .idea/workspace.xml
  4. 0 233
      dil-api.iml
  5. 7 6
      src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java
  6. 2 0
      src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java
  7. 6 6
      src/main/java/com/steerinfo/dil/model/RmsCarDriver.java
  8. 3 0
      src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java
  9. 47 0
      src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java
  10. 18 14
      src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml
  11. 1 22
      src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml
  12. 1 1
      src/test/java/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.java
  13. 2171 0
      src/test/java/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.xml
  14. 18 3
      src/test/java/com/steerinfo/dil/rmscarrier/model/RmsCarrier.java
  15. 1 1
      src/test/java/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.java
  16. 1 1
      src/test/java/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.java
  17. 0 8
      target/classes/application-dev.yml
  18. 0 8
      target/classes/application-prod.yml
  19. 0 0
      target/classes/application.yml
  20. 0 64
      target/classes/bootstrap.yml
  21. BIN
      target/classes/com/steerinfo/DilApplicationMain.class
  22. BIN
      target/classes/com/steerinfo/dil/config/CorsConfig1.class
  23. BIN
      target/classes/com/steerinfo/dil/config/WebSocketConfig.class
  24. BIN
      target/classes/com/steerinfo/dil/controller/DilNoticeController.class
  25. BIN
      target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class
  26. BIN
      target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class
  27. BIN
      target/classes/com/steerinfo/dil/controller/RmsDriverCapacityController.class
  28. BIN
      target/classes/com/steerinfo/dil/controller/RmsLineController.class
  29. BIN
      target/classes/com/steerinfo/dil/controller/RmsLineSegemntController.class
  30. BIN
      target/classes/com/steerinfo/dil/controller/RmsLinkController.class
  31. BIN
      target/classes/com/steerinfo/dil/controller/RmsMaterialTypeController.class
  32. BIN
      target/classes/com/steerinfo/dil/controller/RmsOilPriceController.class
  33. BIN
      target/classes/com/steerinfo/dil/controller/RmsPierController.class
  34. BIN
      target/classes/com/steerinfo/dil/controller/RmsPortController.class
  35. BIN
      target/classes/com/steerinfo/dil/controller/RmsPortStorageYard.class
  36. BIN
      target/classes/com/steerinfo/dil/controller/RmsTruckCalculateController.class
  37. BIN
      target/classes/com/steerinfo/dil/controller/RmsWarehouseController.class
  38. BIN
      target/classes/com/steerinfo/dil/feign/AmsFeign.class
  39. BIN
      target/classes/com/steerinfo/dil/feign/ColumnDataFeign.class
  40. BIN
      target/classes/com/steerinfo/dil/feign/ESFeign.class
  41. BIN
      target/classes/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.class
  42. BIN
      target/classes/com/steerinfo/dil/mapper/CommonSeq.class
  43. BIN
      target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.class
  44. 0 386
      target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.xml
  45. BIN
      target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.class
  46. 0 363
      target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml
  47. BIN
      target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class
  48. 0 805
      target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml
  49. BIN
      target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class
  50. 18 14
      target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml
  51. BIN
      target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class
  52. BIN
      target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class
  53. 0 683
      target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml
  54. BIN
      target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.class
  55. 0 443
      target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml
  56. BIN
      target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class
  57. 0 501
      target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml
  58. BIN
      target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.class
  59. 0 483
      target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.xml
  60. BIN
      target/classes/com/steerinfo/dil/mapper/RmsLineMapper.class
  61. 0 647
      target/classes/com/steerinfo/dil/mapper/RmsLineMapper.xml
  62. BIN
      target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.class
  63. 0 596
      target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.xml
  64. BIN
      target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.class
  65. 0 296
      target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.xml
  66. BIN
      target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class
  67. 0 700
      target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml
  68. BIN
      target/classes/com/steerinfo/dil/mapper/RmsMaterialSteelMapper.class
  69. BIN
      target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.class
  70. 0 379
      target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml
  71. BIN
      target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.class
  72. 0 398
      target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.xml
  73. BIN
      target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.class
  74. 0 630
      target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml
  75. BIN
      target/classes/com/steerinfo/dil/mapper/RmsPierMapper.class
  76. 0 358
      target/classes/com/steerinfo/dil/mapper/RmsPierMapper.xml
  77. BIN
      target/classes/com/steerinfo/dil/mapper/RmsPortMapper.class
  78. 0 358
      target/classes/com/steerinfo/dil/mapper/RmsPortMapper.xml
  79. BIN
      target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class
  80. 0 1103
      target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml
  81. BIN
      target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class
  82. 0 955
      target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml
  83. BIN
      target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.class
  84. 0 576
      target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.xml
  85. BIN
      target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.class
  86. 0 318
      target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.xml
  87. BIN
      target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.class
  88. 0 268
      target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.xml
  89. BIN
      target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.class
  90. 1 22
      target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml
  91. BIN
      target/classes/com/steerinfo/dil/model/DilNotice.class
  92. BIN
      target/classes/com/steerinfo/dil/model/RmsBidArea.class
  93. BIN
      target/classes/com/steerinfo/dil/model/RmsCapacity.class
  94. BIN
      target/classes/com/steerinfo/dil/model/RmsCarDriver.class
  95. BIN
      target/classes/com/steerinfo/dil/model/RmsConsignee.class
  96. BIN
      target/classes/com/steerinfo/dil/model/RmsDriverCapacity.class
  97. BIN
      target/classes/com/steerinfo/dil/model/RmsGatepost.class
  98. BIN
      target/classes/com/steerinfo/dil/model/RmsGatepostRules.class
  99. BIN
      target/classes/com/steerinfo/dil/model/RmsLine.class
  100. BIN
      target/classes/com/steerinfo/dil/model/RmsLineSegemnt.class

+ 8 - 0
.gitignore

@@ -0,0 +1,8 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test

+ 5 - 0
.idea/jarRepositories.xml

@@ -26,6 +26,11 @@
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />

+ 480 - 90
.idea/workspace.xml

@@ -20,20 +20,435 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <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/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/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/model/RmsCarDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCarDriver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.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/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/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/DilApplicationMain.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/config/CorsConfig1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/config/WebSocketConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/DilNoticeController.class" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsDriverCapacityController.class" beforeDir="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/RmsLineController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsLineSegemntController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsLinkController.class" beforeDir="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/RmsMaterialTypeController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsOilPriceController.class" beforeDir="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/RmsPierController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortStorageYard.class" beforeDir="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/controller/RmsTruckCalculateController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsWarehouseController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/AmsFeign.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ColumnDataFeign.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ESFeign.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/CommonSeq.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLineMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLineMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialSteelMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPierMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPierMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPortMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPortMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/DilNotice.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsBidArea.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCapacity.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCarDriver.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCarrier.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCarrier.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsConsignee.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsDriverCapacity.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsGatepost.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsGatepostRules.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsLine.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsLineSegemnt.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsLink.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterial.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterialSteel.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterialType.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsOilPrice.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsPersonnel.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsPier.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsPort.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsShipper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsSupplier.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsTruckCalculate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsTruckCalculateMaterial.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsUnitOfMeasure.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsWarehouse.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IDilNoticeService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsBidAreaService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCapacityService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarDriverService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsConsigneeService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsDriverCapacityService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsGatepostRulesService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsGatepostService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsLineSegemntService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsLineService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsLinkService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsMaterialService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsMaterialTypeService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsOilPriceService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsPersonnelService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsPierService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsPortService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsPortStorageYardService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsShipperService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsSupplierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsSupplierService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsTruckCalculateService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsWarehouseService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/DilNoticeServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsDriverCapacityServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostRulesServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsLineSegemntServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsLineServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsLinkServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialTypeServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsOilPriceServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPierServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPortServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPortStorageYardService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" beforeDir="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/classes/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/BaseRESTfulController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/ColumnDataUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/DataChange.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/DataConversionTool.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/PageListAdd.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/util/util.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/log4j.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/message.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/dil-api-1.0-SNAPSHOT.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/dil-api-1.0-SNAPSHOT.jar.original" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/controller/RmsBidAreaController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/model/RmsBidArea.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/service/IRmsBidAreaService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/service/impl/RmsBidAreaServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmscarrier/controller/RmsCarrierController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmscarrier/mapper/RmsCarrierMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmscarrier/model/RmsCarrier.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmscarrier/service/IRmsCarrierService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmscarrier/service/impl/RmsCarrierServiceImpl.class" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -52,7 +467,6 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="DatabaseDriversLRU" value="oracle" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
     <property name="RequestMappingsPanelWidth0" value="75" />
@@ -62,6 +476,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../DAL-DAZHOU-API" />
     <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" />
@@ -69,7 +484,7 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="settings.editor.selected.configurable" value="SQL Resolution Scopes" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -97,7 +512,7 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="63a9508b-a79b-4e42-90a6-b7f9eba63c9f" name="Default Changelist" comment="" />
+      <changelist id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="" />
       <created>1639799862423</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -106,15 +521,7 @@
       <workItem from="1639963691127" duration="15865000" />
       <workItem from="1639799866763" duration="19781000" />
       <workItem from="1639960339544" duration="3726000" />
-      <workItem from="1640117910355" duration="633000" />
-      <workItem from="1640142169953" duration="297000" />
-      <workItem from="1640142781611" duration="5098000" />
-      <workItem from="1640263987979" duration="19444000" />
       <workItem from="1640051164076" duration="1408000" />
-      <workItem from="1640172635152" duration="309000" />
-      <workItem from="1640222259574" duration="36095000" />
-      <workItem from="1640308588528" duration="620000" />
-      <workItem from="1640309362007" duration="9949000" />
     </task>
     <servers />
   </component>
@@ -134,117 +541,100 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="233" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1640311504613">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="233" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1640311504613" />
-    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1640328548794">
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1639985896075">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1640328548794" />
-    <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1640232070241" />
-    <state x="544" y="279" width="448" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1640315914802">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="544" y="279" width="448" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1536.824@0.0.1536.824" timestamp="1640315914802" />
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1639985896075" />
     <state width="444" height="466" key="DebuggerActiveHint" timestamp="1639818003519">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
-    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1640272173598">
+    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1639961493966">
       <screen x="0" y="0" width="1536" height="824" />
     </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="199" key="GridCell.Tab.0.bottom" timestamp="1640421453725">
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639961493966" />
+    <state width="1237" height="175" key="GridCell.Tab.0.bottom" timestamp="1640423163556">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.0.center" timestamp="1640421453725">
+    <state width="1237" height="175" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640423163556" />
+    <state width="1493" height="239" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640375191604" />
+    <state width="1237" height="175" key="GridCell.Tab.0.center" timestamp="1640423163556">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.0.left" timestamp="1640421453725">
+    <state width="1237" height="175" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640423163556" />
+    <state width="1493" height="239" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640375191604" />
+    <state width="1237" height="175" key="GridCell.Tab.0.left" timestamp="1640423163555">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438695" />
-    <state width="1237" height="199" key="GridCell.Tab.0.right" timestamp="1640421453725">
+    <state width="1237" height="175" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640423163555" />
+    <state width="1493" height="239" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640375191604" />
+    <state width="1237" height="175" key="GridCell.Tab.0.right" timestamp="1640423163556">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.1.bottom" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="175" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640423163556" />
+    <state width="1493" height="239" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640375191604" />
+    <state width="1487" height="209" key="GridCell.Tab.1.bottom" timestamp="1640016056717">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.1.center" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="305" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1487" height="209" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640016056717" />
+    <state width="1487" height="209" key="GridCell.Tab.1.center" timestamp="1640016056716">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.1.left" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="305" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1487" height="209" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640016056716" />
+    <state width="1487" height="209" key="GridCell.Tab.1.left" timestamp="1640016056716">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.1.right" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="305" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1487" height="209" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640016056716" />
+    <state width="1487" height="209" key="GridCell.Tab.1.right" timestamp="1640016056716">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1237" height="199" key="GridCell.Tab.2.bottom" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="305" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1487" height="209" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640016056716" />
+    <state width="1487" height="209" key="GridCell.Tab.2.bottom" timestamp="1640016056717">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="199" key="GridCell.Tab.2.center" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="242" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1487" height="209" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640016056717" />
+    <state width="1487" height="209" key="GridCell.Tab.2.center" timestamp="1640016056717">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="199" key="GridCell.Tab.2.left" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="242" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1487" height="209" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640016056717" />
+    <state width="1487" height="209" key="GridCell.Tab.2.left" timestamp="1640016056717">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <state width="1493" height="136" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1237" height="199" key="GridCell.Tab.2.right" timestamp="1640421453725">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1237" height="242" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1487" height="209" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640016056717" />
+    <state width="1487" height="209" key="GridCell.Tab.2.right" timestamp="1640016056717">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1237" height="199" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1640421453725" />
-    <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">
+    <state width="1237" height="242" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1487" height="209" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640016056717" />
+    <state x="225" y="0" key="SettingsEditor" timestamp="1639963719060">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1640336659804" />
+    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1639963719060" />
     <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639799919381" />
-    <state width="200" height="461" key="SqlResolveConfigurable" timestamp="1640336658685">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="200" height="461" key="SqlResolveConfigurable/0.0.1280.680@0.0.1280.680" timestamp="1640336658685" />
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1639818889347">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1639818889347" />
-    <state x="425" y="187" key="run.anything.popup" timestamp="1640242657012">
+    <state x="425" y="187" key="run.anything.popup" timestamp="1639814402364">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1640242657012" />
-    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup" timestamp="1640330298620">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1640330298620" />
+    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1639814402364" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java</url>
-          <line>214</line>
-          <option name="timeStamp" value="56" />
+          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java</url>
+          <line>112</line>
+          <option name="timeStamp" value="12" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

+ 0 - 233
dil-api.iml

@@ -258,238 +258,5 @@
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: com.steerinfo:framework:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.caches:mybatis-ehcache:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j:1.3.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:6.0_ALPHA" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-java8:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-client:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-core:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject:guice:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.24.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
   </component>
 </module>

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

@@ -174,12 +174,13 @@ public class RmsCarDriverController extends BaseRESTfulController {
   *
    */
     @PostMapping("/upload")
-    public String upLoadPhoto(@RequestParam("file") MultipartFile file)  {
-
-       IdGenerator idGenerator=new IdGenerator(1023,1023);
-       String upLoad="C:\\stworkspace\\image\\";
-       String imgPath=file.getOriginalFilename();
-        return UploadUtils.uploadFile(file,idGenerator,upLoad,imgPath);
+    public RESTfulResult upLoadPhoto(@RequestParam("file") MultipartFile file)  {
+        String str="行驶证";
+        int result=rmsCarDriverService.uploadPhoto(file,str);
+        if (result==-1){
+            return failed();
+        }
+        return success(result);
     }
 
 

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java

@@ -33,4 +33,6 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     List<Map<String, Object>> getCarrierName(String state);
 
     int selectByIdentityCard(String driverIdentityCardId);
+    //查询最大的司机id
+    BigDecimal getMaxDriveId();
 }

+ 6 - 6
src/main/java/com/steerinfo/dil/model/RmsCarDriver.java

@@ -199,13 +199,13 @@ public class RmsCarDriver implements IBasePO<BigDecimal> {
      * 驾驶证照片(DRIVER_LISENCE_PHOTO,BLOB,4000)
      */
     @ApiModelProperty(value="驾驶证照片",required=false)
-    private byte[] driverLisencePhoto;
+    private String driverLisencePhoto;
 
     /**
      * 行驶证照片(DRIVER_PERMIT_PHOTO,BLOB,4000)
      */
     @ApiModelProperty(value="行驶证照片",required=false)
-    private byte[] driverPermitPhoto;
+    private String driverPermitPhoto;
 
     private static final long serialVersionUID = 1L;
 
@@ -467,19 +467,19 @@ public class RmsCarDriver implements IBasePO<BigDecimal> {
         this.driverPhoto = driverPhoto;
     }
 
-    public byte[] getDriverLisencePhoto() {
+    public String getDriverLisencePhoto() {
         return driverLisencePhoto;
     }
 
-    public void setDriverLisencePhoto(byte[] driverLisencePhoto) {
+    public void setDriverLisencePhoto(String driverLisencePhoto) {
         this.driverLisencePhoto = driverLisencePhoto;
     }
 
-    public byte[] getDriverPermitPhoto() {
+    public String getDriverPermitPhoto() {
         return driverPermitPhoto;
     }
 
-    public void setDriverPermitPhoto(byte[] driverPermitPhoto) {
+    public void setDriverPermitPhoto(String driverPermitPhoto) {
         this.driverPermitPhoto = driverPermitPhoto;
     }
 

+ 3 - 0
src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.RmsCarDriver;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -29,4 +30,6 @@ public interface IRmsCarDriverService  {
     List<Map<String,Object>> getTransportTypeId();
 
     List<Map<String, Object>> getCarrierName(String state);
+
+    int uploadPhoto(MultipartFile file, String str);
 }

+ 47 - 0
src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java

@@ -5,8 +5,11 @@ import com.steerinfo.dil.model.RmsCarDriver;
 import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.service.IRmsCarDriverService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.utils.misc.IdGenerator;
+import com.steerinfo.framework.utils.upload.UploadUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -116,6 +119,50 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         state = "%"+state+"%";
         return rmsCarDriverMapper.getCarrierName(state);
     }
+    //
+    @Override
+    public int uploadPhoto(MultipartFile file, String str) {
+        int result = 0;
+//        根据str判断当前照片类型f
+        String name = file.getName();
+        Long workId = 0L;
+        Long datacenterId = 0L;
+        byte[] fileNames=null;
+//        id自动生成器
+        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
+//        图片存储的地址
+        String uploadPath = "C:/workspaces/stworkspace/image/";
+//        图片名称默认为空
+        String imagePath = str;
+//        创建一个map用来存储四张照片的地址
+        Map<String, Object> map=new HashMap<>();
+        String FileNames = UploadUtils.uploadFile(file, idGenerator, uploadPath, imagePath);
+        System.out.println(FileNames);
+        //         判断照片是否能上传成功
+        if (FileNames!=null){
+            fileNames = UploadUtils.imageToByte(FileNames);
+            map.put(str,fileNames);
+//             将照片的二进制插入到数据库
+            RmsCarDriver rmsCarDriver=new RmsCarDriver();
+            rmsCarDriver.setDriverId(rmsCarDriverMapper.getMaxDriveId());
+            if (map.get("行驶证")!=null){
+                rmsCarDriver.setDriverPermitPhoto((String) map.get("行驶证"));
+            }
+            if (map.get("驾驶证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((String)map.get("驾驶证"));
+            }
+            if (map.get("运输证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((String)map.get("运输证"));
+            }
+            if(map.get("从业资格证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((String)map.get("从业资格证"));
+            }
+            result+=rmsCarDriverMapper.insertSelective(rmsCarDriver);
+        }else{
+            result=-1;
+        }
+        return result;
+    }
 
 
 }

+ 18 - 14
src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -33,8 +33,8 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="DRIVER_PHOTO" jdbcType="BLOB" property="driverPhoto" />
-    <result column="DRIVER_LISENCE_PHOTO" jdbcType="BLOB" property="driverLisencePhoto" />
-    <result column="DRIVER_PERMIT_PHOTO" jdbcType="BLOB" property="driverPermitPhoto" />
+    <result column="DRIVER_LISENCE_PHOTO" jdbcType="VARCHAR" property="driverLisencePhoto" />
+    <result column="DRIVER_PERMIT_PHOTO" jdbcType="VARCHAR" property="driverPermitPhoto" />
   </resultMap>
   <sql id="columns">
     DRIVER_ID, DRIVER_NAME, DRIVER_SEX, DRIVER_AGE, DRIVER_PHONE, DRIVER_IDENTITY_CARD, 
@@ -395,8 +395,8 @@
       #{driverLicenseTipsDate,jdbcType=TIMESTAMP}, #{driverCarClassName,jdbcType=VARCHAR}, 
       #{memo,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
       #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{deleted,jdbcType=DECIMAL}, #{driverPhoto,jdbcType=BLOB}, #{driverLisencePhoto,jdbcType=BLOB}, 
-      #{driverPermitPhoto,jdbcType=BLOB})
+      #{deleted,jdbcType=DECIMAL}, #{driverPhoto,jdbcType=BLOB}, #{driverLisencePhoto,jdbcType=VARCHAR},
+      #{driverPermitPhoto,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarDriver">
     insert into RMS_CAR_DRIVER
@@ -596,10 +596,10 @@
         #{driverPhoto,jdbcType=BLOB},
       </if>
       <if test="driverLisencePhoto != null">
-        #{driverLisencePhoto,jdbcType=BLOB},
+        #{driverLisencePhoto,jdbcType=VARCHAR},
       </if>
       <if test="driverPermitPhoto != null">
-        #{driverPermitPhoto,jdbcType=BLOB},
+        #{driverPermitPhoto,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -635,8 +635,8 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       DELETED = #{deleted,jdbcType=DECIMAL},
       DRIVER_PHOTO = #{driverPhoto,jdbcType=BLOB},
-      DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=BLOB},
-      DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=BLOB}
+      DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=VARCHAR},
+      DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=VARCHAR}
     where DRIVER_ID = #{driverId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarDriver">
@@ -733,10 +733,10 @@
         DRIVER_PHOTO = #{driverPhoto,jdbcType=BLOB},
       </if>
       <if test="driverLisencePhoto != null">
-        DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=BLOB},
+        DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=VARCHAR},
       </if>
       <if test="driverPermitPhoto != null">
-        DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=BLOB},
+        DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=VARCHAR},
       </if>
     </set>
     where DRIVER_ID = #{driverId,jdbcType=DECIMAL}
@@ -785,8 +785,8 @@
       #{item.driverCarClassName,jdbcType=VARCHAR}, #{item.memo,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.driverPhoto,jdbcType=BLOB}, #{item.driverLisencePhoto,jdbcType=BLOB}, 
-      #{item.driverPermitPhoto,jdbcType=BLOB} from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.driverPhoto,jdbcType=BLOB}, #{item.driverLisencePhoto,jdbcType=VARCHAR},
+      #{item.driverPermitPhoto,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -918,11 +918,11 @@
        </foreach>
        ,DRIVER_LISENCE_PHOTO=
        <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_ID" separator=" ">
-          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverLisencePhoto,jdbcType=BLOB}
+          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverLisencePhoto,jdbcType=VARCHAR}
        </foreach>
        ,DRIVER_PERMIT_PHOTO=
        <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_ID" separator=" ">
-          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverPermitPhoto,jdbcType=BLOB}
+          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverPermitPhoto,jdbcType=VARCHAR}
        </foreach>
      where DRIVER_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -1093,5 +1093,9 @@
     where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
     and RCD.DELETED!=1
   </select>
+
+  <select id="getMaxDriveId" resultType="DECIMAL">
+    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+  </select>
 </mapper>
 

+ 1 - 22
src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -449,10 +449,7 @@
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
     RS.SHIPPER_NAME AS "shipperName",
-    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
-    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -484,24 +481,6 @@
           "shipperAbbreviation" in #{item}
         </foreach>
       </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
-        and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperFactoryArea!= null">
-        and
-        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
-          "shipperFactoryArea" in #{item}
-        </foreach>
-      </if>
     </where>
     <include refid="orderBy"></include>
   </select>

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

@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 /**
  * RmsCarrier RESTful接口:
  * @author generator
- * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * @version 1.0-SNAPSHORT 2021-12-25 05:09
  * 类描述
  * 修订历史:
  * 日期:2021-12-25

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

@@ -1,6 +1,2177 @@
 <?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" />
+    <result column="CARRIER_SSO_ID" jdbcType="VARCHAR" property="carrierSsoId" />
+  </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, 
+    CARRIER_SSO_ID
+  </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, t.CARRIER_SSO_ID
+  </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>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        and CARRIER_SSO_ID = #{carrierSsoId}
+      </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>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        and CARRIER_SSO_ID LIKE '%${carrierSsoId}%'
+      </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>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        or CARRIER_SSO_ID = #{carrierSsoId}
+      </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, 
+      CARRIER_SSO_ID)
+    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}, 
+      #{carrierSsoId,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>
+      <if test="carrierSsoId != null">
+        CARRIER_SSO_ID,
+      </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>
+      <if test="carrierSsoId != null">
+        #{carrierSsoId,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},
+      CARRIER_SSO_ID = #{carrierSsoId,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>
+      <if test="carrierSsoId != null">
+        CARRIER_SSO_ID = #{carrierSsoId,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, CARRIER_SSO_ID
+      )
+    ( <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}, #{item.carrierSsoId,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>
+       ,CARRIER_SSO_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierSsoId,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>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
   <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" />

+ 18 - 3
src/test/java/com/steerinfo/dil/rmscarrier/model/RmsCarrier.java

@@ -218,23 +218,29 @@ public class RmsCarrier implements IBasePO<Short> {
     private String easCarrierId;
 
     /**
-     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,50)
+     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,90)
      */
     @ApiModelProperty(value="营业执照",required=false)
     private String carrierBusinessAblelicense;
 
     /**
-     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,50)
+     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,90)
      */
     @ApiModelProperty(value="经营许可证(照片)",required=false)
     private String carrierBusinessLicense;
 
     /**
-     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,50)
+     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,90)
      */
     @ApiModelProperty(value="运输证(照片)",required=false)
     private String carrierTransportCertificate;
 
+    /**
+     * SSO主键(CARRIER_SSO_ID,VARCHAR,40)
+     */
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String carrierSsoId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -551,6 +557,14 @@ public class RmsCarrier implements IBasePO<Short> {
         this.carrierTransportCertificate = carrierTransportCertificate == null ? null : carrierTransportCertificate.trim();
     }
 
+    public String getCarrierSsoId() {
+        return carrierSsoId;
+    }
+
+    public void setCarrierSsoId(String carrierSsoId) {
+        this.carrierSsoId = carrierSsoId == null ? null : carrierSsoId.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -595,6 +609,7 @@ public class RmsCarrier implements IBasePO<Short> {
         sb.append(", carrierBusinessAblelicense=").append(carrierBusinessAblelicense);
         sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
         sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
+        sb.append(", carrierSsoId=").append(carrierSsoId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 /**
  * RmsCarrier服务接口:
  * @author generator
- * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * @version 1.0-SNAPSHORT 2021-12-25 05:09
  * 类描述
  * 修订历史:
  * 日期:2021-12-25

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

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 /**
  * RmsCarrier服务实现:
  * @author generator
- * @version 1.0-SNAPSHORT 2021-12-25 01:31
+ * @version 1.0-SNAPSHORT 2021-12-25 05:09
  * 类描述
  * 修订历史:
  * 日期:2021-12-25

+ 0 - 8
target/classes/application-dev.yml

@@ -1,8 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
-    driver-class-name: oracle.jdbc.OracleDriver
-  application:
-    name: dal-dazhou-rms-api

+ 0 - 8
target/classes/application-prod.yml

@@ -1,8 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
-    driver-class-name: oracle.jdbc.OracleDriver
-  application:
-    name: dal-dazhou-rms-api

+ 0 - 0
target/classes/application.yml


+ 0 - 64
target/classes/bootstrap.yml

@@ -1,64 +0,0 @@
-api.version: api/v1/rms
-spring:
-  profiles:
-    include: ${SPRING_PROFILES:dev}
-  jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
-#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
-  messages:
-    basename: message
-    encoding: UTF-8
-  mvc:
-    static-path-pattern:
-
-#eureka设置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
-    registerWithEureka:
-      false
-    fetchRegistry:
-      false
-  instance:
-    prefer-ip-address: true
-    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
-genxml:
-  pth: com/a
-cache:
-  level: 2
-redis:
-  host: 10.10.50.28
-  port: 6379
-  pwd: 123456
-  project:
-    prefix: sysmanage
-  pool:
-    maxTotal: 8
-    maxWaitMillis: 1000
-    maxIdle: 8
-  cache:
-    time: 864000000
-  database: 0
-
-openFeign:
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-
-mybatis:
-  type-aliases-package: com.steerinfo.dil.model
-  mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
-  configuration:
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    mapUnderscoreToCamelCase: true
-    call-setters-on-nulls: true
-
-server:
-  port: 8070

BIN
target/classes/com/steerinfo/DilApplicationMain.class


BIN
target/classes/com/steerinfo/dil/config/CorsConfig1.class


BIN
target/classes/com/steerinfo/dil/config/WebSocketConfig.class


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


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


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


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


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


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


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


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


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


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


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


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


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


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


BIN
target/classes/com/steerinfo/dil/feign/AmsFeign.class


BIN
target/classes/com/steerinfo/dil/feign/ColumnDataFeign.class


BIN
target/classes/com/steerinfo/dil/feign/ESFeign.class


BIN
target/classes/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.class


BIN
target/classes/com/steerinfo/dil/mapper/CommonSeq.class


BIN
target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.class


+ 0 - 386
target/classes/com/steerinfo/dil/mapper/DilNoticeMapper.xml

@@ -1,386 +0,0 @@
-<?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.mapper.DilNoticeMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilNotice">
-    <id column="NOTICE_ID" jdbcType="DECIMAL" property="noticeId" />
-    <result column="NOTICE_TITLE" jdbcType="VARCHAR" property="noticeTitle" />
-    <result column="NOTICE_CONTENT" jdbcType="VARCHAR" property="noticeContent" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    NOTICE_ID, NOTICE_TITLE, NOTICE_CONTENT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.NOTICE_ID, t.NOTICE_TITLE, t.NOTICE_CONTENT, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_NOTICE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_NOTICE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="noticeId != null">
-        and NOTICE_ID = #{noticeId}
-      </if>
-      <if test="noticeTitle != null and noticeTitle != ''">
-        and NOTICE_TITLE = #{noticeTitle}
-      </if>
-      <if test="noticeContent != null and noticeContent != ''">
-        and NOTICE_CONTENT = #{noticeContent}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="noticeId != null">
-        and NOTICE_ID = #{noticeId}
-      </if>
-      <if test="noticeTitle != null and noticeTitle != ''">
-        and NOTICE_TITLE LIKE '%${noticeTitle}%'
-      </if>
-      <if test="noticeContent != null and noticeContent != ''">
-        and NOTICE_CONTENT LIKE '%${noticeContent}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_NOTICE
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_NOTICE
-    where 1!=1 
-      <if test="noticeTitle != null and noticeTitle != ''">
-        or NOTICE_TITLE = #{noticeTitle}
-      </if>
-      <if test="noticeContent != null and noticeContent != ''">
-        or NOTICE_CONTENT = #{noticeContent}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilNotice">
-    insert into DIL_NOTICE (NOTICE_ID, NOTICE_TITLE, NOTICE_CONTENT, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-      )
-    values (#{noticeId,jdbcType=DECIMAL}, #{noticeTitle,jdbcType=VARCHAR}, #{noticeContent,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilNotice">
-    insert into DIL_NOTICE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="noticeId != null">
-        NOTICE_ID,
-      </if>
-      <if test="noticeTitle != null">
-        NOTICE_TITLE,
-      </if>
-      <if test="noticeContent != null">
-        NOTICE_CONTENT,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="noticeId != null">
-        #{noticeId,jdbcType=DECIMAL},
-      </if>
-      <if test="noticeTitle != null">
-        #{noticeTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeContent != null">
-        #{noticeContent,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilNotice">
-    update DIL_NOTICE
-    set NOTICE_TITLE = #{noticeTitle,jdbcType=VARCHAR},
-      NOTICE_CONTENT = #{noticeContent,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}
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilNotice">
-    update DIL_NOTICE
-    <set>
-      <if test="noticeTitle != null">
-        NOTICE_TITLE = #{noticeTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeContent != null">
-        NOTICE_CONTENT = #{noticeContent,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>
-    </set>
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where NOTICE_ID = #{noticeId,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 DIL_NOTICE 
-      (NOTICE_ID, 
-      NOTICE_TITLE, NOTICE_CONTENT, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.noticeId,jdbcType=DECIMAL}, 
-      #{item.noticeTitle,jdbcType=VARCHAR}, #{item.noticeContent,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} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_NOTICE
-     set
-       NOTICE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeId,jdbcType=DECIMAL}
-       </foreach>
-       ,NOTICE_TITLE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeTitle,jdbcType=VARCHAR}
-       </foreach>
-       ,NOTICE_CONTENT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeContent,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where NOTICE_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.noticeId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_NOTICE
-    where NOTICE_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-
-
-  <!-- 信息列表 -->
-  <select id="getNoticeList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM
-    (
-
-    SELECT
-    DN.NOTICE_ID AS "noticeId",
-    DN.NOTICE_TITLE AS "noticeTitle",
-    DN.NOTICE_CONTENT AS "noticeContent",
-    DN.INSERT_TIME AS "insertTime",
-    DN.INSERT_USERNAME AS "insertUsername"
-    FROM DIL_NOTICE DN
-    WHERE DN.DELETED !=1
-    ORDER BY DN.INSERT_TIME DESC
-    )
-    <where>
-      <if test="noticeId!= null">
-        and
-        <foreach collection="noticeId" item="item" open="(" separator="," close=")">
-          "noticeId" in #{item}
-        </foreach>
-      </if>
-      <if test="noticeTitle!= null">
-        and
-        <foreach collection="noticeTitle" item="item" open="(" separator="," close=")">
-          "noticeTitle" in #{item}
-        </foreach>
-      </if>
-      <if test="noticeContent!= null">
-        and
-        <foreach collection="noticeContent" item="item" open="(" separator="," close=")">
-          "noticeContent" in #{item}
-        </foreach>
-      </if>
-      <if test="insertTime!= null">
-        and
-        <foreach collection="insertTime" item="item" open="(" separator="," close=")">
-          "insertTime" in #{item}
-        </foreach>
-      </if>
-
-      <if test="insertUsername!= null">
-        and
-        <foreach collection="insertUsername" item="item" open="(" separator="," close=")">
-          "insertUsername" in #{item}
-        </foreach>
-      </if>
-
-    </where>
-
-  </select>
-
-
-  <!--根据Id查询公告-->
-  <select id="getNoticeById" resultType="java.util.LinkedHashMap" >
-    SELECT
-      DN.NOTICE_ID AS "noticeId",
-      DN.NOTICE_TITLE AS "noticeTitle",
-      DN.NOTICE_CONTENT AS "noticeContent",
-      DN.INSERT_TIME AS "insertTime",
-      DN.INSERT_USERNAME AS "insertUsername"
-
-    FROM DIL_NOTICE DN
-    WHERE DN.NOTICE_ID=#{id}
-
-  </select>
-  
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.class


+ 0 - 363
target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml

@@ -1,363 +0,0 @@
-<?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.mapper.RmsBidAreaMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsBidArea">
-    <id column="BID_AREA_ID" jdbcType="DECIMAL" property="bidAreaId" />
-    <result column="BID_AREA_PROVINCE" jdbcType="VARCHAR" property="bidAreaProvince" />
-    <result column="BID_AREA_CITY" jdbcType="VARCHAR" property="bidAreaCity" />
-    <result column="BID_AREA_COUNTY" jdbcType="VARCHAR" property="bidAreaCounty" />
-    <result column="BID_AREA_COUNTRY" jdbcType="VARCHAR" property="bidAreaCountry" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, BID_AREA_COUNTY, BID_AREA_COUNTRY, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.BID_AREA_ID, t.BID_AREA_PROVINCE, t.BID_AREA_CITY, t.BID_AREA_COUNTY, t.BID_AREA_COUNTRY, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_BID_AREA
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_BID_AREA t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="bidAreaId != null">
-        and BID_AREA_ID = #{bidAreaId}
-      </if>
-      <if test="bidAreaProvince != null and bidAreaProvince != ''">
-        and BID_AREA_PROVINCE = #{bidAreaProvince}
-      </if>
-      <if test="bidAreaCity != null and bidAreaCity != ''">
-        and BID_AREA_CITY = #{bidAreaCity}
-      </if>
-      <if test="bidAreaCounty != null and bidAreaCounty != ''">
-        and BID_AREA_COUNTY = #{bidAreaCounty}
-      </if>
-      <if test="bidAreaCountry != null and bidAreaCountry != ''">
-        and BID_AREA_COUNTRY = #{bidAreaCountry}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="bidAreaId != null">
-        and BID_AREA_ID = #{bidAreaId}
-      </if>
-      <if test="bidAreaProvince != null and bidAreaProvince != ''">
-        and BID_AREA_PROVINCE LIKE '%${bidAreaProvince}%'
-      </if>
-      <if test="bidAreaCity != null and bidAreaCity != ''">
-        and BID_AREA_CITY LIKE '%${bidAreaCity}%'
-      </if>
-      <if test="bidAreaCounty != null and bidAreaCounty != ''">
-        and BID_AREA_COUNTY LIKE '%${bidAreaCounty}%'
-      </if>
-      <if test="bidAreaCountry != null and bidAreaCountry != ''">
-        and BID_AREA_COUNTRY LIKE '%${bidAreaCountry}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-    delete from RMS_BID_AREA
-    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_BID_AREA
-    where 1!=1 
-      <if test="bidAreaProvince != null and bidAreaProvince != ''">
-        or BID_AREA_PROVINCE = #{bidAreaProvince}
-      </if>
-      <if test="bidAreaCity != null and bidAreaCity != ''">
-        or BID_AREA_CITY = #{bidAreaCity}
-      </if>
-      <if test="bidAreaCounty != null and bidAreaCounty != ''">
-        or BID_AREA_COUNTY = #{bidAreaCounty}
-      </if>
-      <if test="bidAreaCountry != null and bidAreaCountry != ''">
-        or BID_AREA_COUNTRY = #{bidAreaCountry}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsBidArea">
-    insert into RMS_BID_AREA (BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, 
-      BID_AREA_COUNTY, BID_AREA_COUNTRY, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    values (#{bidAreaId,jdbcType=DECIMAL}, #{bidAreaProvince,jdbcType=VARCHAR}, #{bidAreaCity,jdbcType=VARCHAR}, 
-      #{bidAreaCounty,jdbcType=VARCHAR}, #{bidAreaCountry,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
-    insert into RMS_BID_AREA
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="bidAreaId != null">
-        BID_AREA_ID,
-      </if>
-      <if test="bidAreaProvince != null">
-        BID_AREA_PROVINCE,
-      </if>
-      <if test="bidAreaCity != null">
-        BID_AREA_CITY,
-      </if>
-      <if test="bidAreaCounty != null">
-        BID_AREA_COUNTY,
-      </if>
-      <if test="bidAreaCountry != null">
-        BID_AREA_COUNTRY,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="bidAreaId != null">
-        #{bidAreaId,jdbcType=DECIMAL},
-      </if>
-      <if test="bidAreaProvince != null">
-        #{bidAreaProvince,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCity != null">
-        #{bidAreaCity,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCounty != null">
-        #{bidAreaCounty,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCountry != null">
-        #{bidAreaCountry,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsBidArea">
-    update RMS_BID_AREA
-    set BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
-      BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
-      BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
-      BID_AREA_COUNTRY = #{bidAreaCountry,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}
-    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
-    update RMS_BID_AREA
-    <set>
-      <if test="bidAreaProvince != null">
-        BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCity != null">
-        BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCounty != null">
-        BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
-      </if>
-      <if test="bidAreaCountry != null">
-        BID_AREA_COUNTRY = #{bidAreaCountry,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>
-    </set>
-    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-    <include refid="select" />
-    where BID_AREA_ID = #{bidAreaId,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_BID_AREA 
-      (BID_AREA_ID, 
-      BID_AREA_PROVINCE, BID_AREA_CITY, 
-      BID_AREA_COUNTY, BID_AREA_COUNTRY, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.bidAreaId,jdbcType=DECIMAL}, 
-      #{item.bidAreaProvince,jdbcType=VARCHAR}, #{item.bidAreaCity,jdbcType=VARCHAR}, 
-      #{item.bidAreaCounty,jdbcType=VARCHAR}, #{item.bidAreaCountry,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_BID_AREA
-     set
-       BID_AREA_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaId,jdbcType=DECIMAL}
-       </foreach>
-       ,BID_AREA_PROVINCE=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaProvince,jdbcType=VARCHAR}
-       </foreach>
-       ,BID_AREA_CITY=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCity,jdbcType=VARCHAR}
-       </foreach>
-       ,BID_AREA_COUNTY=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCounty,jdbcType=VARCHAR}
-       </foreach>
-       ,BID_AREA_COUNTRY=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCountry,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
-          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where BID_AREA_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.bidAreaId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_BID_AREA
-    where BID_AREA_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-<!--  展示中标区域信息-->
-  <select id="getCarrierBidAreaList" resultType="java.util.Map">
-    SELECT
-    RBA.BID_AREA_ID AS "bidAreaId",
-    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
-    RBA.BID_AREA_CITY AS "bidAreaCity",
-    RBA.BID_AREA_COUNTY AS "bidAreaCount",
-    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
-    FROM RMS_BID_AREA RBA
-  </select>
-<!--  根据id查询中标区域信息-->
-  <select id="getBidAreaById" resultType="java.util.Map">
-    SELECT
-    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
-    RBA.BID_AREA_CITY AS "bidAreaCity",
-    RBA.BID_AREA_COUNTY AS "bidAreaCount",
-    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
-    FROM RMS_BID_AREA RBA
-    WHERE RBA.BID_AREA_ID=#{id}
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class


+ 0 - 805
target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -1,805 +0,0 @@
-<?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.mapper.RmsCapacityMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsCapacity">
-    <id column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
-    <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
-    <result column="CAPACITY_MAX_LOAD" jdbcType="DECIMAL" property="capacityMaxLoad" />
-    <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
-    <result column="CAPACITY_STATUS" jdbcType="DECIMAL" property="capacityStatus" />
-    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-    <result column="CAPACITY_ENERGY_ID" jdbcType="VARCHAR" property="capacityEnergyId" />
-    <result column="CAPACITY_LEN_VAL" jdbcType="DECIMAL" property="capacityLenVal" />
-    <result column="CAPACITY_WID_VAL" jdbcType="DECIMAL" property="capacityWidVal" />
-    <result column="CAPACITY_HIG_VAL" jdbcType="DECIMAL" property="capacityHigVal" />
-    <result column="CAPACITY_OIL_ID" jdbcType="DECIMAL" property="capacityOilId" />
-    <result column="CAPACITY_FUEL_CONSUMPTION" jdbcType="VARCHAR" property="capacityFuelConsumption" />
-    <result column="CAPACITY_OWNERIS" jdbcType="VARCHAR" property="capacityOwneris" />
-    <result column="CAPACITY_BLACKLIST" jdbcType="VARCHAR" property="capacityBlacklist" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <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="CAPACITY_CORLOR" jdbcType="VARCHAR" property="capacityCorlor" />
-    <result column="CAPACITY_VIP" jdbcType="VARCHAR" property="capacityVip" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-  </resultMap>
-  <sql id="columns">
-    CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, CAPACITY_TYPE_ID, CAPACITY_STATUS, 
-    CARRIER_ID, CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, CAPACITY_HIG_VAL, 
-    CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, CAPACITY_BLACKLIST, 
-    MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    CAPACITY_CORLOR, CAPACITY_VIP, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.CAPACITY_ID, t.CAPACITY_NUMBER, t.CAPACITY_MAX_LOAD, t.CAPACITY_TYPE_ID, t.CAPACITY_STATUS, 
-    t.CARRIER_ID, t.CAPACITY_ENERGY_ID, t.CAPACITY_LEN_VAL, t.CAPACITY_WID_VAL, t.CAPACITY_HIG_VAL, 
-    t.CAPACITY_OIL_ID, t.CAPACITY_FUEL_CONSUMPTION, t.CAPACITY_OWNERIS, t.CAPACITY_BLACKLIST, 
-    t.MEMO, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_CAPACITY
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_CAPACITY t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="capacityNumber != null and capacityNumber != ''">
-        and CAPACITY_NUMBER = #{capacityNumber}
-      </if>
-      <if test="capacityMaxLoad != null">
-        and CAPACITY_MAX_LOAD = #{capacityMaxLoad}
-      </if>
-      <if test="capacityTypeId != null">
-        and CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
-        and CAPACITY_STATUS = #{capacityStatus}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="capacityEnergyId != null and capacityEnergyId != ''">
-        and CAPACITY_ENERGY_ID = #{capacityEnergyId}
-      </if>
-      <if test="capacityLenVal != null">
-        and CAPACITY_LEN_VAL = #{capacityLenVal}
-      </if>
-      <if test="capacityWidVal != null">
-        and CAPACITY_WID_VAL = #{capacityWidVal}
-      </if>
-      <if test="capacityHigVal != null">
-        and CAPACITY_HIG_VAL = #{capacityHigVal}
-      </if>
-      <if test="capacityOilId != null">
-        and CAPACITY_OIL_ID = #{capacityOilId}
-      </if>
-      <if test="capacityFuelConsumption != null and capacityFuelConsumption != ''">
-        and CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption}
-      </if>
-      <if test="capacityOwneris != null and capacityOwneris != ''">
-        and CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null and capacityBlacklist != ''">
-        and CAPACITY_BLACKLIST = #{capacityBlacklist}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </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="capacityCorlor != null and capacityCorlor != ''">
-        and CAPACITY_CORLOR = #{capacityCorlor}
-      </if>
-      <if test="capacityVip != null and capacityVip != ''">
-        and CAPACITY_VIP = #{capacityVip}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="capacityNumber != null and capacityNumber != ''">
-        and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
-      </if>
-      <if test="capacityMaxLoad != null">
-        and CAPACITY_MAX_LOAD = #{capacityMaxLoad}
-      </if>
-      <if test="capacityTypeId != null">
-        and CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
-        and CAPACITY_STATUS LIKE '%${capacityStatus}%'
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="capacityEnergyId != null and capacityEnergyId != ''">
-        and CAPACITY_ENERGY_ID LIKE '%${capacityEnergyId}%'
-      </if>
-      <if test="capacityLenVal != null">
-        and CAPACITY_LEN_VAL = #{capacityLenVal}
-      </if>
-      <if test="capacityWidVal != null">
-        and CAPACITY_WID_VAL = #{capacityWidVal}
-      </if>
-      <if test="capacityHigVal != null">
-        and CAPACITY_HIG_VAL = #{capacityHigVal}
-      </if>
-      <if test="capacityOilId != null">
-        and CAPACITY_OIL_ID = #{capacityOilId}
-      </if>
-      <if test="capacityFuelConsumption != null and capacityFuelConsumption != ''">
-        and CAPACITY_FUEL_CONSUMPTION LIKE '%${capacityFuelConsumption}%'
-      </if>
-      <if test="capacityOwneris != null and capacityOwneris != ''">
-        and CAPACITY_OWNERIS LIKE '%${capacityOwneris}%'
-      </if>
-      <if test="capacityBlacklist != null and capacityBlacklist != ''">
-        and CAPACITY_BLACKLIST LIKE '%${capacityBlacklist}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </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="capacityCorlor != null and capacityCorlor != ''">
-        and CAPACITY_CORLOR LIKE '%${capacityCorlor}%'
-      </if>
-      <if test="capacityVip != null and capacityVip != ''">
-        and CAPACITY_VIP LIKE '%${capacityVip}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_CAPACITY
-    where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_CAPACITY
-    where 1!=1 
-      <if test="capacityNumber != null and capacityNumber != ''">
-        or CAPACITY_NUMBER = #{capacityNumber}
-      </if>
-      <if test="capacityMaxLoad != null">
-        or CAPACITY_MAX_LOAD = #{capacityMaxLoad}
-      </if>
-      <if test="capacityTypeId != null">
-        or CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
-        or CAPACITY_STATUS = #{capacityStatus}
-      </if>
-      <if test="carrierId != null">
-        or CARRIER_ID = #{carrierId}
-      </if>
-      <if test="capacityEnergyId != null and capacityEnergyId != ''">
-        or CAPACITY_ENERGY_ID = #{capacityEnergyId}
-      </if>
-      <if test="capacityLenVal != null">
-        or CAPACITY_LEN_VAL = #{capacityLenVal}
-      </if>
-      <if test="capacityWidVal != null">
-        or CAPACITY_WID_VAL = #{capacityWidVal}
-      </if>
-      <if test="capacityHigVal != null">
-        or CAPACITY_HIG_VAL = #{capacityHigVal}
-      </if>
-      <if test="capacityOilId != null">
-        or CAPACITY_OIL_ID = #{capacityOilId}
-      </if>
-      <if test="capacityFuelConsumption != null and capacityFuelConsumption != ''">
-        or CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption}
-      </if>
-      <if test="capacityOwneris != null and capacityOwneris != ''">
-        or CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null and capacityBlacklist != ''">
-        or CAPACITY_BLACKLIST = #{capacityBlacklist}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </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="capacityCorlor != null and capacityCorlor != ''">
-        or CAPACITY_CORLOR = #{capacityCorlor}
-      </if>
-      <if test="capacityVip != null and capacityVip != ''">
-        or CAPACITY_VIP = #{capacityVip}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacity">
-    insert into RMS_CAPACITY (CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, 
-      CAPACITY_TYPE_ID, CAPACITY_STATUS, CARRIER_ID, 
-      CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, 
-      CAPACITY_HIG_VAL, CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, 
-      CAPACITY_OWNERIS, CAPACITY_BLACKLIST, MEMO, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR, 
-      CAPACITY_VIP, DELETED)
-    values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-      #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL}, 
-      #{capacityHigVal,jdbcType=DECIMAL}, #{capacityOilId,jdbcType=DECIMAL}, #{capacityFuelConsumption,jdbcType=VARCHAR}, 
-      #{capacityOwneris,jdbcType=VARCHAR}, #{capacityBlacklist,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{capacityCorlor,jdbcType=VARCHAR}, 
-      #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
-    insert into RMS_CAPACITY
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="capacityId != null">
-        CAPACITY_ID,
-      </if>
-      <if test="capacityNumber != null">
-        CAPACITY_NUMBER,
-      </if>
-      <if test="capacityMaxLoad != null">
-        CAPACITY_MAX_LOAD,
-      </if>
-      <if test="capacityTypeId != null">
-        CAPACITY_TYPE_ID,
-      </if>
-      <if test="capacityStatus != null">
-        CAPACITY_STATUS,
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID,
-      </if>
-      <if test="capacityEnergyId != null">
-        CAPACITY_ENERGY_ID,
-      </if>
-      <if test="capacityLenVal != null">
-        CAPACITY_LEN_VAL,
-      </if>
-      <if test="capacityWidVal != null">
-        CAPACITY_WID_VAL,
-      </if>
-      <if test="capacityHigVal != null">
-        CAPACITY_HIG_VAL,
-      </if>
-      <if test="capacityOilId != null">
-        CAPACITY_OIL_ID,
-      </if>
-      <if test="capacityFuelConsumption != null">
-        CAPACITY_FUEL_CONSUMPTION,
-      </if>
-      <if test="capacityOwneris != null">
-        CAPACITY_OWNERIS,
-      </if>
-      <if test="capacityBlacklist != null">
-        CAPACITY_BLACKLIST,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </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="capacityCorlor != null">
-        CAPACITY_CORLOR,
-      </if>
-      <if test="capacityVip != null">
-        CAPACITY_VIP,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="capacityId != null">
-        #{capacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityNumber != null">
-        #{capacityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityMaxLoad != null">
-        #{capacityMaxLoad,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityTypeId != null">
-        #{capacityTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityStatus != null">
-        #{capacityStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityEnergyId != null">
-        #{capacityEnergyId,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityLenVal != null">
-        #{capacityLenVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityWidVal != null">
-        #{capacityWidVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityHigVal != null">
-        #{capacityHigVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityOilId != null">
-        #{capacityOilId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityFuelConsumption != null">
-        #{capacityFuelConsumption,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityOwneris != null">
-        #{capacityOwneris,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityBlacklist != null">
-        #{capacityBlacklist,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,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="capacityCorlor != null">
-        #{capacityCorlor,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityVip != null">
-        #{capacityVip,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacity">
-    update RMS_CAPACITY
-    set CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
-      CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
-      CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
-      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
-      CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
-      CAPACITY_WID_VAL = #{capacityWidVal,jdbcType=DECIMAL},
-      CAPACITY_HIG_VAL = #{capacityHigVal,jdbcType=DECIMAL},
-      CAPACITY_OIL_ID = #{capacityOilId,jdbcType=DECIMAL},
-      CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption,jdbcType=VARCHAR},
-      CAPACITY_OWNERIS = #{capacityOwneris,jdbcType=VARCHAR},
-      CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=VARCHAR},
-      MEMO = #{memo,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},
-      CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
-      CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
-    update RMS_CAPACITY
-    <set>
-      <if test="capacityNumber != null">
-        CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityMaxLoad != null">
-        CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityTypeId != null">
-        CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityStatus != null">
-        CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityEnergyId != null">
-        CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityLenVal != null">
-        CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityWidVal != null">
-        CAPACITY_WID_VAL = #{capacityWidVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityHigVal != null">
-        CAPACITY_HIG_VAL = #{capacityHigVal,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityOilId != null">
-        CAPACITY_OIL_ID = #{capacityOilId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityFuelConsumption != null">
-        CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityOwneris != null">
-        CAPACITY_OWNERIS = #{capacityOwneris,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityBlacklist != null">
-        CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,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="capacityCorlor != null">
-        CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityVip != null">
-        CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where CAPACITY_ID = #{capacityId,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_CAPACITY 
-      (CAPACITY_ID, 
-      CAPACITY_NUMBER, CAPACITY_MAX_LOAD, 
-      CAPACITY_TYPE_ID, CAPACITY_STATUS, 
-      CARRIER_ID, CAPACITY_ENERGY_ID, 
-      CAPACITY_LEN_VAL, CAPACITY_WID_VAL, 
-      CAPACITY_HIG_VAL, CAPACITY_OIL_ID, 
-      CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, 
-      CAPACITY_BLACKLIST, MEMO, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      CAPACITY_CORLOR, CAPACITY_VIP, 
-      DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.capacityId,jdbcType=DECIMAL}, 
-      #{item.capacityNumber,jdbcType=VARCHAR}, #{item.capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL},
-      #{item.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
-      #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
-      #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
-      #{item.capacityFuelConsumption,jdbcType=VARCHAR}, #{item.capacityOwneris,jdbcType=VARCHAR}, 
-      #{item.capacityBlacklist,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.capacityCorlor,jdbcType=VARCHAR}, #{item.capacityVip,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_CAPACITY
-     set
-       CAPACITY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_MAX_LOAD=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityMaxLoad,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,CARRIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_ENERGY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityEnergyId,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_LEN_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityLenVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_WID_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityWidVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_HIG_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityHigVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_OIL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOilId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_FUEL_CONSUMPTION=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityFuelConsumption,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_OWNERIS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOwneris,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_BLACKLIST=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityBlacklist,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_CORLOR=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityCorlor,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_VIP=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityVip,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where CAPACITY_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.capacityId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_CAPACITY
-    where CAPACITY_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getCapacityList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM
-    (
-    SELECT
-    RC.CAPACITY_ID AS "capacityId",
-    RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-    RC.CAPACITY_NUMBER AS "capacityNumber",
-    RC.CAPACITY_CORLOR AS "capacityCorlor",
-    RC.CAPACITY_OWNERIS AS "capacityOwneris",
-    RC.CAPACITY_VIP AS "capacityVip",
-    RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
-    RCA.CARRIER_NAME AS "carrierName"
-    FROM RMS_CAPACITY RC
-    LEFT JOIN
-    RMS_CAPACITY_TYPE RCT
-    ON RC.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
-    LEFT JOIN
-    RMS_CARRIER RCA
-    ON RCA.CARRIER_ID=RC.CARRIER_ID
-    WHERE RC.DELETED!=1
-    ORDER BY RC.INSERT_TIME DESC
-    )
-    <where>
-      <if test="capacityId!= null">
-        and
-        <foreach collection="capacityId" item="item" open="(" separator="," close=")">
-          "capacityId" in #{item}
-        </foreach>
-      </if>
-      <if test="capacityTypeName!= null">
-        and
-        <foreach collection="capacityTypeName" item="item" open="(" separator="," close=")">
-          "capacityTypeName" in #{item}
-        </foreach>
-      </if>
-      <if test="capacityNumber!= null">
-        and
-        <foreach collection="capacityNumber" item="item" open="(" separator="," close=")">
-          "capacityNumber" in #{item}
-        </foreach>
-      </if>
-      <if test="capacityCorlor!= null">
-        and
-        <foreach collection="capacityCorlor" item="item" open="(" separator="," close=")">
-          "capacityCorlor" in #{item}
-        </foreach>
-      </if>
-
-      <if test="capacityOwneris!= null">
-        and
-        <foreach collection="capacityOwneris" item="item" open="(" separator="," close=")">
-          "capacityOwneris" in #{item}
-        </foreach>
-      </if>
-
-      <if test="capacityVip!= null">
-        and
-        <foreach collection="capacityVip" item="item" open="(" separator="," close=")">
-          "capacityVip" in #{item}
-        </foreach>
-      </if>
-
-      <if test="capacityBlacklist!= null">
-        and
-        <foreach collection="capacityBlacklist" item="item" open="(" separator="," close=")">
-          "capacityBlacklist" in #{item}
-        </foreach>
-      </if>
-
-      <if test="carrierName!= null">
-        and
-        <foreach collection="carrierName" item="item" open="(" separator="," close=")">
-          "carrierName" in #{item}
-        </foreach>
-      </if>
-    </where>
-   <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  
-
-  <select id="getCapacityById" resultType="java.util.LinkedHashMap" >
-         SELECT
-            RC.CAPACITY_ID AS "capacityId",
-            RC.CAPACITY_TYPE_ID AS "capacityTypeId",
-            RC.CAPACITY_NUMBER AS "capacityNumber",
-            RC.CAPACITY_CORLOR AS "capacityCorlor",
-            RC.CAPACITY_OWNERIS AS "capacityOwneris",
-            RC.CAPACITY_VIP AS "capacityVip",
-            RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
-            RC.CARRIER_ID AS "carrierId"
-            FROM RMS_CAPACITY RC
-            WHERE RC.CAPACITY_ID=#{id}
-
-  </select>
-
-  <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
-    SELECT
-        RCT.CAPACITY_TYPE_ID AS "id",
-        RCT.CAPACITY_TYPE_ID AS "value",
-        RCT.CAPACITY_TYPE_NAME AS "label"
-        FROM RMS_CAPACITY_TYPE RCT
-  </select>
-
-  <select id="getCarrierId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RC.CARRIER_ID AS "id",
-    RC.CARRIER_ID AS "value",
-    RC.CARRIER_NAME AS "label"
-    FROM RMS_CARRIER RC
-    WHERE RC.DELETED!=1
-  </select>
-
-  <select id="selectBycapacityNumber" parameterType="java.lang.String" resultType="int">
-    select count(*) from RMS_CAPACITY RC where RC.CAPACITY_NUMBER=#{number}
-    and RC.DELETED=0
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class


+ 18 - 14
target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -33,8 +33,8 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="DRIVER_PHOTO" jdbcType="BLOB" property="driverPhoto" />
-    <result column="DRIVER_LISENCE_PHOTO" jdbcType="BLOB" property="driverLisencePhoto" />
-    <result column="DRIVER_PERMIT_PHOTO" jdbcType="BLOB" property="driverPermitPhoto" />
+    <result column="DRIVER_LISENCE_PHOTO" jdbcType="VARCHAR" property="driverLisencePhoto" />
+    <result column="DRIVER_PERMIT_PHOTO" jdbcType="VARCHAR" property="driverPermitPhoto" />
   </resultMap>
   <sql id="columns">
     DRIVER_ID, DRIVER_NAME, DRIVER_SEX, DRIVER_AGE, DRIVER_PHONE, DRIVER_IDENTITY_CARD, 
@@ -395,8 +395,8 @@
       #{driverLicenseTipsDate,jdbcType=TIMESTAMP}, #{driverCarClassName,jdbcType=VARCHAR}, 
       #{memo,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
       #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{deleted,jdbcType=DECIMAL}, #{driverPhoto,jdbcType=BLOB}, #{driverLisencePhoto,jdbcType=BLOB}, 
-      #{driverPermitPhoto,jdbcType=BLOB})
+      #{deleted,jdbcType=DECIMAL}, #{driverPhoto,jdbcType=BLOB}, #{driverLisencePhoto,jdbcType=VARCHAR},
+      #{driverPermitPhoto,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarDriver">
     insert into RMS_CAR_DRIVER
@@ -596,10 +596,10 @@
         #{driverPhoto,jdbcType=BLOB},
       </if>
       <if test="driverLisencePhoto != null">
-        #{driverLisencePhoto,jdbcType=BLOB},
+        #{driverLisencePhoto,jdbcType=VARCHAR},
       </if>
       <if test="driverPermitPhoto != null">
-        #{driverPermitPhoto,jdbcType=BLOB},
+        #{driverPermitPhoto,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -635,8 +635,8 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       DELETED = #{deleted,jdbcType=DECIMAL},
       DRIVER_PHOTO = #{driverPhoto,jdbcType=BLOB},
-      DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=BLOB},
-      DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=BLOB}
+      DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=VARCHAR},
+      DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=VARCHAR}
     where DRIVER_ID = #{driverId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarDriver">
@@ -733,10 +733,10 @@
         DRIVER_PHOTO = #{driverPhoto,jdbcType=BLOB},
       </if>
       <if test="driverLisencePhoto != null">
-        DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=BLOB},
+        DRIVER_LISENCE_PHOTO = #{driverLisencePhoto,jdbcType=VARCHAR},
       </if>
       <if test="driverPermitPhoto != null">
-        DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=BLOB},
+        DRIVER_PERMIT_PHOTO = #{driverPermitPhoto,jdbcType=VARCHAR},
       </if>
     </set>
     where DRIVER_ID = #{driverId,jdbcType=DECIMAL}
@@ -785,8 +785,8 @@
       #{item.driverCarClassName,jdbcType=VARCHAR}, #{item.memo,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.driverPhoto,jdbcType=BLOB}, #{item.driverLisencePhoto,jdbcType=BLOB}, 
-      #{item.driverPermitPhoto,jdbcType=BLOB} from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.driverPhoto,jdbcType=BLOB}, #{item.driverLisencePhoto,jdbcType=VARCHAR},
+      #{item.driverPermitPhoto,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -918,11 +918,11 @@
        </foreach>
        ,DRIVER_LISENCE_PHOTO=
        <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_ID" separator=" ">
-          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverLisencePhoto,jdbcType=BLOB}
+          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverLisencePhoto,jdbcType=VARCHAR}
        </foreach>
        ,DRIVER_PERMIT_PHOTO=
        <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_ID" separator=" ">
-          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverPermitPhoto,jdbcType=BLOB}
+          when #{item.driverId,jdbcType=DECIMAL} then #{item.driverPermitPhoto,jdbcType=VARCHAR}
        </foreach>
      where DRIVER_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -1093,5 +1093,9 @@
     where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
     and RCD.DELETED!=1
   </select>
+
+  <select id="getMaxDriveId" resultType="DECIMAL">
+    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+  </select>
 </mapper>
 

BIN
target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class


BIN
target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class


+ 0 - 683
target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -1,683 +0,0 @@
-<?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.mapper.RmsConsigneeMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsConsignee">
-    <id column="CONSIGNEE_ID" jdbcType="DECIMAL" property="consigneeId" />
-    <result column="CONSIGNEE_COMPANY_NAME" jdbcType="VARCHAR" property="consigneeCompanyName" />
-    <result column="CONSIGNEE_ABBREVIATION" jdbcType="VARCHAR" property="consigneeAbbreviation" />
-    <result column="CONSIGNEE_REGISTERED_ADDRESS" jdbcType="VARCHAR" property="consigneeRegisteredAddress" />
-    <result column="CONSIGNEE_RECEIVE_ADDRESS" jdbcType="VARCHAR" property="consigneeReceiveAddress" />
-    <result column="CONSIGNEE_REGISTRATION_TIME" jdbcType="TIMESTAMP" property="consigneeRegistrationTime" />
-    <result column="CONSIGNEE_CONTACT_NAME" jdbcType="VARCHAR" property="consigneeContactName" />
-    <result column="CONSIGNEE_WARRANTY_AMOUNT" jdbcType="DECIMAL" property="consigneeWarrantyAmount" />
-    <result column="CONSIGNEE_WARRANTY_WEIGHT" jdbcType="VARCHAR" property="consigneeWarrantyWeight" />
-    <result column="CONSIGNEE_CONTACT_TEL" jdbcType="VARCHAR" property="consigneeContactTel" />
-    <result column="CONSIGNEE_EXCHANGE_DELIVERY" jdbcType="DECIMAL" property="consigneeExchangeDelivery" />
-    <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="EAS_CONSIGNEE_ID" jdbcType="VARCHAR" property="easConsigneeId" />
-    <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />
-  </resultMap>
-  <sql id="columns">
-    CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
-    CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
-    CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID, 
-    CONSIGNEE_CODE
-  </sql>
-  <sql id="columns_alias">
-    t.CONSIGNEE_ID, t.CONSIGNEE_COMPANY_NAME, t.CONSIGNEE_ABBREVIATION, t.CONSIGNEE_REGISTERED_ADDRESS, 
-    t.CONSIGNEE_RECEIVE_ADDRESS, t.CONSIGNEE_REGISTRATION_TIME, t.CONSIGNEE_CONTACT_NAME, 
-    t.CONSIGNEE_WARRANTY_AMOUNT, t.CONSIGNEE_WARRANTY_WEIGHT, t.CONSIGNEE_CONTACT_TEL, 
-    t.CONSIGNEE_EXCHANGE_DELIVERY, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_CONSIGNEE_ID, t.CONSIGNEE_CODE
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_CONSIGNEE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_CONSIGNEE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
-      </if>
-      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-        and CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
-      </if>
-      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-        and CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
-      </if>
-      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-        and CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
-      </if>
-      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-        and CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
-      </if>
-      <if test="consigneeContactName != null and consigneeContactName != ''">
-        and CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-      </if>
-      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-        and CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
-      </if>
-      <if test="consigneeContactTel != null and consigneeContactTel != ''">
-        and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-      </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="easConsigneeId != null and easConsigneeId != ''">
-        and EAS_CONSIGNEE_ID = #{easConsigneeId}
-      </if>
-      <if test="consigneeCode != null and consigneeCode != ''">
-        and CONSIGNEE_CODE = #{consigneeCode}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
-      </if>
-      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-        and CONSIGNEE_COMPANY_NAME LIKE '%${consigneeCompanyName}%'
-      </if>
-      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-        and CONSIGNEE_ABBREVIATION LIKE '%${consigneeAbbreviation}%'
-      </if>
-      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-        and CONSIGNEE_REGISTERED_ADDRESS LIKE '%${consigneeRegisteredAddress}%'
-      </if>
-      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-        and CONSIGNEE_RECEIVE_ADDRESS LIKE '%${consigneeReceiveAddress}%'
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
-      </if>
-      <if test="consigneeContactName != null and consigneeContactName != ''">
-        and CONSIGNEE_CONTACT_NAME LIKE '%${consigneeContactName}%'
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-      </if>
-      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-        and CONSIGNEE_WARRANTY_WEIGHT LIKE '%${consigneeWarrantyWeight}%'
-      </if>
-      <if test="consigneeContactTel != null and consigneeContactTel != ''">
-        and CONSIGNEE_CONTACT_TEL LIKE '%${consigneeContactTel}%'
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-      </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="easConsigneeId != null and easConsigneeId != ''">
-        and EAS_CONSIGNEE_ID LIKE '%${easConsigneeId}%'
-      </if>
-      <if test="consigneeCode != null and consigneeCode != ''">
-        and CONSIGNEE_CODE LIKE '%${consigneeCode}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from RMS_CONSIGNEE
-    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_CONSIGNEE
-    where 1!=1 
-      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-        or CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
-      </if>
-      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-        or CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
-      </if>
-      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-        or CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
-      </if>
-      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-        or CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        or TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = '#{consigneeRegistrationTime}'
-      </if>
-      <if test="consigneeContactName != null and consigneeContactName != ''">
-        or CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        or CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-      </if>
-      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-        or CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
-      </if>
-      <if test="consigneeContactTel != null and consigneeContactTel != ''">
-        or CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        or CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-      </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="easConsigneeId != null and easConsigneeId != ''">
-        or EAS_CONSIGNEE_ID = #{easConsigneeId}
-      </if>
-      <if test="consigneeCode != null and consigneeCode != ''">
-        or CONSIGNEE_CODE = #{consigneeCode}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsConsignee">
-    insert into RMS_CONSIGNEE (CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, 
-      CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
-      CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, 
-      CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
-      CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, 
-      CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID, 
-      CONSIGNEE_CODE)
-    values (#{consigneeId,jdbcType=DECIMAL}, #{consigneeCompanyName,jdbcType=VARCHAR}, 
-      #{consigneeAbbreviation,jdbcType=VARCHAR}, #{consigneeRegisteredAddress,jdbcType=VARCHAR}, 
-      #{consigneeReceiveAddress,jdbcType=VARCHAR}, #{consigneeRegistrationTime,jdbcType=TIMESTAMP}, 
-      #{consigneeContactName,jdbcType=VARCHAR}, #{consigneeWarrantyAmount,jdbcType=DECIMAL}, 
-      #{consigneeWarrantyWeight,jdbcType=VARCHAR}, #{consigneeContactTel,jdbcType=VARCHAR}, 
-      #{consigneeExchangeDelivery,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easConsigneeId,jdbcType=VARCHAR}, 
-      #{consigneeCode,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
-    insert into RMS_CONSIGNEE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="consigneeId != null">
-        CONSIGNEE_ID,
-      </if>
-      <if test="consigneeCompanyName != null">
-        CONSIGNEE_COMPANY_NAME,
-      </if>
-      <if test="consigneeAbbreviation != null">
-        CONSIGNEE_ABBREVIATION,
-      </if>
-      <if test="consigneeRegisteredAddress != null">
-        CONSIGNEE_REGISTERED_ADDRESS,
-      </if>
-      <if test="consigneeReceiveAddress != null">
-        CONSIGNEE_RECEIVE_ADDRESS,
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        CONSIGNEE_REGISTRATION_TIME,
-      </if>
-      <if test="consigneeContactName != null">
-        CONSIGNEE_CONTACT_NAME,
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        CONSIGNEE_WARRANTY_AMOUNT,
-      </if>
-      <if test="consigneeWarrantyWeight != null">
-        CONSIGNEE_WARRANTY_WEIGHT,
-      </if>
-      <if test="consigneeContactTel != null">
-        CONSIGNEE_CONTACT_TEL,
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        CONSIGNEE_EXCHANGE_DELIVERY,
-      </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="easConsigneeId != null">
-        EAS_CONSIGNEE_ID,
-      </if>
-      <if test="consigneeCode != null">
-        CONSIGNEE_CODE,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="consigneeId != null">
-        #{consigneeId,jdbcType=DECIMAL},
-      </if>
-      <if test="consigneeCompanyName != null">
-        #{consigneeCompanyName,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeAbbreviation != null">
-        #{consigneeAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeRegisteredAddress != null">
-        #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeReceiveAddress != null">
-        #{consigneeReceiveAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="consigneeContactName != null">
-        #{consigneeContactName,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="consigneeWarrantyWeight != null">
-        #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeContactTel != null">
-        #{consigneeContactTel,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-      </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="easConsigneeId != null">
-        #{easConsigneeId,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeCode != null">
-        #{consigneeCode,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsConsignee">
-    update RMS_CONSIGNEE
-    set CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
-      CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
-      CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-      CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
-      CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-      CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
-      CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-      CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-      CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=VARCHAR},
-      CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-      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},
-      EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR},
-      CONSIGNEE_CODE = #{consigneeCode,jdbcType=VARCHAR}
-    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
-    update RMS_CONSIGNEE
-    <set>
-      <if test="consigneeCompanyName != null">
-        CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeAbbreviation != null">
-        CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeRegisteredAddress != null">
-        CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeReceiveAddress != null">
-        CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="consigneeContactName != null">
-        CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="consigneeWarrantyWeight != null">
-        CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeContactTel != null">
-        CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-      </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="easConsigneeId != null">
-        EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeCode != null">
-        CONSIGNEE_CODE = #{consigneeCode,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where CONSIGNEE_ID = #{consigneeId,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_CONSIGNEE 
-      (CONSIGNEE_ID, 
-      CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, 
-      CONSIGNEE_REGISTERED_ADDRESS, CONSIGNEE_RECEIVE_ADDRESS, 
-      CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, 
-      CONSIGNEE_WARRANTY_AMOUNT, CONSIGNEE_WARRANTY_WEIGHT, 
-      CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, 
-      EAS_CONSIGNEE_ID, CONSIGNEE_CODE
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.consigneeId,jdbcType=DECIMAL}, 
-      #{item.consigneeCompanyName,jdbcType=VARCHAR}, #{item.consigneeAbbreviation,jdbcType=VARCHAR}, 
-      #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}, #{item.consigneeReceiveAddress,jdbcType=VARCHAR}, 
-      #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}, #{item.consigneeContactName,jdbcType=VARCHAR}, 
-      #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}, #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}, 
-      #{item.consigneeContactTel,jdbcType=VARCHAR}, #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}, 
-      #{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.easConsigneeId,jdbcType=VARCHAR}, #{item.consigneeCode,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_CONSIGNEE
-     set
-       CONSIGNEE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
-       </foreach>
-       ,CONSIGNEE_COMPANY_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCompanyName,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_ABBREVIATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeAbbreviation,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_REGISTERED_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_RECEIVE_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeReceiveAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_REGISTRATION_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CONSIGNEE_CONTACT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactName,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_WARRANTY_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,CONSIGNEE_WARRANTY_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_CONTACT_TEL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactTel,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_EXCHANGE_DELIVERY=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,EAS_CONSIGNEE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.easConsigneeId,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCode,jdbcType=VARCHAR}
-       </foreach>
-     where CONSIGNEE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.consigneeId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_CONSIGNEE
-    where CONSIGNEE_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
- <select id="getConsigneeList" parameterType="java.util.Map" resultType="java.util.Map">
-   SELECT *
-   FROM (
-   SELECT
-      RC.CONSIGNEE_ID AS "consigneeId",
-      RC.CONSIGNEE_COMPANY_NAME AS "companyName",
-      RC.CONSIGNEE_ABBREVIATION AS "consigneeAbbreviation",
-      RC.CONSIGNEE_REGISTERED_ADDRESS AS "consigneeRegisteredAddress",
-      RC.CONSIGNEE_RECEIVE_ADDRESS AS "consigneeReceiveAddress",
-      RC.CONSIGNEE_REGISTRATION_TIME AS "consigneeRegistrationTime",
-      RC.CONSIGNEE_CONTACT_NAME AS "consigneeContactName",
-      RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel"
-   FROM RMS_CONSIGNEE RC
-   WHERE RC.DELETED!=1
-   ORDER BY RC.INSERT_TIME DESC
-   )
-   WHERE rownum &lt; 100
-   <where>
-   <if test="companyName!= null">
-     and
-     <foreach collection="companyName" item="item" open="(" separator="," close=")">
-       "companyName" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeAbbreviation!= null">
-     and
-     <foreach collection="consigneeAbbreviation" item="item" open="(" separator="," close=")">
-       "consigneeAbbreviation" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeRegisteredAddress!= null">
-     and
-     <foreach collection="consigneeRegisteredAddress" item="item" open="(" separator="," close=")">
-       "consigneeRegisteredAddress" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeReceiveAddress= null">
-     and
-     <foreach collection="consigneeReceiveAddress" item="item" open="(" separator="," close=")">
-       "consigneeReceiveAddress" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeRegistrationTime!= null">
-     and
-     <foreach collection="consigneeRegistrationTime" item="item" open="(" separator="," close=")">
-       "consigneeRegistrationTime" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeContactName!= null">
-     and
-     <foreach collection="consigneeContactName" item="item" open="(" separator="," close=")">
-       "consigneeContactName" in #{item}
-     </foreach>
-   </if>
-   <if test="consigneeContactTel!= null">
-     and
-     <foreach collection="consigneeContactTel" item="item" open="(" separator="," close=")">
-       "consigneeContactTel" in #{item}
-     </foreach>
-   </if>
-   </where>
-   <include refid="orderBy"></include>
- </select>
-  <sql id="orderBy">
-  <if test="orderField!=null and orderField !=''">
-    order by "${orderField}"
-    <if test="orderType !=null and orderType !=''">
-      ${orderType}
-    </if>
-  </if>
-  </sql>
-
-
-  <select id="getConsigneeById" resultType="java.util.LinkedHashMap">
-     SELECT
-      RC.CONSIGNEE_ID AS "consigneeId",
-      RC.CONSIGNEE_COMPANY_NAME AS "companyName",
-      RC.CONSIGNEE_ABBREVIATION AS "consigneeAbbreviation",
-      RC.CONSIGNEE_REGISTERED_ADDRESS AS "consigneeRegisteredAddress",
-      RC.CONSIGNEE_RECEIVE_ADDRESS AS "consigneeReceiveAddress",
-      RC.CONSIGNEE_REGISTRATION_TIME AS "consigneeRegistrationTime",
-      RC.CONSIGNEE_CONTACT_NAME AS "consigneeContactName",
-      RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel"
-   FROM RMS_CONSIGNEE RC
-   WHERE RC.CONSIGNEE_ID = #{id}
-  </select>
-
-  <select id="selectConsigneeId" resultType="DECIMAL" >
-    select max(RC.CONSIGNEE_ID+1) from RMS_CONSIGNEE RC
-  </select>
-
-  <select id="getConsigneeByCompanyName" parameterType="java.lang.String" resultType="int">
-    select count(*)
-    from RMS_CONSIGNEE RC
-    where RC.CONSIGNEE_COMPANY_NAME=#{companyName}
-    and RC.DELETED!=1
-  </select>
-
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.class


+ 0 - 443
target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml

@@ -1,443 +0,0 @@
-<?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.mapper.RmsDriverCapacityMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsDriverCapacity">
-    <id column="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId" />
-    <result column="DRIVER_ID" jdbcType="DECIMAL" property="driverId" />
-    <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
-    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <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="DELETED" jdbcType="DECIMAL" property="deleted" />
-  </resultMap>
-  <sql id="columns">
-    DRIVER_CAPACITY_ID, DRIVER_ID, CAPACITY_ID, CARRIER_ID, INSERT_UPDATE_REMARK, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.DRIVER_CAPACITY_ID, t.DRIVER_ID, t.CAPACITY_ID, t.CARRIER_ID, t.INSERT_UPDATE_REMARK, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_DRIVER_CAPACITY
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_DRIVER_CAPACITY t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="driverCapacityId != null">
-        and DRIVER_CAPACITY_ID = #{driverCapacityId}
-      </if>
-      <if test="driverId != null">
-        and DRIVER_ID = #{driverId}
-      </if>
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </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="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="driverCapacityId != null">
-        and DRIVER_CAPACITY_ID = #{driverCapacityId}
-      </if>
-      <if test="driverId != null">
-        and DRIVER_ID = #{driverId}
-      </if>
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </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="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_DRIVER_CAPACITY
-    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_DRIVER_CAPACITY
-    where 1!=1 
-      <if test="driverId != null">
-        or DRIVER_ID = #{driverId}
-      </if>
-      <if test="capacityId != null">
-        or CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="carrierId != null">
-        or CARRIER_ID = #{carrierId}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </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="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
-    insert into RMS_DRIVER_CAPACITY (DRIVER_CAPACITY_ID, DRIVER_ID, CAPACITY_ID, 
-      CARRIER_ID, INSERT_UPDATE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      DELETED)
-    values (#{driverCapacityId,jdbcType=DECIMAL}, #{driverId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, 
-      #{carrierId,jdbcType=DECIMAL}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
-    insert into RMS_DRIVER_CAPACITY
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="driverCapacityId != null">
-        DRIVER_CAPACITY_ID,
-      </if>
-      <if test="driverId != null">
-        DRIVER_ID,
-      </if>
-      <if test="capacityId != null">
-        CAPACITY_ID,
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </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="deleted != null">
-        DELETED,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="driverCapacityId != null">
-        #{driverCapacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="driverId != null">
-        #{driverId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityId != null">
-        #{capacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,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="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
-    update RMS_DRIVER_CAPACITY
-    set DRIVER_ID = #{driverId,jdbcType=DECIMAL},
-      CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
-    update RMS_DRIVER_CAPACITY
-    <set>
-      <if test="driverId != null">
-        DRIVER_ID = #{driverId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityId != null">
-        CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,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="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where DRIVER_CAPACITY_ID = #{driverCapacityId,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_DRIVER_CAPACITY 
-      (DRIVER_CAPACITY_ID, 
-      DRIVER_ID, CAPACITY_ID, CARRIER_ID, 
-      INSERT_UPDATE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.driverCapacityId,jdbcType=DECIMAL}, 
-      #{item.driverId,jdbcType=DECIMAL}, #{item.capacityId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_DRIVER_CAPACITY
-     set
-       DRIVER_CAPACITY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.driverCapacityId,jdbcType=DECIMAL}
-       </foreach>
-       ,DRIVER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.driverId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
-       </foreach>
-       ,CARRIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
-          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where DRIVER_CAPACITY_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.driverCapacityId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_DRIVER_CAPACITY
-    where DRIVER_CAPACITY_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-
-  <select id="getDriverCapacityList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM
-    (
-    SELECT
-    RDC.DRIVER_CAPACITY_ID AS "driverCapacityId",
-    RCD.DRIVER_NAME AS "driverName",
-    RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-    RC.CARRIER_NAME AS "carrierName"
-    FROM RMS_DRIVER_CAPACITY RDC
-    LEFT JOIN RMS_CAR_DRIVER RCD
-    ON RDC.DRIVER_ID=RCD.DRIVER_ID
-    LEFT JOIN RMS_CAPACITY RCA
-    ON RDC.CAPACITY_ID=RCA.CAPACITY_ID
-    LEFT JOIN RMS_CAPACITY_TYPE RCT
-    ON RCA.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
-    LEFT JOIN RMS_CARRIER RC
-    ON RDC.CARRIER_ID=RC.CARRIER_ID
-    WHERE RDC.DELETED!=1
-    ORDER BY RDC.INSERT_TIME DESC
-    )
-    <where>
-    <if test="driverCapacityId!= null">
-      and
-      <foreach collection="driverCapacityId" item="item" open="(" separator="," close=")">
-        "driverCapacityId" in #{item}
-      </foreach>
-    </if>
-      <if test="driverName!= null">
-        and
-        <foreach collection="driverName" item="item" open="(" separator="," close=")">
-          "driverName" in #{item}
-        </foreach>
-      </if>
-      <if test="capacityTypeName!= null">
-        and
-        <foreach collection="capacityTypeName" item="item" open="(" separator="," close=")">
-          "capacityTypeName" in #{item}
-        </foreach>
-      </if>
-      <if test="carrierName!= null">
-        and
-        <foreach collection="carrierName" item="item" open="(" separator="," close=")">
-          "carrierName" in #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-
-
-  <select id="getDriverCapacityById" resultType="java.util.LinkedHashMap">
-     SELECT
-        RDC.DRIVER_CAPACITY_ID AS "driverCapacityId",
-        RCD.DRIVER_ID AS "driverId",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        RC.CARRIER_NAME AS "carrierName"
-    FROM RMS_DRIVER_CAPACITY RDC
-    LEFT JOIN RMS_CAR_DRIVER RCD
-    ON RDC.DRIVER_ID=RCD.DRIVER_ID
-    LEFT JOIN RMS_CAPACITY RCA
-    ON RDC.CAPACITY_ID=RCA.CAPACITY_ID
-    LEFT JOIN RMS_CAPACITY_TYPE RCT
-    ON RCA.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
-    LEFT JOIN RMS_CARRIER RC
-    ON RDC.CARRIER_ID=RC.CARRIER_ID
-    WHERE RDC.DRIVER_CAPACITY_ID=#{id}
-  </select>
-
-  <select id="getCarrierId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RC.CARRIER_ID AS "id",
-    RC.CARRIER_ID AS "value",
-    RC.CARRIER_NAME AS "label"
-    FROM RMS_CARRIER RC
-    WHERE RC.DELETED!=1
-  </select>
-
-  <select id="getDriverId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RCD.DRIVER_ID AS "id",
-    RCD.DRIVER_ID AS "value",
-    RCD.DRIVER_NAME AS "label"
-    FROM RMS_CAR_DRIVER RCD
-    WHERE RCD.DELETED!=1
-  </select>
-
-  <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RCT.CAPACITY_TYPE_ID AS "id",
-    RCT.CAPACITY_TYPE_ID AS "value",
-    RCT.CAPACITY_TYPE_NAME AS "label"
-    FROM RMS_CAPACITY_TYPE RCT
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class


+ 0 - 501
target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml

@@ -1,501 +0,0 @@
-<?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.mapper.RmsGatepostMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsGatepost">
-    <id column="GATEPOST_ID" jdbcType="DECIMAL" property="gatepostId" />
-    <result column="GATEPOST_NAME" jdbcType="VARCHAR" property="gatepostName" />
-    <result column="GATEPOST_LONGITUDE" jdbcType="VARCHAR" property="gatepostLongitude" />
-    <result column="GATEPOST_LATITUDE" jdbcType="VARCHAR" property="gatepostLatitude" />
-    <result column="GATEPOST_PRIORITY" jdbcType="DECIMAL" property="gatepostPriority" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    GATEPOST_ID, GATEPOST_NAME, GATEPOST_LONGITUDE, GATEPOST_LATITUDE, GATEPOST_PRIORITY, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.GATEPOST_ID, t.GATEPOST_NAME, t.GATEPOST_LONGITUDE, t.GATEPOST_LATITUDE, t.GATEPOST_PRIORITY, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_GATEPOST
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_GATEPOST t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="gatepostId != null">
-        and GATEPOST_ID = #{gatepostId}
-      </if>
-      <if test="gatepostName != null and gatepostName != ''">
-        and GATEPOST_NAME = #{gatepostName}
-      </if>
-      <if test="gatepostLongitude != null and gatepostLongitude != ''">
-        and GATEPOST_LONGITUDE = #{gatepostLongitude}
-      </if>
-      <if test="gatepostLatitude != null and gatepostLatitude != ''">
-        and GATEPOST_LATITUDE = #{gatepostLatitude}
-      </if>
-      <if test="gatepostPriority != null">
-        and GATEPOST_PRIORITY = #{gatepostPriority}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="gatepostId != null">
-        and GATEPOST_ID = #{gatepostId}
-      </if>
-      <if test="gatepostName != null and gatepostName != ''">
-        and GATEPOST_NAME LIKE '%${gatepostName}%'
-      </if>
-      <if test="gatepostLongitude != null and gatepostLongitude != ''">
-        and GATEPOST_LONGITUDE LIKE '%${gatepostLongitude}%'
-      </if>
-      <if test="gatepostLatitude != null and gatepostLatitude != ''">
-        and GATEPOST_LATITUDE LIKE '%${gatepostLatitude}%'
-      </if>
-      <if test="gatepostPriority != null">
-        and GATEPOST_PRIORITY = #{gatepostPriority}
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_GATEPOST
-    where GATEPOST_ID = #{gatepostId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_GATEPOST
-    where 1!=1 
-      <if test="gatepostName != null and gatepostName != ''">
-        or GATEPOST_NAME = #{gatepostName}
-      </if>
-      <if test="gatepostLongitude != null and gatepostLongitude != ''">
-        or GATEPOST_LONGITUDE = #{gatepostLongitude}
-      </if>
-      <if test="gatepostLatitude != null and gatepostLatitude != ''">
-        or GATEPOST_LATITUDE = #{gatepostLatitude}
-      </if>
-      <if test="gatepostPriority != null">
-        or GATEPOST_PRIORITY = #{gatepostPriority}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsGatepost">
-    insert into RMS_GATEPOST (GATEPOST_ID, GATEPOST_NAME, GATEPOST_LONGITUDE, 
-      GATEPOST_LATITUDE, GATEPOST_PRIORITY, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK,DELETED)
-    values (#{gatepostId,jdbcType=DECIMAL}, #{gatepostName,jdbcType=VARCHAR}, #{gatepostLongitude,jdbcType=VARCHAR}, 
-      #{gatepostLatitude,jdbcType=VARCHAR}, #{gatepostPriority,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsGatepost">
-    insert into RMS_GATEPOST
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="gatepostId != null">
-        GATEPOST_ID,
-      </if>
-      <if test="gatepostName != null">
-        GATEPOST_NAME,
-      </if>
-      <if test="gatepostLongitude != null">
-        GATEPOST_LONGITUDE,
-      </if>
-      <if test="gatepostLatitude != null">
-        GATEPOST_LATITUDE,
-      </if>
-      <if test="gatepostPriority != null">
-        GATEPOST_PRIORITY,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="gatepostId != null">
-        #{gatepostId,jdbcType=DECIMAL},
-      </if>
-      <if test="gatepostName != null">
-        #{gatepostName,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostLongitude != null">
-        #{gatepostLongitude,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostLatitude != null">
-        #{gatepostLatitude,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostPriority != null">
-        #{gatepostPriority,jdbcType=DECIMAL},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsGatepost">
-    update RMS_GATEPOST
-    set GATEPOST_NAME = #{gatepostName,jdbcType=VARCHAR},
-      GATEPOST_LONGITUDE = #{gatepostLongitude,jdbcType=VARCHAR},
-      GATEPOST_LATITUDE = #{gatepostLatitude,jdbcType=VARCHAR},
-      GATEPOST_PRIORITY = #{gatepostPriority,jdbcType=DECIMAL},
-      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}
-    where GATEPOST_ID = #{gatepostId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsGatepost">
-    update RMS_GATEPOST
-    <set>
-      <if test="gatepostName != null">
-        GATEPOST_NAME = #{gatepostName,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostLongitude != null">
-        GATEPOST_LONGITUDE = #{gatepostLongitude,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostLatitude != null">
-        GATEPOST_LATITUDE = #{gatepostLatitude,jdbcType=VARCHAR},
-      </if>
-      <if test="gatepostPriority != null">
-        GATEPOST_PRIORITY = #{gatepostPriority,jdbcType=DECIMAL},
-      </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>
-    </set>
-    where GATEPOST_ID = #{gatepostId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where GATEPOST_ID = #{gatepostId,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_GATEPOST 
-      (GATEPOST_ID, 
-      GATEPOST_NAME, GATEPOST_LONGITUDE, 
-      GATEPOST_LATITUDE, GATEPOST_PRIORITY, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK,DELETED,)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.gatepostId,jdbcType=DECIMAL}, 
-      #{item.gatepostName,jdbcType=VARCHAR}, #{item.gatepostLongitude,jdbcType=VARCHAR}, 
-      #{item.gatepostLatitude,jdbcType=VARCHAR}, #{item.gatepostPriority,jdbcType=DECIMAL}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR},, #{item.deleted,jdbcType=DECIMAL} from dual
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_GATEPOST
-     set
-       GATEPOST_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.gatepostId,jdbcType=DECIMAL}
-       </foreach>
-       ,GATEPOST_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.gatepostName,jdbcType=VARCHAR}
-       </foreach>
-       ,GATEPOST_LONGITUDE=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.gatepostLongitude,jdbcType=VARCHAR}
-       </foreach>
-       ,GATEPOST_LATITUDE=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.gatepostLatitude,jdbcType=VARCHAR}
-       </foreach>
-       ,GATEPOST_PRIORITY=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.gatepostPriority,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case GATEPOST_ID" separator=" ">
-          when #{item.gatepostId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-        ,DELETED=
-        <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-     where GATEPOST_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.gatepostId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_GATEPOST
-    where GATEPOST_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getGatepostList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM
-    (
-    SELECT
-    RG.GATEPOST_ID AS "gatepostId",
-    RG.GATEPOST_NAME AS "gatepostName",
-    RG.GATEPOST_LONGITUDE AS "gatepostLongitude",
-    RG.GATEPOST_LATITUDE AS "gatepostLatitude",
-    RG.GATEPOST_PRIORITY AS "gatepostPriority"
-    FROM RMS_GATEPOST RG
-    WHERE RG.DELETED !=1
-    ORDER BY RG.INSERT_TIME DESC
-    )
-    <where>
-      <if test="gatepostName!= null">
-        and
-        <foreach collection="gatepostName" item="item" open="(" separator="," close=")">
-          "gatepostName" in #{item}
-        </foreach>
-      </if>
-      <if test="gatepostLongitude!= null">
-        and
-        <foreach collection="gatepostLongitude" item="item" open="(" separator="," close=")">
-          "gatepostLongitude" in #{item}
-        </foreach>
-      </if>
-      <if test="gatepostLatitude!= null">
-        and
-        <foreach collection="gatepostLatitude" item="item" open="(" separator="," close=")">
-          "gatepostLatitude" in #{item}
-        </foreach>
-      </if>
-      <if test="gatepostPriority!= null">
-        and
-        <foreach collection="gatepostPriority" item="item" open="(" separator="," close=")">
-          "gatepostPriority" in #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  <!--  根据门岗id获取详细的门岗规则-->
-  <select id="getGatepostRulesById" parameterType="java.util.LinkedHashMap" resultType="java.util.LinkedHashMap">
-    SELECT
-        RG.GATEPOST_ID AS "gatepostId",
-        RG.GATEPOST_NAME AS "gatepostName",
-        RG.GATEPOST_LONGITUDE AS "gatepostLongitude",
-        RG.GATEPOST_LATITUDE AS "gatepostLatitude",
-        RG.GATEPOST_PRIORITY AS "gatepostPriority",
-        RGR.RULES_ID AS "rulesId",
-        RGR.RULES_GATEPOST_START_TIME AS "rulesGatepostStartTime",
-        RGR.RULES_GATEPOST_END_TIME AS "rulesGatepostEndTime",
-        RGR.RULES_GATEPOST_ENTRY_OUT_TYPE AS "rulesGatepostEntityOutType",
-        RGR.VEHICLE_TYPE_ID AS "vehicleTypeId",
-        RCT.CAPACITY_TYPE_NAME AS "vehicleTypeName",
-        RGR.MATERIAL_ID AS "materialId",
-        RM.MATERIAL_NAME AS "materialName"
-		FROM RMS_GATEPOST RG
-        LEFT JOIN RMS_GATEPOST_RULES RGR
-        ON RGR.GATEPOST_ID=RG.GATEPOST_ID
-        LEFT JOIN RMS_CAPACITY_TYPE RCT
-        ON RCT.CAPACITY_TYPE_ID=RGR.VEHICLE_TYPE_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=RGR.MATERIAL_ID
-        WHERE RG.GATEPOST_ID=#{gatepostId} AND RGR.DELETED !=1
-        ORDER BY RG.INSERT_TIME DESC
-  </select>
-  <!--  根据id获取详细的门岗信息-->
-  <select id="getGatepostById" resultType="java.util.Map">
-    SELECT
-        RGR.RULES_ID AS "rulesId",
-        RGR.RULES_GATEPOST_START_TIME AS "rulesGatepostStartTime",
-        RGR.RULES_GATEPOST_END_TIME AS "rulesGatepostEndTime",
-        RGR.RULES_GATEPOST_ENTRY_OUT_TYPE AS "rulesGatepostEntityOutType",
-        RGR.VEHICLE_TYPE_ID AS "vehicleTypeId",
-        RGR.MATERIAL_ID AS "materialId",
-        RGR.GATEPOST_ID AS "gatepostId",
-        RG.GATEPOST_NAME AS "gatepostName",
-        RG.GATEPOST_PRIORITY AS "gatepostPriority",
-        RCT.CAPACITY_TYPE_NAME AS "vehicleTypeName",
-        RM.MATERIAL_NAME AS "materialName"
-	FROM RMS_GATEPOST_RULES RGR
-	LEFT JOIN RMS_GATEPOST RG
-    ON RGR.GATEPOST_ID=RG.GATEPOST_ID
-    LEFT JOIN RMS_CAPACITY_TYPE RCT
-    ON RCT.CAPACITY_TYPE_ID=RGR.VEHICLE_TYPE_ID
-    LEFT JOIN RMS_MATERIAL RM
-    ON RM.MATERIAL_ID=RGR.MATERIAL_ID
-    WHERE RGR.RULES_ID=#{rulesId} AND RGR.DELETED !=1
-    ORDER BY RGR.INSERT_TIME DESC
-  </select>
-  <!--  获取门岗规则Id-->
-  <select id="getGatepostRulesId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RGR.RULES_ID "id",
-    RGR.RULES_ID "value",
-    RGR.RULES_GATEPOST_ENTRY_OUT_TYPE "entityOutType",
-    RGR.RULES_GATEPOST_START_TIME "startTime",
-    RGR.RULES_GATEPOST_END_TIME "endTime",
-    RGR.VEHICLE_TYPE_ID "vehicleType"
-    FROM
-    RMS_GATEPOST_RULES RGR
-    WHERE
-    RGR.DELETED!=1
-  </select>
-
-<!--  获取门岗的最大id-->
-  <select id="getGatepostMaxId" resultType="java.math.BigDecimal">
-    SELECT MAX(GATEPOST_ID)+1 FROM RMS_GATEPOST
-  </select>
-<!--  根据门岗id查询门岗名-->
-  <select id="getGatepostName" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-    SELECT
-        RG.GATEPOST_NAME AS "gatepostName",
-        RG.GATEPOST_ID AS "gatepostId"
-    FROM RMS_GATEPOST RG
-    WHERE RG.GATEPOST_ID=#{gatepostId}
-  </select>
-
-<!--  根据门岗名得到当前表中门岗名的数量-->
-  <select id="selectParamaterGatepostName" parameterType="java.lang.String" resultType="java.lang.Integer">
-    SELECT count(*)
-    FROM RMS_GATEPOST RG
-    WHERE RG.GATEPOST_NAME =#{gatepostName}
-    AND  RG.DELETED=0
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.class


+ 0 - 483
target/classes/com/steerinfo/dil/mapper/RmsGatepostRulesMapper.xml

@@ -1,483 +0,0 @@
-<?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.mapper.RmsGatepostRulesMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsGatepostRules">
-    <id column="RULES_ID" jdbcType="DECIMAL" property="rulesId" />
-    <result column="GATEPOST_ID" jdbcType="DECIMAL" property="gatepostId" />
-    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-    <result column="RULES_GATEPOST_START_TIME" jdbcType="VARCHAR" property="rulesGatepostStartTime" />
-    <result column="RULES_GATEPOST_END_TIME" jdbcType="VARCHAR" property="rulesGatepostEndTime" />
-    <result column="RULES_GATEPOST_ENTRY_OUT_TYPE" jdbcType="DECIMAL" property="rulesGatepostEntryOutType" />
-    <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="VEHICLE_TYPE_ID" jdbcType="DECIMAL" property="vehicleTypeId" />
-  </resultMap>
-  <sql id="columns">
-    RULES_ID, GATEPOST_ID, MATERIAL_ID, RULES_GATEPOST_START_TIME, RULES_GATEPOST_END_TIME, 
-    RULES_GATEPOST_ENTRY_OUT_TYPE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, DELETED, VEHICLE_TYPE_ID
-  </sql>
-  <sql id="columns_alias">
-    t.RULES_ID, t.GATEPOST_ID, t.MATERIAL_ID, t.RULES_GATEPOST_START_TIME, t.RULES_GATEPOST_END_TIME, 
-    t.RULES_GATEPOST_ENTRY_OUT_TYPE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.VEHICLE_TYPE_ID
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_GATEPOST_RULES
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_GATEPOST_RULES t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="rulesId != null">
-        and RULES_ID = #{rulesId}
-      </if>
-      <if test="gatepostId != null">
-        and GATEPOST_ID = #{gatepostId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="rulesGatepostStartTime != null and rulesGatepostStartTime != ''">
-        and RULES_GATEPOST_START_TIME = #{rulesGatepostStartTime}
-      </if>
-      <if test="rulesGatepostEndTime != null and rulesGatepostEndTime != ''">
-        and RULES_GATEPOST_END_TIME = #{rulesGatepostEndTime}
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        and RULES_GATEPOST_ENTRY_OUT_TYPE = #{rulesGatepostEntryOutType}
-      </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="vehicleTypeId != null">
-        and VEHICLE_TYPE_ID = #{vehicleTypeId}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="rulesId != null">
-        and RULES_ID = #{rulesId}
-      </if>
-      <if test="gatepostId != null">
-        and GATEPOST_ID = #{gatepostId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="rulesGatepostStartTime != null and rulesGatepostStartTime != ''">
-        and RULES_GATEPOST_START_TIME LIKE '%${rulesGatepostStartTime}%'
-      </if>
-      <if test="rulesGatepostEndTime != null and rulesGatepostEndTime != ''">
-        and RULES_GATEPOST_END_TIME LIKE '%${rulesGatepostEndTime}%'
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        and RULES_GATEPOST_ENTRY_OUT_TYPE = #{rulesGatepostEntryOutType}
-      </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="vehicleTypeId != null">
-        and VEHICLE_TYPE_ID = #{vehicleTypeId}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_GATEPOST_RULES
-    where RULES_ID = #{rulesId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_GATEPOST_RULES
-    where 1!=1 
-      <if test="gatepostId != null">
-        or GATEPOST_ID = #{gatepostId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="rulesGatepostStartTime != null and rulesGatepostStartTime != ''">
-        or RULES_GATEPOST_START_TIME = #{rulesGatepostStartTime}
-      </if>
-      <if test="rulesGatepostEndTime != null and rulesGatepostEndTime != ''">
-        or RULES_GATEPOST_END_TIME = #{rulesGatepostEndTime}
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        or RULES_GATEPOST_ENTRY_OUT_TYPE = #{rulesGatepostEntryOutType}
-      </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="vehicleTypeId != null">
-        or VEHICLE_TYPE_ID = #{vehicleTypeId}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsGatepostRules">
-    insert into RMS_GATEPOST_RULES (RULES_ID, GATEPOST_ID, MATERIAL_ID, 
-      RULES_GATEPOST_START_TIME, RULES_GATEPOST_END_TIME, 
-      RULES_GATEPOST_ENTRY_OUT_TYPE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, VEHICLE_TYPE_ID
-      )
-    values (#{rulesId,jdbcType=DECIMAL}, #{gatepostId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, 
-      #{rulesGatepostStartTime,jdbcType=VARCHAR}, #{rulesGatepostEndTime,jdbcType=VARCHAR}, 
-      #{rulesGatepostEntryOutType,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{vehicleTypeId,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsGatepostRules">
-    insert into RMS_GATEPOST_RULES
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="rulesId != null">
-        RULES_ID,
-      </if>
-      <if test="gatepostId != null">
-        GATEPOST_ID,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID,
-      </if>
-      <if test="rulesGatepostStartTime != null">
-        RULES_GATEPOST_START_TIME,
-      </if>
-      <if test="rulesGatepostEndTime != null">
-        RULES_GATEPOST_END_TIME,
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        RULES_GATEPOST_ENTRY_OUT_TYPE,
-      </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="vehicleTypeId != null">
-        VEHICLE_TYPE_ID,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="rulesId != null">
-        #{rulesId,jdbcType=DECIMAL},
-      </if>
-      <if test="gatepostId != null">
-        #{gatepostId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="rulesGatepostStartTime != null">
-        #{rulesGatepostStartTime,jdbcType=VARCHAR},
-      </if>
-      <if test="rulesGatepostEndTime != null">
-        #{rulesGatepostEndTime,jdbcType=VARCHAR},
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        #{rulesGatepostEntryOutType,jdbcType=DECIMAL},
-      </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="vehicleTypeId != null">
-        #{vehicleTypeId,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsGatepostRules">
-    update RMS_GATEPOST_RULES
-    set GATEPOST_ID = #{gatepostId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      RULES_GATEPOST_START_TIME = #{rulesGatepostStartTime,jdbcType=VARCHAR},
-      RULES_GATEPOST_END_TIME = #{rulesGatepostEndTime,jdbcType=VARCHAR},
-      RULES_GATEPOST_ENTRY_OUT_TYPE = #{rulesGatepostEntryOutType,jdbcType=DECIMAL},
-      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},
-      VEHICLE_TYPE_ID = #{vehicleTypeId,jdbcType=DECIMAL}
-    where RULES_ID = #{rulesId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsGatepostRules">
-    update RMS_GATEPOST_RULES
-    <set>
-      <if test="gatepostId != null">
-        GATEPOST_ID = #{gatepostId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="rulesGatepostStartTime != null">
-        RULES_GATEPOST_START_TIME = #{rulesGatepostStartTime,jdbcType=VARCHAR},
-      </if>
-      <if test="rulesGatepostEndTime != null">
-        RULES_GATEPOST_END_TIME = #{rulesGatepostEndTime,jdbcType=VARCHAR},
-      </if>
-      <if test="rulesGatepostEntryOutType != null">
-        RULES_GATEPOST_ENTRY_OUT_TYPE = #{rulesGatepostEntryOutType,jdbcType=DECIMAL},
-      </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="vehicleTypeId != null">
-        VEHICLE_TYPE_ID = #{vehicleTypeId,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where RULES_ID = #{rulesId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where RULES_ID = #{rulesId,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_GATEPOST_RULES 
-      (RULES_ID, 
-      GATEPOST_ID, MATERIAL_ID, RULES_GATEPOST_START_TIME, 
-      RULES_GATEPOST_END_TIME, RULES_GATEPOST_ENTRY_OUT_TYPE, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, 
-      VEHICLE_TYPE_ID)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.rulesId,jdbcType=DECIMAL}, 
-      #{item.gatepostId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.rulesGatepostStartTime,jdbcType=VARCHAR}, 
-      #{item.rulesGatepostEndTime,jdbcType=VARCHAR}, #{item.rulesGatepostEntryOutType,jdbcType=DECIMAL}, 
-      #{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.vehicleTypeId,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_GATEPOST_RULES
-     set
-       RULES_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.rulesId,jdbcType=DECIMAL}
-       </foreach>
-       ,GATEPOST_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.gatepostId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,RULES_GATEPOST_START_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.rulesGatepostStartTime,jdbcType=VARCHAR}
-       </foreach>
-       ,RULES_GATEPOST_END_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.rulesGatepostEndTime,jdbcType=VARCHAR}
-       </foreach>
-       ,RULES_GATEPOST_ENTRY_OUT_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.rulesGatepostEntryOutType,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,VEHICLE_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RULES_ID" separator=" ">
-          when #{item.rulesId,jdbcType=DECIMAL} then #{item.vehicleTypeId,jdbcType=DECIMAL}
-       </foreach>
-     where RULES_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.rulesId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_GATEPOST_RULES
-    where RULES_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <!--  获取车辆类型Id-->
-  <select id="getVehicleTypeId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RCT.CAPACITY_TYPE_ID "id",
-    RCT.CAPACITY_TYPE_ID "value",
-    RCT.CAPACITY_TYPE_NAME  "label"
-    FROM
-    RMS_CAPACITY_TYPE RCT
-  </select>
-  <!--  获取原料Id-->
-  <select id="getMaterialId" resultType="java.util.LinkedHashMap">
-    SELECT
-    RM.MATERIAL_ID "id",
-    RM.MATERIAL_ID "value",
-    RM.MATERIAL_NAME  "label"
-    FROM
-    RMS_MATERIAL RM
-    WHERE RM.DELETED!=1
-  </select>
-<!--  获取最大的规则Id-->
-  <select id="getRulesMaxId" resultType="java.math.BigDecimal">
-    SELECT MAX(RULES_ID) FROM RMS_GATEPOST_RULES
-  </select>
-<!--  根据规则Id获取原料名称-->
-    <select id="getMaterialByRulesId" resultType="java.util.Map">
-      SELECT * FROM(
-        SELECT
-        RM.MATERIAL_ID AS "materialId",
-        RGR.RULES_ID AS "rulesId",
-          RG.GATEPOST_NAME AS "gatepostName",
-        RM.MATERIAL_NAME AS "materialName"
-        FROM RMS_GATEPOST_RULES RGR
-        LEFT JOIN RMS_GATEPOST RG
-        ON RG.GATEPOST_ID=RGR.GATEPOST_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=RGR.MATERIAL_ID
-        WHERE RGR.DELETED!=1 and RGR.RULES_ID=#{rulesId}
-        ORDER BY RGR.INSERT_TIME DESC
-      )
-      <where>
-        <if test="materialId!= null">
-          and
-          <foreach collection="materialId" item="item" open="(" separator="," close=")">
-            "materialId" in #{item}
-          </foreach>
-        </if>
-        <if test="materialName!= null">
-          and
-          <foreach collection="materialName" item="item" open="(" separator="," close=")">
-            "materialName" in #{item}
-          </foreach>
-        </if>
-        <if test="gatepostName!= null">
-          and
-          <foreach collection="gatepostName" item="item" open="(" separator="," close=")">
-            "gatepostName" in #{item}
-          </foreach>
-        </if>
-      </where>
-    </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsLineMapper.class


+ 0 - 647
target/classes/com/steerinfo/dil/mapper/RmsLineMapper.xml

@@ -1,647 +0,0 @@
-<?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.mapper.RmsLineMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsLine">
-    <id column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
-    <result column="LINE_NO" jdbcType="VARCHAR" property="lineNo" />
-    <result column="LINE_START_NODE_ID" jdbcType="DECIMAL" property="lineStartNodeId" />
-    <result column="LINE_START_NODE_TYPE" jdbcType="DECIMAL" property="lineStartNodeType" />
-    <result column="LINE_START_NODE_DESC" jdbcType="VARCHAR" property="lineStartNodeDesc" />
-    <result column="LINE_PATH_LENGTH" jdbcType="DECIMAL" property="linePathLength" />
-    <result column="LINE_END_NODE_ID" jdbcType="DECIMAL" property="lineEndNodeId" />
-    <result column="LINE_END_NODE_TYPE" jdbcType="DECIMAL" property="lineEndNodeType" />
-    <result column="LINE_END_NODE_DESC" jdbcType="VARCHAR" property="lineEndNodeDesc" />
-    <result column="LINE_NAME" jdbcType="VARCHAR" property="lineName" />
-    <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="LINE_TYPE" jdbcType="DECIMAL" property="lineType" />
-    <result column="SPELL_NUMBER" jdbcType="DECIMAL" property="spellNumber" />
-  </resultMap>
-  <sql id="columns">
-    LINE_ID, LINE_NO, LINE_START_NODE_ID, LINE_START_NODE_TYPE, LINE_START_NODE_DESC, 
-    LINE_PATH_LENGTH, LINE_END_NODE_ID, LINE_END_NODE_TYPE, LINE_END_NODE_DESC, LINE_NAME, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETED, LINE_TYPE, SPELL_NUMBER
-  </sql>
-  <sql id="columns_alias">
-    t.LINE_ID, t.LINE_NO, t.LINE_START_NODE_ID, t.LINE_START_NODE_TYPE, t.LINE_START_NODE_DESC, 
-    t.LINE_PATH_LENGTH, t.LINE_END_NODE_ID, t.LINE_END_NODE_TYPE, t.LINE_END_NODE_DESC, 
-    t.LINE_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.LINE_TYPE, t.SPELL_NUMBER
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_LINE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_LINE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="lineNo != null and lineNo != ''">
-        and LINE_NO = #{lineNo}
-      </if>
-      <if test="lineStartNodeId != null">
-        and LINE_START_NODE_ID = #{lineStartNodeId}
-      </if>
-      <if test="lineStartNodeType != null">
-        and LINE_START_NODE_TYPE = #{lineStartNodeType}
-      </if>
-      <if test="lineStartNodeDesc != null and lineStartNodeDesc != ''">
-        and LINE_START_NODE_DESC = #{lineStartNodeDesc}
-      </if>
-      <if test="linePathLength != null">
-        and LINE_PATH_LENGTH = #{linePathLength}
-      </if>
-      <if test="lineEndNodeId != null">
-        and LINE_END_NODE_ID = #{lineEndNodeId}
-      </if>
-      <if test="lineEndNodeType != null">
-        and LINE_END_NODE_TYPE = #{lineEndNodeType}
-      </if>
-      <if test="lineEndNodeDesc != null and lineEndNodeDesc != ''">
-        and LINE_END_NODE_DESC = #{lineEndNodeDesc}
-      </if>
-      <if test="lineName != null and lineName != ''">
-        and LINE_NAME = #{lineName}
-      </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="lineType != null">
-        and LINE_TYPE = #{lineType}
-      </if>
-      <if test="spellNumber != null">
-        and SPELL_NUMBER = #{spellNumber}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="lineNo != null and lineNo != ''">
-        and LINE_NO LIKE '%${lineNo}%'
-      </if>
-      <if test="lineStartNodeId != null">
-        and LINE_START_NODE_ID = #{lineStartNodeId}
-      </if>
-      <if test="lineStartNodeType != null">
-        and LINE_START_NODE_TYPE = #{lineStartNodeType}
-      </if>
-      <if test="lineStartNodeDesc != null and lineStartNodeDesc != ''">
-        and LINE_START_NODE_DESC LIKE '%${lineStartNodeDesc}%'
-      </if>
-      <if test="linePathLength != null">
-        and LINE_PATH_LENGTH = #{linePathLength}
-      </if>
-      <if test="lineEndNodeId != null">
-        and LINE_END_NODE_ID = #{lineEndNodeId}
-      </if>
-      <if test="lineEndNodeType != null">
-        and LINE_END_NODE_TYPE = #{lineEndNodeType}
-      </if>
-      <if test="lineEndNodeDesc != null and lineEndNodeDesc != ''">
-        and LINE_END_NODE_DESC LIKE '%${lineEndNodeDesc}%'
-      </if>
-      <if test="lineName != null and lineName != ''">
-        and LINE_NAME LIKE '%${lineName}%'
-      </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="lineType != null">
-        and LINE_TYPE = #{lineType}
-      </if>
-      <if test="spellNumber != null">
-        and SPELL_NUMBER = #{spellNumber}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_LINE
-    where LINE_ID = #{lineId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_LINE
-    where 1!=1 
-      <if test="lineNo != null and lineNo != ''">
-        or LINE_NO = #{lineNo}
-      </if>
-      <if test="lineStartNodeId != null">
-        or LINE_START_NODE_ID = #{lineStartNodeId}
-      </if>
-      <if test="lineStartNodeType != null">
-        or LINE_START_NODE_TYPE = #{lineStartNodeType}
-      </if>
-      <if test="lineStartNodeDesc != null and lineStartNodeDesc != ''">
-        or LINE_START_NODE_DESC = #{lineStartNodeDesc}
-      </if>
-      <if test="linePathLength != null">
-        or LINE_PATH_LENGTH = #{linePathLength}
-      </if>
-      <if test="lineEndNodeId != null">
-        or LINE_END_NODE_ID = #{lineEndNodeId}
-      </if>
-      <if test="lineEndNodeType != null">
-        or LINE_END_NODE_TYPE = #{lineEndNodeType}
-      </if>
-      <if test="lineEndNodeDesc != null and lineEndNodeDesc != ''">
-        or LINE_END_NODE_DESC = #{lineEndNodeDesc}
-      </if>
-      <if test="lineName != null and lineName != ''">
-        or LINE_NAME = #{lineName}
-      </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="lineType != null">
-        or LINE_TYPE = #{lineType}
-      </if>
-      <if test="spellNumber != null">
-        or SPELL_NUMBER = #{spellNumber}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsLine">
-    insert into RMS_LINE (LINE_ID, LINE_NO, LINE_START_NODE_ID, 
-      LINE_START_NODE_TYPE, LINE_START_NODE_DESC, LINE_PATH_LENGTH, 
-      LINE_END_NODE_ID, LINE_END_NODE_TYPE, LINE_END_NODE_DESC, 
-      LINE_NAME, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, LINE_TYPE, SPELL_NUMBER
-      )
-    values (#{lineId,jdbcType=DECIMAL}, #{lineNo,jdbcType=VARCHAR}, #{lineStartNodeId,jdbcType=DECIMAL}, 
-      #{lineStartNodeType,jdbcType=DECIMAL}, #{lineStartNodeDesc,jdbcType=VARCHAR}, #{linePathLength,jdbcType=DECIMAL}, 
-      #{lineEndNodeId,jdbcType=DECIMAL}, #{lineEndNodeType,jdbcType=DECIMAL}, #{lineEndNodeDesc,jdbcType=VARCHAR}, 
-      #{lineName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{deleted,jdbcType=DECIMAL}, #{lineType,jdbcType=DECIMAL}, #{spellNumber,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsLine">
-    insert into RMS_LINE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="lineId != null">
-        LINE_ID,
-      </if>
-      <if test="lineNo != null">
-        LINE_NO,
-      </if>
-      <if test="lineStartNodeId != null">
-        LINE_START_NODE_ID,
-      </if>
-      <if test="lineStartNodeType != null">
-        LINE_START_NODE_TYPE,
-      </if>
-      <if test="lineStartNodeDesc != null">
-        LINE_START_NODE_DESC,
-      </if>
-      <if test="linePathLength != null">
-        LINE_PATH_LENGTH,
-      </if>
-      <if test="lineEndNodeId != null">
-        LINE_END_NODE_ID,
-      </if>
-      <if test="lineEndNodeType != null">
-        LINE_END_NODE_TYPE,
-      </if>
-      <if test="lineEndNodeDesc != null">
-        LINE_END_NODE_DESC,
-      </if>
-      <if test="lineName != null">
-        LINE_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="lineType != null">
-        LINE_TYPE,
-      </if>
-      <if test="spellNumber != null">
-        SPELL_NUMBER,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="lineId != null">
-        #{lineId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineNo != null">
-        #{lineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lineStartNodeId != null">
-        #{lineStartNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineStartNodeType != null">
-        #{lineStartNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="lineStartNodeDesc != null">
-        #{lineStartNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="linePathLength != null">
-        #{linePathLength,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeId != null">
-        #{lineEndNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeType != null">
-        #{lineEndNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeDesc != null">
-        #{lineEndNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="lineName != null">
-        #{lineName,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="lineType != null">
-        #{lineType,jdbcType=DECIMAL},
-      </if>
-      <if test="spellNumber != null">
-        #{spellNumber,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsLine">
-    update RMS_LINE
-    set LINE_NO = #{lineNo,jdbcType=VARCHAR},
-      LINE_START_NODE_ID = #{lineStartNodeId,jdbcType=DECIMAL},
-      LINE_START_NODE_TYPE = #{lineStartNodeType,jdbcType=DECIMAL},
-      LINE_START_NODE_DESC = #{lineStartNodeDesc,jdbcType=VARCHAR},
-      LINE_PATH_LENGTH = #{linePathLength,jdbcType=DECIMAL},
-      LINE_END_NODE_ID = #{lineEndNodeId,jdbcType=DECIMAL},
-      LINE_END_NODE_TYPE = #{lineEndNodeType,jdbcType=DECIMAL},
-      LINE_END_NODE_DESC = #{lineEndNodeDesc,jdbcType=VARCHAR},
-      LINE_NAME = #{lineName,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},
-      LINE_TYPE = #{lineType,jdbcType=DECIMAL},
-      SPELL_NUMBER = #{spellNumber,jdbcType=DECIMAL}
-    where LINE_ID = #{lineId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsLine">
-    update RMS_LINE
-    <set>
-      <if test="lineNo != null">
-        LINE_NO = #{lineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lineStartNodeId != null">
-        LINE_START_NODE_ID = #{lineStartNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineStartNodeType != null">
-        LINE_START_NODE_TYPE = #{lineStartNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="lineStartNodeDesc != null">
-        LINE_START_NODE_DESC = #{lineStartNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="linePathLength != null">
-        LINE_PATH_LENGTH = #{linePathLength,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeId != null">
-        LINE_END_NODE_ID = #{lineEndNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeType != null">
-        LINE_END_NODE_TYPE = #{lineEndNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="lineEndNodeDesc != null">
-        LINE_END_NODE_DESC = #{lineEndNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="lineName != null">
-        LINE_NAME = #{lineName,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="lineType != null">
-        LINE_TYPE = #{lineType,jdbcType=DECIMAL},
-      </if>
-      <if test="spellNumber != null">
-        SPELL_NUMBER = #{spellNumber,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where LINE_ID = #{lineId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where LINE_ID = #{lineId,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_LINE 
-      (LINE_ID, 
-      LINE_NO, LINE_START_NODE_ID, LINE_START_NODE_TYPE, 
-      LINE_START_NODE_DESC, LINE_PATH_LENGTH, 
-      LINE_END_NODE_ID, LINE_END_NODE_TYPE, 
-      LINE_END_NODE_DESC, LINE_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, LINE_TYPE, SPELL_NUMBER
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.lineId,jdbcType=DECIMAL}, 
-      #{item.lineNo,jdbcType=VARCHAR}, #{item.lineStartNodeId,jdbcType=DECIMAL}, #{item.lineStartNodeType,jdbcType=DECIMAL}, 
-      #{item.lineStartNodeDesc,jdbcType=VARCHAR}, #{item.linePathLength,jdbcType=DECIMAL}, 
-      #{item.lineEndNodeId,jdbcType=DECIMAL}, #{item.lineEndNodeType,jdbcType=DECIMAL}, 
-      #{item.lineEndNodeDesc,jdbcType=VARCHAR}, #{item.lineName,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.lineType,jdbcType=DECIMAL}, #{item.spellNumber,jdbcType=DECIMAL}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_LINE
-     set
-       LINE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineNo,jdbcType=VARCHAR}
-       </foreach>
-       ,LINE_START_NODE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineStartNodeId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_START_NODE_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineStartNodeType,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_START_NODE_DESC=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineStartNodeDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,LINE_PATH_LENGTH=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.linePathLength,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_END_NODE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineEndNodeId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_END_NODE_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineEndNodeType,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_END_NODE_DESC=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineEndNodeDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,LINE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.lineType,jdbcType=DECIMAL}
-       </foreach>
-       ,SPELL_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINE_ID" close="end">
-          when #{item.lineId,jdbcType=DECIMAL} then #{item.spellNumber,jdbcType=DECIMAL}
-       </foreach>
-     where LINE_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.lineId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_LINE
-    where LINE_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getAllLineDesk" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM(SELECT
-      RL.LINE_ID "lineId",
-      RL.LINE_NO "lineNo",
-      RL.SPELL_NUMBER "spellNumber",
-      RL.LINE_NAME "lineName",
-      (
-        CASE
-          WHEN RL.LINE_TYPE = 1
-            THEN '内转'
-          WHEN RL.LINE_TYPE = 2
-            THEN '销售'
-          WHEN RL.LINE_TYPE = 3
-            THEN '采购'
-          WHEN RL.LINE_TYPE = 4
-            THEN '退货'
-          END) "lineType",
-      (
-        SELECT
-          listagg ( LINK_NAME, '-' )
-                    within GROUP ( ORDER BY SEGMENT_SQE )
-        FROM RMS_LINE_SEGEMNT RLS
-               LEFT JOIN RMS_LINK RK
-                         ON RK.LINK_ID = RLS.SEGMENT_START_NODE_ID
-        WHERE RL.LINE_ID = RLS.LINE_ID
-          AND RLS.DELETED = 0
-      ) "lineDesk"
-    FROM
-      RMS_LINE RL
-    WHERE RL.DELETED = 0
-        )
-    <where>
-      <if test="lineNo != null">
-        and
-        <foreach collection="lineNo" item="item" open="(" separator="or" close=")">
-          "lineNo" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="spellNumber != null">
-        and
-        <foreach collection="spellNumber" item="item" open="(" separator="or" close=")">
-          "spellNumber" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="lineType != null">
-        and
-        <foreach collection="lineType" item="item" open="(" separator="or" close=")">
-          "lineType" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="lineDesk != null">
-        and
-        <foreach collection="lineDesk" item="item" open="(" separator="or" close=")">
-          "lineDesk" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="lineName != null">
-        and
-        <foreach collection="lineName" item="item" open="(" separator="or" close=")">
-          "lineName" like '%${item}%'
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-
-  <sql id="orderBy">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-    <if test="orderField == null  ">
-      order by "lineId" desc
-    </if>
-  </sql>
-<!--  根据运输订单号查询运输路线主表信息-->
-  <select id="getRmsLine" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-      LINE_ID "lineId",
-      LINE_NO "lineNo",
-      LINE_NAME "lineName",
-      LINE_TYPE "lineType",
-      SPELL_NUMBER "spellNumber"
-    FROM RMS_LINE
-    WHERE LINE_ID = #{lineId}
-    AND DELETED = 0
-  </select>
-
-  <select id="getOmstruckOrderNumber" parameterType="DECIMAL" resultType="int">
-    SELECT
-      count(*)
-    FROM OMSTRUCK_ORDER
-    WHERE LINE_ID = #{lineId}
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.class


+ 0 - 596
target/classes/com/steerinfo/dil/mapper/RmsLineSegemntMapper.xml

@@ -1,596 +0,0 @@
-<?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.mapper.RmsLineSegemntMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsLineSegemnt">
-    <id column="SEGMENT_ID" jdbcType="DECIMAL" property="segmentId" />
-    <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
-    <result column="LINE_SEGMENT_TYPE" jdbcType="DECIMAL" property="lineSegmentType" />
-    <result column="SEGMENT_DESC" jdbcType="VARCHAR" property="segmentDesc" />
-    <result column="SEGMENT_LINE_NO" jdbcType="VARCHAR" property="segmentLineNo" />
-    <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
-    <result column="SEGMENT_START_NODE_ID" jdbcType="DECIMAL" property="segmentStartNodeId" />
-    <result column="SEGMENT_START_NODE_TYPE" jdbcType="DECIMAL" property="segmentStartNodeType" />
-    <result column="SEGMENT_START_NODE_DESC" jdbcType="VARCHAR" property="segmentStartNodeDesc" />
-    <result column="SEGMENT_END_NODE_ID" jdbcType="DECIMAL" property="segmentEndNodeId" />
-    <result column="SEGMENT_END_NODE_TYPE" jdbcType="DECIMAL" property="segmentEndNodeType" />
-    <result column="SEGMENT_END_NODE_DESC" jdbcType="VARCHAR" property="segmentEndNodeDesc" />
-    <result column="SEGMENT_DISTANCE_VAL" jdbcType="DECIMAL" property="segmentDistanceVal" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    SEGMENT_ID, LINE_ID, LINE_SEGMENT_TYPE, SEGMENT_DESC, SEGMENT_LINE_NO, SEGMENT_SQE, 
-    SEGMENT_START_NODE_ID, SEGMENT_START_NODE_TYPE, SEGMENT_START_NODE_DESC, SEGMENT_END_NODE_ID, 
-    SEGMENT_END_NODE_TYPE, SEGMENT_END_NODE_DESC, SEGMENT_DISTANCE_VAL, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.SEGMENT_ID, t.LINE_ID, t.LINE_SEGMENT_TYPE, t.SEGMENT_DESC, t.SEGMENT_LINE_NO, 
-    t.SEGMENT_SQE, t.SEGMENT_START_NODE_ID, t.SEGMENT_START_NODE_TYPE, t.SEGMENT_START_NODE_DESC, 
-    t.SEGMENT_END_NODE_ID, t.SEGMENT_END_NODE_TYPE, t.SEGMENT_END_NODE_DESC, t.SEGMENT_DISTANCE_VAL, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_LINE_SEGEMNT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_LINE_SEGEMNT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="segmentId != null">
-        and SEGMENT_ID = #{segmentId}
-      </if>
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="lineSegmentType != null">
-        and LINE_SEGMENT_TYPE = #{lineSegmentType}
-      </if>
-      <if test="segmentDesc != null and segmentDesc != ''">
-        and SEGMENT_DESC = #{segmentDesc}
-      </if>
-      <if test="segmentLineNo != null and segmentLineNo != ''">
-        and SEGMENT_LINE_NO = #{segmentLineNo}
-      </if>
-      <if test="segmentSqe != null">
-        and SEGMENT_SQE = #{segmentSqe}
-      </if>
-      <if test="segmentStartNodeId != null">
-        and SEGMENT_START_NODE_ID = #{segmentStartNodeId}
-      </if>
-      <if test="segmentStartNodeType != null">
-        and SEGMENT_START_NODE_TYPE = #{segmentStartNodeType}
-      </if>
-      <if test="segmentStartNodeDesc != null and segmentStartNodeDesc != ''">
-        and SEGMENT_START_NODE_DESC = #{segmentStartNodeDesc}
-      </if>
-      <if test="segmentEndNodeId != null">
-        and SEGMENT_END_NODE_ID = #{segmentEndNodeId}
-      </if>
-      <if test="segmentEndNodeType != null">
-        and SEGMENT_END_NODE_TYPE = #{segmentEndNodeType}
-      </if>
-      <if test="segmentEndNodeDesc != null and segmentEndNodeDesc != ''">
-        and SEGMENT_END_NODE_DESC = #{segmentEndNodeDesc}
-      </if>
-      <if test="segmentDistanceVal != null">
-        and SEGMENT_DISTANCE_VAL = #{segmentDistanceVal}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="segmentId != null">
-        and SEGMENT_ID = #{segmentId}
-      </if>
-      <if test="lineId != null">
-        and LINE_ID = #{lineId}
-      </if>
-      <if test="lineSegmentType != null">
-        and LINE_SEGMENT_TYPE = #{lineSegmentType}
-      </if>
-      <if test="segmentDesc != null and segmentDesc != ''">
-        and SEGMENT_DESC LIKE '%${segmentDesc}%'
-      </if>
-      <if test="segmentLineNo != null and segmentLineNo != ''">
-        and SEGMENT_LINE_NO LIKE '%${segmentLineNo}%'
-      </if>
-      <if test="segmentSqe != null">
-        and SEGMENT_SQE = #{segmentSqe}
-      </if>
-      <if test="segmentStartNodeId != null">
-        and SEGMENT_START_NODE_ID = #{segmentStartNodeId}
-      </if>
-      <if test="segmentStartNodeType != null">
-        and SEGMENT_START_NODE_TYPE = #{segmentStartNodeType}
-      </if>
-      <if test="segmentStartNodeDesc != null and segmentStartNodeDesc != ''">
-        and SEGMENT_START_NODE_DESC LIKE '%${segmentStartNodeDesc}%'
-      </if>
-      <if test="segmentEndNodeId != null">
-        and SEGMENT_END_NODE_ID = #{segmentEndNodeId}
-      </if>
-      <if test="segmentEndNodeType != null">
-        and SEGMENT_END_NODE_TYPE = #{segmentEndNodeType}
-      </if>
-      <if test="segmentEndNodeDesc != null and segmentEndNodeDesc != ''">
-        and SEGMENT_END_NODE_DESC LIKE '%${segmentEndNodeDesc}%'
-      </if>
-      <if test="segmentDistanceVal != null">
-        and SEGMENT_DISTANCE_VAL = #{segmentDistanceVal}
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_LINE_SEGEMNT
-    where SEGMENT_ID = #{segmentId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_LINE_SEGEMNT
-    where 1!=1 
-      <if test="lineId != null">
-        or LINE_ID = #{lineId}
-      </if>
-      <if test="lineSegmentType != null">
-        or LINE_SEGMENT_TYPE = #{lineSegmentType}
-      </if>
-      <if test="segmentDesc != null and segmentDesc != ''">
-        or SEGMENT_DESC = #{segmentDesc}
-      </if>
-      <if test="segmentLineNo != null and segmentLineNo != ''">
-        or SEGMENT_LINE_NO = #{segmentLineNo}
-      </if>
-      <if test="segmentSqe != null">
-        or SEGMENT_SQE = #{segmentSqe}
-      </if>
-      <if test="segmentStartNodeId != null">
-        or SEGMENT_START_NODE_ID = #{segmentStartNodeId}
-      </if>
-      <if test="segmentStartNodeType != null">
-        or SEGMENT_START_NODE_TYPE = #{segmentStartNodeType}
-      </if>
-      <if test="segmentStartNodeDesc != null and segmentStartNodeDesc != ''">
-        or SEGMENT_START_NODE_DESC = #{segmentStartNodeDesc}
-      </if>
-      <if test="segmentEndNodeId != null">
-        or SEGMENT_END_NODE_ID = #{segmentEndNodeId}
-      </if>
-      <if test="segmentEndNodeType != null">
-        or SEGMENT_END_NODE_TYPE = #{segmentEndNodeType}
-      </if>
-      <if test="segmentEndNodeDesc != null and segmentEndNodeDesc != ''">
-        or SEGMENT_END_NODE_DESC = #{segmentEndNodeDesc}
-      </if>
-      <if test="segmentDistanceVal != null">
-        or SEGMENT_DISTANCE_VAL = #{segmentDistanceVal}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsLineSegemnt">
-    insert into RMS_LINE_SEGEMNT (SEGMENT_ID, LINE_ID, LINE_SEGMENT_TYPE, 
-      SEGMENT_DESC, SEGMENT_LINE_NO, SEGMENT_SQE, 
-      SEGMENT_START_NODE_ID, SEGMENT_START_NODE_TYPE, 
-      SEGMENT_START_NODE_DESC, SEGMENT_END_NODE_ID, 
-      SEGMENT_END_NODE_TYPE, SEGMENT_END_NODE_DESC, 
-      SEGMENT_DISTANCE_VAL, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    values (#{segmentId,jdbcType=DECIMAL}, #{lineId,jdbcType=DECIMAL}, #{lineSegmentType,jdbcType=DECIMAL}, 
-      #{segmentDesc,jdbcType=VARCHAR}, #{segmentLineNo,jdbcType=VARCHAR}, #{segmentSqe,jdbcType=DECIMAL}, 
-      #{segmentStartNodeId,jdbcType=DECIMAL}, #{segmentStartNodeType,jdbcType=DECIMAL}, 
-      #{segmentStartNodeDesc,jdbcType=VARCHAR}, #{segmentEndNodeId,jdbcType=DECIMAL}, 
-      #{segmentEndNodeType,jdbcType=DECIMAL}, #{segmentEndNodeDesc,jdbcType=VARCHAR}, 
-      #{segmentDistanceVal,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsLineSegemnt">
-    insert into RMS_LINE_SEGEMNT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="segmentId != null">
-        SEGMENT_ID,
-      </if>
-      <if test="lineId != null">
-        LINE_ID,
-      </if>
-      <if test="lineSegmentType != null">
-        LINE_SEGMENT_TYPE,
-      </if>
-      <if test="segmentDesc != null">
-        SEGMENT_DESC,
-      </if>
-      <if test="segmentLineNo != null">
-        SEGMENT_LINE_NO,
-      </if>
-      <if test="segmentSqe != null">
-        SEGMENT_SQE,
-      </if>
-      <if test="segmentStartNodeId != null">
-        SEGMENT_START_NODE_ID,
-      </if>
-      <if test="segmentStartNodeType != null">
-        SEGMENT_START_NODE_TYPE,
-      </if>
-      <if test="segmentStartNodeDesc != null">
-        SEGMENT_START_NODE_DESC,
-      </if>
-      <if test="segmentEndNodeId != null">
-        SEGMENT_END_NODE_ID,
-      </if>
-      <if test="segmentEndNodeType != null">
-        SEGMENT_END_NODE_TYPE,
-      </if>
-      <if test="segmentEndNodeDesc != null">
-        SEGMENT_END_NODE_DESC,
-      </if>
-      <if test="segmentDistanceVal != null">
-        SEGMENT_DISTANCE_VAL,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="segmentId != null">
-        #{segmentId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineId != null">
-        #{lineId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineSegmentType != null">
-        #{lineSegmentType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentDesc != null">
-        #{segmentDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentLineNo != null">
-        #{segmentLineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentSqe != null">
-        #{segmentSqe,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeId != null">
-        #{segmentStartNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeType != null">
-        #{segmentStartNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeDesc != null">
-        #{segmentStartNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentEndNodeId != null">
-        #{segmentEndNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentEndNodeType != null">
-        #{segmentEndNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentEndNodeDesc != null">
-        #{segmentEndNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentDistanceVal != null">
-        #{segmentDistanceVal,jdbcType=DECIMAL},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsLineSegemnt">
-    update RMS_LINE_SEGEMNT
-    set LINE_ID = #{lineId,jdbcType=DECIMAL},
-      LINE_SEGMENT_TYPE = #{lineSegmentType,jdbcType=DECIMAL},
-      SEGMENT_DESC = #{segmentDesc,jdbcType=VARCHAR},
-      SEGMENT_LINE_NO = #{segmentLineNo,jdbcType=VARCHAR},
-      SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
-      SEGMENT_START_NODE_ID = #{segmentStartNodeId,jdbcType=DECIMAL},
-      SEGMENT_START_NODE_TYPE = #{segmentStartNodeType,jdbcType=DECIMAL},
-      SEGMENT_START_NODE_DESC = #{segmentStartNodeDesc,jdbcType=VARCHAR},
-      SEGMENT_END_NODE_ID = #{segmentEndNodeId,jdbcType=DECIMAL},
-      SEGMENT_END_NODE_TYPE = #{segmentEndNodeType,jdbcType=DECIMAL},
-      SEGMENT_END_NODE_DESC = #{segmentEndNodeDesc,jdbcType=VARCHAR},
-      SEGMENT_DISTANCE_VAL = #{segmentDistanceVal,jdbcType=DECIMAL},
-      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}
-    where SEGMENT_ID = #{segmentId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsLineSegemnt">
-    update RMS_LINE_SEGEMNT
-    <set>
-      <if test="lineId != null">
-        LINE_ID = #{lineId,jdbcType=DECIMAL},
-      </if>
-      <if test="lineSegmentType != null">
-        LINE_SEGMENT_TYPE = #{lineSegmentType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentDesc != null">
-        SEGMENT_DESC = #{segmentDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentLineNo != null">
-        SEGMENT_LINE_NO = #{segmentLineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentSqe != null">
-        SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeId != null">
-        SEGMENT_START_NODE_ID = #{segmentStartNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeType != null">
-        SEGMENT_START_NODE_TYPE = #{segmentStartNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentStartNodeDesc != null">
-        SEGMENT_START_NODE_DESC = #{segmentStartNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentEndNodeId != null">
-        SEGMENT_END_NODE_ID = #{segmentEndNodeId,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentEndNodeType != null">
-        SEGMENT_END_NODE_TYPE = #{segmentEndNodeType,jdbcType=DECIMAL},
-      </if>
-      <if test="segmentEndNodeDesc != null">
-        SEGMENT_END_NODE_DESC = #{segmentEndNodeDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="segmentDistanceVal != null">
-        SEGMENT_DISTANCE_VAL = #{segmentDistanceVal,jdbcType=DECIMAL},
-      </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>
-    </set>
-    where SEGMENT_ID = #{segmentId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where SEGMENT_ID = #{segmentId,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_LINE_SEGEMNT 
-      (SEGMENT_ID, 
-      LINE_ID, LINE_SEGMENT_TYPE, SEGMENT_DESC, 
-      SEGMENT_LINE_NO, SEGMENT_SQE, SEGMENT_START_NODE_ID, 
-      SEGMENT_START_NODE_TYPE, SEGMENT_START_NODE_DESC, 
-      SEGMENT_END_NODE_ID, SEGMENT_END_NODE_TYPE, 
-      SEGMENT_END_NODE_DESC, SEGMENT_DISTANCE_VAL, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.segmentId,jdbcType=DECIMAL}, 
-      #{item.lineId,jdbcType=DECIMAL}, #{item.lineSegmentType,jdbcType=DECIMAL}, #{item.segmentDesc,jdbcType=VARCHAR}, 
-      #{item.segmentLineNo,jdbcType=VARCHAR}, #{item.segmentSqe,jdbcType=DECIMAL}, #{item.segmentStartNodeId,jdbcType=DECIMAL}, 
-      #{item.segmentStartNodeType,jdbcType=DECIMAL}, #{item.segmentStartNodeDesc,jdbcType=VARCHAR}, 
-      #{item.segmentEndNodeId,jdbcType=DECIMAL}, #{item.segmentEndNodeType,jdbcType=DECIMAL}, 
-      #{item.segmentEndNodeDesc,jdbcType=VARCHAR}, #{item.segmentDistanceVal,jdbcType=DECIMAL}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_LINE_SEGEMNT
-     set
-       SEGMENT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINE_SEGMENT_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.lineSegmentType,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_DESC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,SEGMENT_LINE_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentLineNo,jdbcType=VARCHAR}
-       </foreach>
-       ,SEGMENT_SQE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_START_NODE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentStartNodeId,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_START_NODE_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentStartNodeType,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_START_NODE_DESC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentStartNodeDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,SEGMENT_END_NODE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentEndNodeId,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_END_NODE_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentEndNodeType,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_END_NODE_DESC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentEndNodeDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,SEGMENT_DISTANCE_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.segmentDistanceVal,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEGMENT_ID" separator=" ">
-          when #{item.segmentId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where SEGMENT_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.segmentId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_LINE_SEGEMNT
-    where SEGMENT_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getRmsLineSegemnt" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-      RK.LINK_ID "linkId",
-      RK.LINK_NAME "linkName"
-    FROM RMS_LINE_SEGEMNT RLS
-           LEFT JOIN RMS_LINK RK
-                     ON RLS.SEGMENT_START_NODE_ID = RK.LINK_ID
-    WHERE RLS.LINE_ID = #{lineId}
-      AND RLS.DELETED = 0
-    ORDER BY SEGMENT_SQE
-  </select>
-<!--  根据运输路线主表id查询运输订单子表的数据-->
-  <select id="getRmsLineSegemntUpdate" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT * FROM RMS_LINE_SEGEMNT
-    WHERE LINE_ID = #{lineId}
-    AND DELETED = 0
-  </select>
-
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.class


+ 0 - 296
target/classes/com/steerinfo/dil/mapper/RmsLinkMapper.xml

@@ -1,296 +0,0 @@
-<?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.mapper.RmsLinkMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsLink">
-    <id column="LINK_ID" jdbcType="DECIMAL" property="linkId" />
-    <result column="LINK_NAME" jdbcType="VARCHAR" property="linkName" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    LINK_ID, LINK_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.LINK_ID, t.LINK_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_LINK
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_LINK t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="linkId != null">
-        and LINK_ID = #{linkId}
-      </if>
-      <if test="linkName != null and linkName != ''">
-        and LINK_NAME = #{linkName}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="linkId != null">
-        and LINK_ID = #{linkId}
-      </if>
-      <if test="linkName != null and linkName != ''">
-        and LINK_NAME LIKE '%${linkName}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_LINK
-    where LINK_ID = #{linkId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_LINK
-    where 1!=1 
-      <if test="linkName != null and linkName != ''">
-        or LINK_NAME = #{linkName}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsLink">
-    insert into RMS_LINK (LINK_ID, LINK_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED)
-    values (#{linkId,jdbcType=DECIMAL}, #{linkName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsLink">
-    insert into RMS_LINK
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="linkId != null">
-        LINK_ID,
-      </if>
-      <if test="linkName != null">
-        LINK_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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="linkId != null">
-        #{linkId,jdbcType=DECIMAL},
-      </if>
-      <if test="linkName != null">
-        #{linkName,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsLink">
-    update RMS_LINK
-    set LINK_NAME = #{linkName,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}
-    where LINK_ID = #{linkId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsLink">
-    update RMS_LINK
-    <set>
-      <if test="linkName != null">
-        LINK_NAME = #{linkName,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>
-    </set>
-    where LINK_ID = #{linkId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where LINK_ID = #{linkId,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_LINK 
-      (LINK_ID, 
-      LINK_NAME, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.linkId,jdbcType=DECIMAL}, 
-      #{item.linkName,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} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_LINK
-     set
-       LINK_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.linkId,jdbcType=DECIMAL}
-       </foreach>
-       ,LINK_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.linkName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case LINK_ID" close="end">
-          when #{item.linkId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where LINK_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.linkId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_LINK
-    where LINK_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getLink" resultType="java.util.Map">
-    SELECT
-      LINK_ID "linkId",
-      LINK_NAME "linkName"
-    FROM RMS_LINK
-    order by LINK_ID
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class


+ 0 - 700
target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -1,700 +0,0 @@
-<?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.mapper.RmsMaterialMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterial">
-        <id column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId"/>
-        <result column="UNIT_OF_MEASURE_ID" jdbcType="DECIMAL" property="unitOfMeasureId"/>
-        <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode"/>
-        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
-        <result column="MATERIAL_SPECIFICATION" jdbcType="VARCHAR" property="materialSpecification"/>
-        <result column="MATERIAL_MODEL" jdbcType="VARCHAR" property="materialModel"/>
-        <result column="MATERIAL_LENGTH" jdbcType="DECIMAL" property="materialLength"/>
-        <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="EAS_MATERIAL_ID" jdbcType="VARCHAR" property="easMaterialId"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
-        <result column="MATERIAL_THEORETICAL_WEIGHT" jdbcType="DECIMAL" property="materialTheoreticalWeight"/>
-        <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder"/>
-
-    </resultMap>
-    <sql id="columns">
-        MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID, MATERIAL_CODE, MATERIAL_NAME,
-    MATERIAL_SPECIFICATION, MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED,MATERIAL_THEORETICAL_WEIGHT,MATERIAL_ORDER
-    </sql>
-    <sql id="columns_alias">
-        t.MATERIAL_ID, t.MATERIAL_TYPE_ID, t.UNIT_OF_MEASURE_ID, t.MATERIAL_CODE, t.MATERIAL_NAME,
-    t.MATERIAL_SPECIFICATION, t.MATERIAL_MODEL, t.MATERIAL_LENGTH, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_MATERIAL_ID, 
-    t.DELETED,t.MATERIAL_THEORETICAL_WEIGHT,t.MATERIAL_ORDER
-    </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM RMS_MATERIAL
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM RMS_MATERIAL t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
-            </if>
-            <if test="materialTypeId != null">
-                and MATERIAL_TYPE_ID = #{materialTypeId}
-            </if>
-            <if test="unitOfMeasureId != null">
-                and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
-            </if>
-            <if test="materialCode != null and materialCode != ''">
-                and MATERIAL_CODE = #{materialCode}
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME = #{materialName}
-            </if>
-            <if test="materialSpecification != null and materialSpecification != ''">
-                and MATERIAL_SPECIFICATION = #{materialSpecification}
-            </if>
-            <if test="materialModel != null and materialModel != ''">
-                and MATERIAL_MODEL = #{materialModel}
-            </if>
-            <if test="materialLength != null">
-                and MATERIAL_LENGTH = #{materialLength}
-            </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="easMaterialId != null">
-                and EAS_MATERIAL_ID = #{easMaterialId}
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-            <if test="materialTheoreticalWeight !=null">
-                and MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
-            </if>
-             <if test="materialOrder !=null">
-                 and MATERIAL_ORDER = #{materialOrder}
-             </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
-            </if>
-            <if test="materialTypeId != null">
-                and MATERIAL_TYPE_ID = #{materialTypeId}
-            </if>
-            <if test="unitOfMeasureId != null">
-                and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
-            </if>
-            <if test="materialCode != null and materialCode != ''">
-                and MATERIAL_CODE LIKE '%${materialCode}%'
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME LIKE '%${materialName}%'
-            </if>
-            <if test="materialSpecification != null and materialSpecification != ''">
-                and MATERIAL_SPECIFICATION LIKE '%${materialSpecification}%'
-            </if>
-            <if test="materialModel != null and materialModel != ''">
-                and MATERIAL_MODEL LIKE '%${materialModel}%'
-            </if>
-            <if test="materialLength != null">
-                and MATERIAL_LENGTH = #{materialLength}
-            </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="easMaterialId != null">
-                and EAS_MATERIAL_ID = #{easMaterialId}
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-            <if test="materialTheoreticalWeight !=null">
-                and MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
-            </if>
-            <if test="MATERIAL_ORDER !=null">
-                and MATERIAL_ORDER = #{materialOrder}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from RMS_MATERIAL
-        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from RMS_MATERIAL
-        where 1!=1
-        <if test="materialTypeId != null">
-            or MATERIAL_TYPE_ID = #{materialTypeId}
-        </if>
-        <if test="unitOfMeasureId != null">
-            or UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
-        </if>
-        <if test="materialCode != null and materialCode != ''">
-            or MATERIAL_CODE = #{materialCode}
-        </if>
-        <if test="materialName != null and materialName != ''">
-            or MATERIAL_NAME = #{materialName}
-        </if>
-        <if test="materialSpecification != null and materialSpecification != ''">
-            or MATERIAL_SPECIFICATION = #{materialSpecification}
-        </if>
-        <if test="materialModel != null and materialModel != ''">
-            or MATERIAL_MODEL = #{materialModel}
-        </if>
-        <if test="materialLength != null">
-            or MATERIAL_LENGTH = #{materialLength}
-        </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="easMaterialId != null">
-            or EAS_MATERIAL_ID = #{easMaterialId}
-        </if>
-        <if test="deleted != null">
-            or DELETED = #{deleted}
-        </if>
-        <if test="materialTheoreticalWeight != null and materialTheoreticalWeight !=''">
-            or MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
-        </if>
-        <if test="materialOrder != null and materialOrder = ''" >
-            or MATERIAL_ORDER = #{materialOrder}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterial">
-        insert into RMS_MATERIAL (MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID,
-                                  MATERIAL_CODE, MATERIAL_NAME, MATERIAL_SPECIFICATION,
-                                  MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME,
-                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                  INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED,MATERIAL_THEORETICAL_WEIGHT,MATERIAL_ORDER)
-        values (#{materialId,jdbcType=DECIMAL}, #{materialTypeId,jdbcType=DECIMAL}, #{unitOfMeasureId,jdbcType=DECIMAL},
-                #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
-                #{materialSpecification,jdbcType=VARCHAR},
-                #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL},
-                #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
-                 #{materialTheoreticalWeight,jdbcType=DECIMAL},#{materialOrder,jdbcType=DECIMAL} )
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
-        insert into RMS_MATERIAL
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="materialId != null">
-                MATERIAL_ID,
-            </if>
-            <if test="materialTypeId != null">
-                MATERIAL_TYPE_ID,
-            </if>
-            <if test="unitOfMeasureId != null">
-                UNIT_OF_MEASURE_ID,
-            </if>
-            <if test="materialCode != null">
-                MATERIAL_CODE,
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME,
-            </if>
-            <if test="materialSpecification != null">
-                MATERIAL_SPECIFICATION,
-            </if>
-            <if test="materialModel != null">
-                MATERIAL_MODEL,
-            </if>
-            <if test="materialLength != null">
-                MATERIAL_LENGTH,
-            </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="easMaterialId != null">
-                EAS_MATERIAL_ID,
-            </if>
-            <if test="deleted != null">
-                DELETED,
-            </if>
-            <if test="materialTheoreticalWeight !=null">
-                 MATERIAL_THEORETICAL_WEIGHT,
-            </if>
-            <if test="materialOrder !=null">
-                 MATERIAL_ORDER,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="materialId != null">
-                #{materialId,jdbcType=DECIMAL},
-            </if>
-            <if test="materialTypeId != null">
-                #{materialTypeId,jdbcType=DECIMAL},
-            </if>
-            <if test="unitOfMeasureId != null">
-                #{unitOfMeasureId,jdbcType=DECIMAL},
-            </if>
-            <if test="materialCode != null">
-                #{materialCode,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialSpecification != null">
-                #{materialSpecification,jdbcType=VARCHAR},
-            </if>
-            <if test="materialModel != null">
-                #{materialModel,jdbcType=VARCHAR},
-            </if>
-            <if test="materialLength != null">
-                #{materialLength,jdbcType=DECIMAL},
-            </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="easMaterialId != null">
-                #{easMaterialId,jdbcType=VARCHAR},
-            </if>
-            <if test="deleted != null">
-                #{deleted,jdbcType=DECIMAL},
-            </if>
-            <if test="materialTheoreticalWeight !=null">
-                #{materialTheoreticalWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="materialOrder !=null">
-                 #{materialOrder,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterial">
-        update RMS_MATERIAL
-        set MATERIAL_TYPE_ID       = #{materialTypeId,jdbcType=DECIMAL},
-            UNIT_OF_MEASURE_ID     = #{unitOfMeasureId,jdbcType=DECIMAL},
-            MATERIAL_CODE          = #{materialCode,jdbcType=VARCHAR},
-            MATERIAL_NAME          = #{materialName,jdbcType=VARCHAR},
-            MATERIAL_SPECIFICATION = #{materialSpecification,jdbcType=VARCHAR},
-            MATERIAL_MODEL         = #{materialModel,jdbcType=VARCHAR},
-            MATERIAL_LENGTH        = #{materialLength,jdbcType=DECIMAL},
-            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},
-            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=VARCHAR},
-            DELETED                = #{deleted,jdbcType=DECIMAL},
-            MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
-            MATERIAL_ORDER         = #{MATERIAL_ORDER}
-        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
-        update RMS_MATERIAL
-        <set>
-            <if test="materialTypeId != null">
-                MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
-            </if>
-            <if test="unitOfMeasureId != null">
-                UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL},
-            </if>
-            <if test="materialCode != null">
-                MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialSpecification != null">
-                MATERIAL_SPECIFICATION = #{materialSpecification,jdbcType=VARCHAR},
-            </if>
-            <if test="materialModel != null">
-                MATERIAL_MODEL = #{materialModel,jdbcType=VARCHAR},
-            </if>
-            <if test="materialLength != null">
-                MATERIAL_LENGTH = #{materialLength,jdbcType=DECIMAL},
-            </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="easMaterialId != null">
-                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=VARCHAR},
-            </if>
-            <if test="deleted != null">
-                DELETED = #{deleted,jdbcType=DECIMAL},
-            </if>
-            <if test="materialTheoreticalWeight != null ">
-                 MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="materialOrder != null " >
-                 MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where MATERIAL_ID = #{materialId,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_MATERIAL
-        (MATERIAL_ID,
-        MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID,
-        MATERIAL_CODE, MATERIAL_NAME, MATERIAL_SPECIFICATION,
-        MATERIAL_MODEL, MATERIAL_LENGTH,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, EAS_MATERIAL_ID,
-        DELETED, MATERIAL_THEORETICAL_WEIGHT,MATERIAL_ORDER)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.materialId,jdbcType=DECIMAL},
-        #{item.materialTypeId,jdbcType=DECIMAL}, #{item.unitOfMeasureId,jdbcType=DECIMAL},
-        #{item.materialCode,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR},
-        #{item.materialSpecification,jdbcType=VARCHAR},
-        #{item.materialModel,jdbcType=VARCHAR}, #{item.materialLength,jdbcType=DECIMAL},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=VARCHAR},
-        #{item.deleted,jdbcType=DECIMAL},#{item.materialTheoreticalWeight,jdbcType=DECIMAL},
-        #{item.materialOrder,jdbcType=DECIMAL}
-        from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update RMS_MATERIAL
-        set
-        MATERIAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_TYPE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
-        </foreach>
-        ,UNIT_OF_MEASURE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.unitOfMeasureId,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_CODE=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialCode,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialName,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_SPECIFICATION=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialSpecification,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_MODEL=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialModel,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_LENGTH=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialLength,jdbcType=DECIMAL}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,EAS_MATERIAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_THEORETICAL_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_ORDER=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        where MATERIAL_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-            #{item.materialId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from RMS_MATERIAL
-        where MATERIAL_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示!!!-->
-    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-    <!-- 展示物资信息 -->
-    <select id="getMaterialList" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT *
-        FROM (
-        SELECT
-        RM.MATERIAL_ID AS "materialId",
-        RM.MATERIAL_CODE AS "materialCode",
-        RM.MATERIAL_NAME AS "materialName",
-        RM.MATERIAL_SPECIFICATION AS "materialSpecification",
-        RM.MATERIAL_MODEL AS "materialModel",
-        RMT.MATERIAL_TYPE_NAME AS "materialTypeName",
-        RUOM.UNIT_OF_MEASURE_NAME AS "unitOfMeasureName",
-        RM.MATERIAL_THEORETICAL_WEIGHT AS "materialTheoreticalWeight"
-        FROM RMS_MATERIAL RM
-        LEFT JOIN RMS_MATERIAL_TYPE RMT
-        ON RM.MATERIAL_TYPE_ID = RMT.MATERIAL_TYPE_ID
-        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
-        ON RM.UNIT_OF_MEASURE_ID = RUOM.UNIT_OF_MEASURE_ID
-        WHERE RM.DELETED!=1
-        ORDER BY RM.INSERT_TIME DESC
-        )
-        WHERE rownum &lt; 100
-        <where>
-            <if test="materialId!= null">
-                and
-                <foreach collection="materialId" item="item" open="(" separator="," close=")">
-                    "materialId" in #{item}
-                </foreach>
-            </if>
-            <if test="materialCode!= null">
-                and
-                <foreach collection="materialCode" item="item" open="(" separator="," close=")">
-                    "materialCode" in #{item}
-                </foreach>
-            </if>
-            <if test="materialName!= null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-
-            <if test="materialSpecification!= null">
-            and
-            <foreach collection="materialSpecification" item="item" open="(" separator="," close=")">
-                "materialSpecification" in #{item}
-            </foreach>
-        </if>
-         <if test="materialModel!= null">
-            and
-            <foreach collection="materialModel" item="item" open="(" separator="," close=")">
-                "materialModel" in #{item}
-            </foreach>
-        </if>
-            <if test="materialTypeName!= null">
-                and
-                <foreach collection="materialTypeName" item="item" open="(" separator="," close=")">
-                    "materialTypeName" in #{item}
-                </foreach>
-            </if>
-            <if test="materialQualified!= null">
-                and
-                <foreach collection="materialQualified" item="item" open="(" separator="," close=")">
-                    "materialQualified" in #{item}
-                </foreach>
-            </if>
-
-            <if test="unitOfMeasureName!= null">
-                and
-                <foreach collection="unitOfMeasureName" item="item" open="(" separator="," close=")">
-                    "unitOfMeasureName" in #{item}
-                </foreach>
-            </if>
-            <if test="materialTheoreticalWeight!= null">
-                and
-                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="," close=")">
-                    "materialTheoreticalWeight" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderBy"></include>
-    </select>
-    <sql id="orderBy">
-        <if test="orderField!=null and orderField !=''">
-            order by "${orderField}"
-            <if test="orderType !=null and orderType !=''">
-                ${orderType}
-            </if>
-        </if>
-    </sql>
-<!--根据id查询材料的详细信息-->
-    <select id="selectMaterialById" resultType="java.util.LinkedHashMap">
-        SELECT
-        RM.MATERIAL_ID AS "materialId",
-        RM.MATERIAL_CODE AS "materialCode",
-        RM.MATERIAL_NAME AS "materialName",
-        RM.MATERIAL_SPECIFICATION AS "materialSpecification",
-        RM.MATERIAL_MODEL AS "materialModel",
-        RM.MATERIAL_TYPE_ID AS "materialTypeId",
-        RM.UNIT_OF_MEASURE_ID AS "unitOfMeasureId",
-        RM.MATERIAL_THEORETICAL_WEIGHT AS "materialTheoreticalWeight"
-        FROM RMS_MATERIAL RM
-        WHERE RM.MATERIAL_ID=#{id}
-    </select>
-<!--    获取原料类型id-->
-    <select id="getMaterialTypeId" resultType="java.util.LinkedHashMap">
-        SELECT  RMT.MATERIAL_TYPE_ID "id",
-                RMT.MATERIAL_TYPE_ID "value",
-                RMT.MATERIAL_TYPE_NAME "label"
-        FROM RMS_MATERIAL_TYPE RMT
-        WHERE RMT.DELETED!=1
-    </select>
-<!--    获取计量单位Id-->
-    <select id="getUnitOfMeasureId" resultType="java.util.LinkedHashMap">
-        SELECT  RUOM.UNIT_OF_MEASURE_ID "id",
-                RUOM.UNIT_OF_MEASURE_ID "value",
-                RUom.UNIT_OF_MEASURE_NAME "label"
-        FROM RMS_UNIT_OF_MEASURE RUOM
-    </select>
-
-    <select id="getCalculateOfMaterialList" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT *
-        FROM (
-        SELECT
-        RTCM.TRUCK_CALCULATE_MATERIAL_ID AS "truckCalculateMaterialId",
-        RTCM.MATERIAL_ID AS "materialId",
-        RM.MATERIAL_NAME AS "materialName",
-        RTCM.TRUCK_CALCULATE_ID AS "truckCalculateId",
-        RTC.TRUCK_CALCULATE_NUMBER AS "truckCalculateNumber"
-        FROM RMS_TRUCK_CALCULATE RTC
-        LEFT JOIN RMS_TRUCK_CALCULATE_MATERIAL RTCM
-        ON RTC.TRUCK_CALCULATE_ID=RTCM.TRUCK_CALCULATE_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=RTCM.MATERIAL_ID
-        WHERE RTCM.DELETED!=1 and RTC.TRUCK_CALCULATE_ID=#{truckCalculateId}
-        ORDER BY RTCM.INSERT_TIME DESC
-        )
-        <where>
-            <if test="materialId!= null">
-                and
-                <foreach collection="materialId" item="item" open="(" separator="," close=")">
-                    "materialId" in #{item}
-                </foreach>
-            </if>
-            <if test="truckCalculateMaterialId!= null">
-                and
-                <foreach collection="truckCalculateMaterialId" item="item" open="(" separator="," close=")">
-                    "truckCalculateMaterialId" in #{item}
-                </foreach>
-            </if>
-            <if test="materialName!= null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber!= null">
-                and
-                <foreach collection="truckCalculateNumber" item="item" open="(" separator="," close=")">
-                    "truckCalculateNumber" in #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-    <select id="selectMaterialByCode" resultType="int" parameterType="java.lang.String">
-        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_CODE=#{materialCode} and RM.DELETED!=1
-    </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsMaterialSteelMapper.class


BIN
target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.class


+ 0 - 379
target/classes/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml

@@ -1,379 +0,0 @@
-<?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.mapper.RmsMaterialTypeMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterialType">
-    <id column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId" />
-    <result column="MATERIAL_TYPE_NAME" jdbcType="VARCHAR" property="materialTypeName" />
-    <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
-    <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_PACKING_TYPE, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_MATERIAL_TYPE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_MATERIAL_TYPE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="materialTypeId != null">
-        and MATERIAL_TYPE_ID = #{materialTypeId}
-      </if>
-      <if test="materialTypeName != null and materialTypeName != ''">
-        and MATERIAL_TYPE_NAME = #{materialTypeName}
-      </if>
-      <if test="materialUnit != null and materialUnit != ''">
-        and MATERIAL_UNIT = #{materialUnit}
-      </if>
-      <if test="materialOrder != null">
-        and MATERIAL_ORDER = #{materialOrder}
-      </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE = #{materialPackingType}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="materialTypeId != null">
-        and MATERIAL_TYPE_ID = #{materialTypeId}
-      </if>
-      <if test="materialTypeName != null and materialTypeName != ''">
-        and MATERIAL_TYPE_NAME LIKE '%${materialTypeName}%'
-      </if>
-      <if test="materialUnit != null and materialUnit != ''">
-        and MATERIAL_UNIT LIKE '%${materialUnit}%'
-      </if>
-      <if test="materialOrder != null">
-        and MATERIAL_ORDER = #{materialOrder}
-      </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE LIKE '%${materialPackingType}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-    delete from RMS_MATERIAL_TYPE
-    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_MATERIAL_TYPE
-    where 1!=1 
-      <if test="materialTypeName != null and materialTypeName != ''">
-        or MATERIAL_TYPE_NAME = #{materialTypeName}
-      </if>
-      <if test="materialUnit != null and materialUnit != ''">
-        or MATERIAL_UNIT = #{materialUnit}
-      </if>
-      <if test="materialOrder != null">
-        or MATERIAL_ORDER = #{materialOrder}
-      </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        or MATERIAL_PACKING_TYPE = #{materialPackingType}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterialType">
-    insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, 
-      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR}, 
-      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialPackingType,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterialType">
-    insert into RMS_MATERIAL_TYPE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="materialTypeId != null">
-        MATERIAL_TYPE_ID,
-      </if>
-      <if test="materialTypeName != null">
-        MATERIAL_TYPE_NAME,
-      </if>
-      <if test="materialUnit != null">
-        MATERIAL_UNIT,
-      </if>
-      <if test="materialOrder != null">
-        MATERIAL_ORDER,
-      </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="materialTypeId != null">
-        #{materialTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialTypeName != null">
-        #{materialTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialUnit != null">
-        #{materialUnit,jdbcType=VARCHAR},
-      </if>
-      <if test="materialOrder != null">
-        #{materialOrder,jdbcType=DECIMAL},
-      </if>
-      <if test="materialPackingType != null">
-        #{materialPackingType,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterialType">
-    update RMS_MATERIAL_TYPE
-    set MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
-      MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
-      MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-      MATERIAL_PACKING_TYPE = #{materialPackingType,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}
-    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterialType">
-    update RMS_MATERIAL_TYPE
-    <set>
-      <if test="materialTypeName != null">
-        MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialUnit != null">
-        MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
-      </if>
-      <if test="materialOrder != null">
-        MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-      </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE = #{materialPackingType,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>
-    </set>
-    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-    <include refid="select" />
-    where MATERIAL_TYPE_ID = #{materialTypeId,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_MATERIAL_TYPE 
-      (MATERIAL_TYPE_ID, 
-      MATERIAL_TYPE_NAME, MATERIAL_UNIT, 
-      MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.materialTypeId,jdbcType=DECIMAL}, 
-      #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialUnit,jdbcType=VARCHAR}, 
-      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialPackingType,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_MATERIAL_TYPE
-     set
-       MATERIAL_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_TYPE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeName,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_UNIT=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialUnit,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_ORDER=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_PACKING_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialPackingType,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where MATERIAL_TYPE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.materialTypeId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_MATERIAL_TYPE
-    where MATERIAL_TYPE_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-<select id="getMaterialTypeList" parameterType="java.util.Map" resultType="java.util.Map">
-  SELECT *
-  FROM
-  (
-  SELECT
-  RMT.MATERIAL_TYPE_ID AS "materialTypeId",
-  RMT.MATERIAL_TYPE_NAME AS "materialTypeName"
-  FROM
-  RMS_MATERIAL_TYPE RMT
-  )
-  WHERE rownum &lt; 100
-  <where>
-  <if test="materialTypeId!= null">
-    and
-    <foreach collection="materialTypeId" item="item" open="(" separator="," close=")">
-      "materialTypeId" in #{item}
-    </foreach>
-  </if>
-    <if test="materialTypeName!= null">
-      and
-      <foreach collection="materialTypeName" item="item" open="(" separator="," close=")">
-        "materialTypeName" in #{item}
-      </foreach>
-    </if>
-
-  </where>
-  <include refid="orderBy"></include>
-</select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.class


+ 0 - 398
target/classes/com/steerinfo/dil/mapper/RmsOilPriceMapper.xml

@@ -1,398 +0,0 @@
-<?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.mapper.RmsOilPriceMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsOilPrice">
-    <id column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
-    <result column="PRICE_OIL_NAME" jdbcType="VARCHAR" property="priceOilName" />
-    <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue" />
-    <result column="PRICE_DATE" jdbcType="TIMESTAMP" property="priceDate" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    PRICE_ID, PRICE_OIL_NAME, PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.PRICE_ID, t.PRICE_OIL_NAME, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_OIL_PRICE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_OIL_PRICE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="priceId != null">
-        and PRICE_ID = #{priceId}
-      </if>
-      <if test="priceOilName != null and priceOilName != ''">
-        and PRICE_OIL_NAME = #{priceOilName}
-      </if>
-      <if test="priceValue != null">
-        and PRICE_VALUE = #{priceValue}
-      </if>
-      <if test="priceDate != null">
-        and TO_CHAR(PRICE_DATE,'yyyy-MM-dd') = #{priceDate}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="priceId != null">
-        and PRICE_ID = #{priceId}
-      </if>
-      <if test="priceOilName != null and priceOilName != ''">
-        and PRICE_OIL_NAME LIKE '%${priceOilName}%'
-      </if>
-      <if test="priceValue != null">
-        and PRICE_VALUE = #{priceValue}
-      </if>
-      <if test="priceDate != null">
-        and TO_CHAR(PRICE_DATE,'yyyy-MM-dd') = #{priceDate}
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_OIL_PRICE
-    where PRICE_ID = #{priceId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_OIL_PRICE
-    where 1!=1 
-      <if test="priceOilName != null and priceOilName != ''">
-        or PRICE_OIL_NAME = #{priceOilName}
-      </if>
-      <if test="priceValue != null">
-        or PRICE_VALUE = #{priceValue}
-      </if>
-      <if test="priceDate != null">
-        or TO_CHAR(PRICE_DATE,'yyyy-MM-dd') = '#{priceDate}'
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsOilPrice">
-    insert into RMS_OIL_PRICE (PRICE_ID, PRICE_OIL_NAME, PRICE_VALUE, 
-      PRICE_DATE, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    values (#{priceId,jdbcType=DECIMAL}, #{priceOilName,jdbcType=VARCHAR}, #{priceValue,jdbcType=DECIMAL}, 
-      #{priceDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsOilPrice">
-    insert into RMS_OIL_PRICE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="priceId != null">
-        PRICE_ID,
-      </if>
-      <if test="priceOilName != null">
-        PRICE_OIL_NAME,
-      </if>
-      <if test="priceValue != null">
-        PRICE_VALUE,
-      </if>
-      <if test="priceDate != null">
-        PRICE_DATE,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="priceId != null">
-        #{priceId,jdbcType=DECIMAL},
-      </if>
-      <if test="priceOilName != null">
-        #{priceOilName,jdbcType=VARCHAR},
-      </if>
-      <if test="priceValue != null">
-        #{priceValue,jdbcType=DECIMAL},
-      </if>
-      <if test="priceDate != null">
-        #{priceDate,jdbcType=TIMESTAMP},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsOilPrice">
-    update RMS_OIL_PRICE
-    set PRICE_OIL_NAME = #{priceOilName,jdbcType=VARCHAR},
-      PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
-      PRICE_DATE = #{priceDate,jdbcType=TIMESTAMP},
-      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}
-    where PRICE_ID = #{priceId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective"  parameterType="com.steerinfo.dil.model.RmsOilPrice">
-    update RMS_OIL_PRICE
-    <set>
-      <if test="priceOilName != null">
-        PRICE_OIL_NAME = #{priceOilName,jdbcType=VARCHAR},
-      </if>
-      <if test="priceValue != null">
-        PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
-      </if>
-      <if test="priceDate != null">
-        PRICE_DATE = #{priceDate,jdbcType=TIMESTAMP},
-      </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>
-
-    </set>
-    where PRICE_ID = #{priceId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where PRICE_ID = #{priceId,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_OIL_PRICE 
-      (PRICE_ID, 
-      PRICE_OIL_NAME, PRICE_VALUE, PRICE_DATE, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.priceId,jdbcType=DECIMAL}, 
-      #{item.priceOilName,jdbcType=VARCHAR}, #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_OIL_PRICE
-     set
-       PRICE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
-       </foreach>
-       ,PRICE_OIL_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.priceOilName,jdbcType=VARCHAR}
-       </foreach>
-       ,PRICE_VALUE=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.priceValue,jdbcType=DECIMAL}
-       </foreach>
-       ,PRICE_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.priceDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-          when #{item.priceId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where PRICE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.priceId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_OIL_PRICE
-    where PRICE_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-
-  <!-- 油价列表 -->
-  <select id="getOilPriceList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT * FROM
-    (
-    SELECT
-    ROP.PRICE_ID AS "priceId",
-    ROP.PRICE_OIL_NAME AS "priceOilName",
-    ROP.PRICE_VALUE AS "priceValue",
-    ROP.PRICE_DATE AS "priceDate"
-    FROM RMS_OIL_PRICE ROP
-    WHERE ROP.DELETED !=1
-    ORDER BY ROP.INSERT_TIME DESC
-    )
-    <where>
-      <if test="priceId!= null">
-        and
-        <foreach collection="priceId" item="item" open="(" separator="," close=")">
-          "priceId" in #{item}
-        </foreach>
-      </if>
-      <if test="priceOilName!= null">
-        and
-        <foreach collection="priceOilName" item="item" open="(" separator="," close=")">
-          "priceOilName" in #{item}
-        </foreach>
-      </if>
-      <if test="priceValue!= null">
-        and
-        <foreach collection="priceValue" item="item" open="(" separator="," close=")">
-          "priceValue" in #{item}
-        </foreach>
-      </if>
-      <if test="priceDate!= null">
-        and
-        <foreach collection="priceDate" item="item" open="(" separator="," close=")">
-          "priceDate" in #{item}
-        </foreach>
-      </if>
-
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-
-
-
-  <!--根据Id查询油价-->
-  <select id="getOilPriceById" resultType="java.util.LinkedHashMap" >
-    SELECT
-      ROP.PRICE_ID AS "priceId",
-      ROP.PRICE_OIL_NAME AS "priceOilName",
-      ROP.PRICE_VALUE AS "priceValue",
-      ROP.PRICE_DATE AS "priceDate"
-    FROM RMS_OIL_PRICE ROP
-    WHERE ROP.PRICE_ID=#{id}
-
-  </select>
-  
-
-
-
-
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.class


+ 0 - 630
target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml

@@ -1,630 +0,0 @@
-<?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.mapper.RmsPersonnelMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsPersonnel">
-    <id column="PERSONNEL_ID" jdbcType="DECIMAL" property="personnelId" />
-    <result column="PERSONNEL_JOB_NUMBER" jdbcType="VARCHAR" property="personnelJobNumber" />
-    <result column="PERSONNEL_POST" jdbcType="VARCHAR" property="personnelPost" />
-    <result column="PERSONNEL_NAME" jdbcType="VARCHAR" property="personnelName" />
-    <result column="PERSONNEL_DEPARTMENT_ID" jdbcType="DECIMAL" property="departmentId" />
-    <result column="PERSONNEL_WORKSHOPID" jdbcType="VARCHAR" property="personnelWorkshopid" />
-    <result column="PERSONNEL_SHIFTS" jdbcType="VARCHAR" property="personnelShifts" />
-    <result column="PERSONNEL_TEAM" jdbcType="VARCHAR" property="personnelTeam" />
-    <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="EAS_PERSONNEL_ID" jdbcType="DECIMAL" property="easPersonnelId" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-    <result column="USERNAME" jdbcType="VARCHAR" property="username" />
-    <result column="PASSWORD" jdbcType="VARCHAR" property="password" />
-  </resultMap>
-  <sql id="columns">
-    PERSONNEL_ID, PERSONNEL_JOB_NUMBER, PERSONNEL_POST, PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID, PERSONNEL_WORKSHOPID,
-    PERSONNEL_SHIFTS, PERSONNEL_TEAM, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_PERSONNEL_ID, DELETED, USERNAME, PASSWORD
-  </sql>
-  <sql id="columns_alias">
-    t.PERSONNEL_ID, t.PERSONNEL_JOB_NUMBER, t.PERSONNEL_POST, t.PERSONNEL_NAME, t.PERSONNEL_DEPARTMENT_ID,
-    t.PERSONNEL_WORKSHOPID, t.PERSONNEL_SHIFTS, t.PERSONNEL_TEAM, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_PERSONNEL_ID, 
-    t.DELETED, t.USERNAME, t.PASSWORD
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_PERSONNEL
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_PERSONNEL t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="personnelId != null">
-        and PERSONNEL_ID = #{personnelId}
-      </if>
-      <if test="personnelJobNumber != null and personnelJobNumber != ''">
-        and PERSONNEL_JOB_NUMBER = #{personnelJobNumber}
-      </if>
-      <if test="personnelPost != null and personnelPost != ''">
-        and PERSONNEL_POST = #{personnelPost}
-      </if>
-      <if test="personnelName != null and personnelName != ''">
-        and PERSONNEL_NAME = #{personnelName}
-      </if>
-      <if test="departmentId != null">
-        and PERSONNEL_DEPARTMENT_ID = #{departmentId}
-      </if>
-      <if test="personnelWorkshopid != null and personnelWorkshopid != ''">
-        and PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
-      </if>
-      <if test="personnelShifts != null and personnelShifts != ''">
-        and PERSONNEL_SHIFTS = #{personnelShifts}
-      </if>
-      <if test="personnelTeam != null and personnelTeam != ''">
-        and PERSONNEL_TEAM = #{personnelTeam}
-      </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="easPersonnelId != null">
-        and EAS_PERSONNEL_ID = #{easPersonnelId}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="username != null and username != ''">
-        and USERNAME = #{username}
-      </if>
-      <if test="password != null and password != ''">
-        and PASSWORD = #{password}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="personnelId != null">
-        and PERSONNEL_ID = #{personnelId}
-      </if>
-      <if test="personnelJobNumber != null and personnelJobNumber != ''">
-        and PERSONNEL_JOB_NUMBER LIKE '%${personnelJobNumber}%'
-      </if>
-      <if test="personnelPost != null and personnelPost != ''">
-        and PERSONNEL_POST LIKE '%${personnelPost}%'
-      </if>
-      <if test="personnelName != null and personnelName != ''">
-        and PERSONNEL_NAME LIKE '%${personnelName}%'
-      </if>
-      <if test="departmentId != null">
-        and PERSONNEL_DEPARTMENT_ID = #{departmentId}
-      </if>
-      <if test="personnelWorkshopid != null and personnelWorkshopid != ''">
-        and PERSONNEL_WORKSHOPID LIKE '%${personnelWorkshopid}%'
-      </if>
-      <if test="personnelShifts != null and personnelShifts != ''">
-        and PERSONNEL_SHIFTS LIKE '%${personnelShifts}%'
-      </if>
-      <if test="personnelTeam != null and personnelTeam != ''">
-        and PERSONNEL_TEAM LIKE '%${personnelTeam}%'
-      </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="easPersonnelId != null">
-        and EAS_PERSONNEL_ID = #{easPersonnelId}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="username != null and username != ''">
-        and USERNAME LIKE '%${username}%'
-      </if>
-      <if test="password != null and password != ''">
-        and PASSWORD LIKE '%${password}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_PERSONNEL
-    where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_PERSONNEL
-    where 1!=1 
-      <if test="personnelJobNumber != null and personnelJobNumber != ''">
-        or PERSONNEL_JOB_NUMBER = #{personnelJobNumber}
-      </if>
-      <if test="personnelPost != null and personnelPost != ''">
-        or PERSONNEL_POST = #{personnelPost}
-      </if>
-      <if test="personnelName != null and personnelName != ''">
-        or PERSONNEL_NAME = #{personnelName}
-      </if>
-      <if test="departmentId != null">
-        or PERSONNEL_DEPARTMENT_ID = #{departmentId}
-      </if>
-      <if test="personnelWorkshopid != null and personnelWorkshopid != ''">
-        or PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
-      </if>
-      <if test="personnelShifts != null and personnelShifts != ''">
-        or PERSONNEL_SHIFTS = #{personnelShifts}
-      </if>
-      <if test="personnelTeam != null and personnelTeam != ''">
-        or PERSONNEL_TEAM = #{personnelTeam}
-      </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="easPersonnelId != null">
-        or EAS_PERSONNEL_ID = #{easPersonnelId}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="username != null and username != ''">
-        or USERNAME = #{username}
-      </if>
-      <if test="password != null and password != ''">
-        or PASSWORD = #{password}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPersonnel">
-    insert into RMS_PERSONNEL (PERSONNEL_ID, PERSONNEL_JOB_NUMBER, 
-      PERSONNEL_POST, PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID,
-      PERSONNEL_WORKSHOPID, PERSONNEL_SHIFTS, PERSONNEL_TEAM, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_PERSONNEL_ID, 
-      DELETED, USERNAME, PASSWORD
-      )
-    values (#{personnelId,jdbcType=DECIMAL}, #{personnelJobNumber,jdbcType=VARCHAR}, 
-      #{personnelPost,jdbcType=VARCHAR}, #{personnelName,jdbcType=VARCHAR}, #{departmentId,jdbcType=DECIMAL},
-      #{personnelWorkshopid,jdbcType=VARCHAR}, #{personnelShifts,jdbcType=VARCHAR}, #{personnelTeam,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{easPersonnelId,jdbcType=DECIMAL}, 
-      #{deleted,jdbcType=DECIMAL}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsPersonnel">
-    insert into RMS_PERSONNEL
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="personnelId != null">
-        PERSONNEL_ID,
-      </if>
-      <if test="personnelJobNumber != null">
-        PERSONNEL_JOB_NUMBER,
-      </if>
-      <if test="personnelPost != null">
-        PERSONNEL_POST,
-      </if>
-      <if test="personnelName != null">
-        PERSONNEL_NAME,
-      </if>
-      <if test="departmentId != null">
-        PERSONNEL_DEPARTMENT_ID,
-      </if>
-      <if test="personnelWorkshopid != null">
-        PERSONNEL_WORKSHOPID,
-      </if>
-      <if test="personnelShifts != null">
-        PERSONNEL_SHIFTS,
-      </if>
-      <if test="personnelTeam != null">
-        PERSONNEL_TEAM,
-      </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="easPersonnelId != null">
-        EAS_PERSONNEL_ID,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-      <if test="username != null">
-        USERNAME,
-      </if>
-      <if test="password != null">
-        PASSWORD,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="personnelId != null">
-        #{personnelId,jdbcType=DECIMAL},
-      </if>
-      <if test="personnelJobNumber != null">
-        #{personnelJobNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelPost != null">
-        #{personnelPost,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelName != null">
-        #{personnelName,jdbcType=VARCHAR},
-      </if>
-      <if test="departmentId != null">
-        #{departmentId,jdbcType=DECIMAL},
-      </if>
-      <if test="personnelWorkshopid != null">
-        #{personnelWorkshopid,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelShifts != null">
-        #{personnelShifts,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelTeam != null">
-        #{personnelTeam,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="easPersonnelId != null">
-        #{easPersonnelId,jdbcType=DECIMAL},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsPersonnel">
-    update RMS_PERSONNEL
-    set PERSONNEL_JOB_NUMBER = #{personnelJobNumber,jdbcType=VARCHAR},
-      PERSONNEL_POST = #{personnelPost,jdbcType=VARCHAR},
-      PERSONNEL_NAME = #{personnelName,jdbcType=VARCHAR},
-      PERSONNEL_DEPARTMENT_ID = #{departmentId,jdbcType=DECIMAL},
-      PERSONNEL_WORKSHOPID = #{personnelWorkshopid,jdbcType=VARCHAR},
-      PERSONNEL_SHIFTS = #{personnelShifts,jdbcType=VARCHAR},
-      PERSONNEL_TEAM = #{personnelTeam,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},
-      EAS_PERSONNEL_ID = #{easPersonnelId,jdbcType=DECIMAL},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      USERNAME = #{username,jdbcType=VARCHAR},
-      PASSWORD = #{password,jdbcType=VARCHAR}
-    where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsPersonnel">
-    update RMS_PERSONNEL
-    <set>
-      <if test="personnelJobNumber != null">
-        PERSONNEL_JOB_NUMBER = #{personnelJobNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelPost != null">
-        PERSONNEL_POST = #{personnelPost,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelName != null">
-        PERSONNEL_NAME = #{personnelName,jdbcType=VARCHAR},
-      </if>
-      <if test="departmentId != null">
-        PERSONNEL_DEPARTMENT_ID = #{departmentId,jdbcType=DECIMAL},
-      </if>
-      <if test="personnelWorkshopid != null">
-        PERSONNEL_WORKSHOPID = #{personnelWorkshopid,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelShifts != null">
-        PERSONNEL_SHIFTS = #{personnelShifts,jdbcType=VARCHAR},
-      </if>
-      <if test="personnelTeam != null">
-        PERSONNEL_TEAM = #{personnelTeam,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="easPersonnelId != null">
-        EAS_PERSONNEL_ID = #{easPersonnelId,jdbcType=DECIMAL},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="username != null">
-        USERNAME = #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        PASSWORD = #{password,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PERSONNEL_ID = #{personnelId,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_PERSONNEL 
-      (PERSONNEL_ID, 
-      PERSONNEL_JOB_NUMBER, PERSONNEL_POST, 
-      PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID, PERSONNEL_WORKSHOPID,
-      PERSONNEL_SHIFTS, PERSONNEL_TEAM, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, EAS_PERSONNEL_ID, 
-      DELETED, USERNAME, PASSWORD
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.personnelId,jdbcType=DECIMAL}, 
-      #{item.personnelJobNumber,jdbcType=VARCHAR}, #{item.personnelPost,jdbcType=VARCHAR}, 
-      #{item.personnelName,jdbcType=VARCHAR}, #{item.departmentId,jdbcType=DECIMAL}, #{item.personnelWorkshopid,jdbcType=VARCHAR},
-      #{item.personnelShifts,jdbcType=VARCHAR}, #{item.personnelTeam,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easPersonnelId,jdbcType=DECIMAL}, 
-      #{item.deleted,jdbcType=DECIMAL}, #{item.username,jdbcType=VARCHAR}, #{item.password,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_PERSONNEL
-     set
-       PERSONNEL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelId,jdbcType=DECIMAL}
-       </foreach>
-       ,PERSONNEL_JOB_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelJobNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,PERSONNEL_POST=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelPost,jdbcType=VARCHAR}
-       </foreach>
-       ,PERSONNEL_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelName,jdbcType=VARCHAR}
-       </foreach>
-       ,PERSONNEL_DEPARTMENT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.departmentId,jdbcType=DECIMAL}
-       </foreach>
-       ,PERSONNEL_WORKSHOPID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelWorkshopid,jdbcType=VARCHAR}
-       </foreach>
-       ,PERSONNEL_SHIFTS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelShifts,jdbcType=VARCHAR}
-       </foreach>
-       ,PERSONNEL_TEAM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelTeam,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,EAS_PERSONNEL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.easPersonnelId,jdbcType=DECIMAL}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.username,jdbcType=VARCHAR}
-       </foreach>
-       ,PASSWORD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
-          when #{item.personnelId,jdbcType=DECIMAL} then #{item.password,jdbcType=VARCHAR}
-       </foreach>
-     where PERSONNEL_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.personnelId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_PERSONNEL
-    where PERSONNEL_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <!-- 得到人员信息下拉 -->
-  <select id="getPersonnelList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT *
-    FROM (
-    SELECT
-    RP.PERSONNEL_ID AS "personnelId",
-    RP.PERSONNEL_JOB_NUMBER AS "personnelJobNumber",
-    RP.PERSONNEL_NAME AS "personnelName",
-    RP.PERSONNEL_POST AS "personnelPost",
-    RS.SHIPPER_NAME AS "shipperName",
-    RP.PERSONNEL_WORKSHOPID AS "personnelWorkshopid",
-    RP.PERSONNEL_SHIFTS AS "personnelShifts",
-    RS.SHIPPER_ID AS "shipperId",
-    RP.PERSONNEL_DEPARTMENT_ID AS "departmentId",
-    RP.PERSONNEL_TEAM AS "personnelTeam"
-    FROM RMS_PERSONNEL RP
-    LEFT JOIN RMS_SHIPPER RS
-    ON RP.PERSONNEL_DEPARTMENT_ID=RS.SHIPPER_ID
-    WHERE RP.DELETED != 1
-    ORDER BY RP.INSERT_TIME DESC
-    )
-    <where>
-      <if test="personnelJobNumber!= null">
-        and
-        <foreach collection="personnelJobNumber" item="item" open="(" separator="," close=")">
-          "personnelJobNumber" in #{item}
-        </foreach>
-      </if>
-      <if test="personnelName!= null">
-        and
-        <foreach collection="personnelName" item="item" open="(" separator="," close=")">
-          "personnelName" in #{item}
-        </foreach>
-      </if>
-      <if test="personnelPost!= null">
-        and
-        <foreach collection="personnelPost" item="item" open="(" separator="," close=")">
-          "personnelPost" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperName!= null">
-        and
-        <foreach collection="shipperName" item="item" open="(" separator="," close=")">
-          "shipperName" in #{item}
-        </foreach>
-      </if>
-      <if test="personnelWorkshopid!= null">
-        and
-        <foreach collection="personnelWorkshopid" item="item" open="(" separator="," close=")">
-          "personnelWorkshopld" in #{item}
-        </foreach>
-      </if>
-      <if test="personnelShifts!= null">
-        and
-        <foreach collection="personnelShifts" item="item" open="(" separator="," close=")">
-          "personnelShifts" in #{item}
-        </foreach>
-      </if>
-      <if test="departmentId!= null">
-        and
-        <foreach collection="departmentId" item="item" open="(" separator="," close=")">
-          "departmentId" in #{item}
-        </foreach>
-      </if>
-      <if test="personnelTeam!= null">
-        and
-        <foreach collection="personnelTeam" item="item" open="(" separator="," close=")">
-          "personnelTeam" in #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-
-  <!--    根据id值展示人员信息-->
-  <select id="selectPersonnelById"  resultType="java.util.LinkedHashMap">
-        SELECT
-        RP.PERSONNEL_ID AS "personnelId",
-        RP.PERSONNEL_DEPARTMENT_ID AS "departmentId",
-        RP.PERSONNEL_JOB_NUMBER AS "personnelJobNumber",
-        RP.PERSONNEL_NAME AS "personnelName",
-        RP.PERSONNEL_POST AS "personnelPost",
-        RP.PERSONNEL_WORKSHOPID AS "personnelWorkshopid",
-        RP.PERSONNEL_SHIFTS AS "personnelShifts",
-        RP.PERSONNEL_TEAM AS "personnelTeam"
-        FROM RMS_PERSONNEL RP
-        WHERE RP.PERSONNEL_ID=#{id}
-    </select>
-  <!--    获得托运人信息-->
-  <select id="getShipperId" resultType="java.util.LinkedHashMap">
-        SELECT  RS.SHIPPER_ID AS "id",
-                RS.SHIPPER_ID AS "value",
-                RS.SHIPPER_NAME AS "label"
-        FROM RMS_SHIPPER RS
-        WHERE RS.DELETED!=1
-    </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsPierMapper.class


+ 0 - 358
target/classes/com/steerinfo/dil/mapper/RmsPierMapper.xml

@@ -1,358 +0,0 @@
-<?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.mapper.RmsPierMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsPier">
-    <id column="PIER_ID" jdbcType="DECIMAL" property="pierId" />
-    <result column="PORT_ID" jdbcType="DECIMAL" property="portId" />
-    <result column="PIER_NAME" jdbcType="VARCHAR" property="pierName" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    PIER_ID, PORT_ID, PIER_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.PIER_ID, t.PORT_ID, t.PIER_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_PIER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_PIER t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="pierId != null">
-        and PIER_ID = #{pierId}
-      </if>
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="pierName != null and pierName != ''">
-        and PIER_NAME = #{pierName}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="pierId != null">
-        and PIER_ID = #{pierId}
-      </if>
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="pierName != null and pierName != ''">
-        and PIER_NAME LIKE '%${pierName}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
-    delete from RMS_PIER
-    where PIER_ID = #{pierId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_PIER
-    where 1!=1 
-      <if test="portId != null">
-        or PORT_ID = #{portId}
-      </if>
-      <if test="pierName != null and pierName != ''">
-        or PIER_NAME = #{pierName}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPier">
-    insert into RMS_PIER (PIER_ID, PORT_ID, PIER_NAME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-      )
-    values (#{pierId,jdbcType=DECIMAL}, #{portId,jdbcType=DECIMAL}, #{pierName,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsPier">
-    insert into RMS_PIER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="pierId != null">
-        PIER_ID,
-      </if>
-      <if test="portId != null">
-        PORT_ID,
-      </if>
-      <if test="pierName != null">
-        PIER_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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="pierId != null">
-        #{pierId,jdbcType=DECIMAL},
-      </if>
-      <if test="portId != null">
-        #{portId,jdbcType=DECIMAL},
-      </if>
-      <if test="pierName != null">
-        #{pierName,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsPier">
-    update RMS_PIER
-    set PORT_ID = #{portId,jdbcType=DECIMAL},
-      PIER_NAME = #{pierName,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}
-    where PIER_ID = #{pierId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsPier">
-    update RMS_PIER
-    <set>
-      <if test="portId != null">
-        PORT_ID = #{portId,jdbcType=DECIMAL},
-      </if>
-      <if test="pierName != null">
-        PIER_NAME = #{pierName,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>
-    </set>
-    where PIER_ID = #{pierId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
-    <include refid="select" />
-    where PIER_ID = #{pierId,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_PIER 
-      (PIER_ID, 
-      PORT_ID, PIER_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.pierId,jdbcType=DECIMAL}, 
-      #{item.portId,jdbcType=DECIMAL}, #{item.pierName,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} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_PIER
-     set
-       PIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.pierId,jdbcType=DECIMAL}
-       </foreach>
-       ,PORT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
-       </foreach>
-       ,PIER_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.pierName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case PIER_ID" separator=" ">
-          when #{item.pierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where PIER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.pierId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_PIER
-    where PIER_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getPier" resultType="java.util.LinkedHashMap">
-    select * from (select
-                     rp.PIER_ID "pierId",
-                     rp.PIER_NAME "pierName",
-                     rpt.PORT_NAME "portName"
-                   from RMS_PIER rp
-                          left join RMS_PORT rpt
-                                    on rpt.PORT_ID=rp.PORT_ID
-                   where rp.DELETED=0)
-  <where>
-   <if test="pierName != null">
-    and "pierName" in
-    <foreach collection="pierName" item="item" open="(" separator="," close=")">
-      #{item}
-    </foreach>
-  </if>
-     <if test="portName != null">
-    and "portName" in
-    <foreach collection="portName" item="item" open="(" separator="," close=")">
-      #{item}
-    </foreach>
-  </if>
-  </where>
-    <include refid="orderBy"></include>
-  </select>
-  <select id="getPortId" resultType="java.util.Map">
-    select
-      rpt.PORT_ID as "id" ,
-      rpt.PORT_ID as "value",
-      rpt.PORT_NAME as "label"
-    from RMS_PORT rpt
-    where rpt.DELETED=0
-  </select>
-  <sql id="orderBy">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsPortMapper.class


+ 0 - 358
target/classes/com/steerinfo/dil/mapper/RmsPortMapper.xml

@@ -1,358 +0,0 @@
-<?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.mapper.RmsPortMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsPort">
-    <id column="PORT_ID" jdbcType="DECIMAL" property="portId" />
-    <result column="PORT_TYPE_ID" jdbcType="DECIMAL" property="portTypeId" />
-    <result column="PORT_NAME" jdbcType="VARCHAR" property="portName" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    PORT_ID, PORT_TYPE_ID, PORT_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.PORT_ID, t.PORT_TYPE_ID, t.PORT_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_PORT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_PORT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="portTypeId != null">
-        and PORT_TYPE_ID = #{portTypeId}
-      </if>
-      <if test="portName != null and portName != ''">
-        and PORT_NAME = #{portName}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="portTypeId != null">
-        and PORT_TYPE_ID = #{portTypeId}
-      </if>
-      <if test="portName != null and portName != ''">
-        and PORT_NAME LIKE '%${portName}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
-    delete from RMS_PORT
-    where PORT_ID = #{portId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_PORT
-    where 1!=1 
-      <if test="portTypeId != null">
-        or PORT_TYPE_ID = #{portTypeId}
-      </if>
-      <if test="portName != null and portName != ''">
-        or PORT_NAME = #{portName}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPort">
-    insert into RMS_PORT (PORT_ID, PORT_TYPE_ID, PORT_NAME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-      )
-    values (#{portId,jdbcType=DECIMAL}, #{portTypeId,jdbcType=DECIMAL}, #{portName,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsPort">
-    insert into RMS_PORT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="portId != null">
-        PORT_ID,
-      </if>
-      <if test="portTypeId != null">
-        PORT_TYPE_ID,
-      </if>
-      <if test="portName != null">
-        PORT_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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="portId != null">
-        #{portId,jdbcType=DECIMAL},
-      </if>
-      <if test="portTypeId != null">
-        #{portTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="portName != null">
-        #{portName,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsPort">
-    update RMS_PORT
-    set PORT_TYPE_ID = #{portTypeId,jdbcType=DECIMAL},
-      PORT_NAME = #{portName,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}
-    where PORT_ID = #{portId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsPort">
-    update RMS_PORT
-    <set>
-      <if test="portTypeId != null">
-        PORT_TYPE_ID = #{portTypeId,jdbcType=DECIMAL},
-      </if>
-      <if test="portName != null">
-        PORT_NAME = #{portName,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>
-    </set>
-    where PORT_ID = #{portId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PORT_ID = #{portId,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_PORT 
-      (PORT_ID, 
-      PORT_TYPE_ID, PORT_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.portId,jdbcType=DECIMAL}, 
-      #{item.portTypeId,jdbcType=DECIMAL}, #{item.portName,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} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_PORT
-     set
-       PORT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
-       </foreach>
-       ,PORT_TYPE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.portTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,PORT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.portName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PORT_ID" close="end">
-          when #{item.portId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where PORT_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.portId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_PORT
-    where PORT_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="getPort" resultType="java.util.LinkedHashMap">
-        select * from (select
-        rp.PORT_ID "portId",
-        rp.PORT_NAME "portName",
-        rpt.PORT_TYPE_NAME "portTypeName"
-        from RMS_PORT rp
-        left join RMS_PORT_TYPE rpt
-        on rpt.PORT_TYPE_ID=rp.PORT_TYPE_ID
-        where rp.DELETED=0)
-        <where>
-          <if test="portName != null">
-              and "portName" in
-              <foreach collection="portName" item="item" open="(" separator="," close=")">
-                #{item}
-              </foreach>
-            </if>
-               <if test="portTypeName != null">
-              and "portTypeName" in
-              <foreach collection="portTypeName" item="item" open="(" separator="," close=")">
-                #{item}
-              </foreach>
-            </if>
-        </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  <select id="getPortType" resultType="java.util.Map">
-select
-       rpt.PORT_TYPE_ID as "id" ,
-       rpt.PORT_TYPE_ID as "value",
-       rpt.PORT_TYPE_NAME as "label"
-from RMS_PORT_TYPE rpt
-  </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class


+ 0 - 1103
target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml

@@ -1,1103 +0,0 @@
-<?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.mapper.RmsShipperMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsShipper">
-    <id column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
-    <result column="SHIPPER_NAME" jdbcType="VARCHAR" property="shipperName" />
-    <result column="SHIPPER_ABBREVIATION" jdbcType="VARCHAR" property="shipperAbbreviation" />
-    <result column="SHIPPER_COMPANY_BRANCH" jdbcType="VARCHAR" property="shipperCompanyBranch" />
-    <result column="SHIPPER_BRANCH_FACTORY" jdbcType="VARCHAR" property="shipperBranchFactory" />
-    <result column="SHIPPER_FACTORY_AREA" jdbcType="VARCHAR" property="shipperFactoryArea" />
-    <result column="SHIPPER_PARTITION_CODE" jdbcType="VARCHAR" property="shipperPartitionCode" />
-    <result column="SHIPPER_ADDRESS" jdbcType="VARCHAR" property="shipperAddress" />
-    <result column="SHIPPER_LEGAL_REPRESENTATIVE" jdbcType="VARCHAR" property="shipperLegalRepresentative" />
-    <result column="SHIPPER_AGENT" jdbcType="VARCHAR" property="shipperAgent" />
-    <result column="SHIPPER_CONTACT_NUMBER" jdbcType="VARCHAR" property="shipperContactNumber" />
-    <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />
-    <result column="SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="shipperAccount" />
-    <result column="SHIPPER_ACCOUNT_BLANK" jdbcType="VARCHAR" property="shipperAccountBlank" />
-    <result column="SHIPPER_REGISTER_NO" jdbcType="VARCHAR" property="shipperRegisterNo" />
-    <result column="SHIPPER_DUTY_PARAGRAPH" jdbcType="VARCHAR" property="shipperDutyParagraph" />
-    <result column="SHIPPER_POSTAL_CODE" jdbcType="VARCHAR" property="shipperPostalCode" />
-    <result column="SHIPPER_CONTACTS_NAME" jdbcType="VARCHAR" property="shipperContactsName" />
-    <result column="SHIPPER_REGISTER_CAPITAL" jdbcType="DECIMAL" property="shipperRegisterCapital" />
-    <result column="SHIPPER_BUSINESS_SCOPE" jdbcType="VARCHAR" property="shipperBusinessScope" />
-    <result column="SHIPPER_ANNUAL_DATE" jdbcType="VARCHAR" property="shipperAnnualDate" />
-    <result column="SHIPPER_COMPANY_STATUS_DESC" jdbcType="VARCHAR" property="shipperCompanyStatusDesc" />
-    <result column="SHIPPER_OPERATION_PERIOD" jdbcType="VARCHAR" property="shipperOperationPeriod" />
-    <result column="SHIPPER_REGISTER_DATE" jdbcType="TIMESTAMP" property="shipperRegisterDate" />
-    <result column="SHIPPER_REGISTER_ORGANIZATION" jdbcType="VARCHAR" property="shipperRegisterOrganization" />
-    <result column="SHIPPER_REGISTER_APTITUDES" jdbcType="VARCHAR" property="shipperRegisterAptitudes" />
-    <result column="SHIPPER_CREDENTIAL_DESC" jdbcType="VARCHAR" property="shipperCredentialDesc" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <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="SHIPPER_APPID" jdbcType="VARCHAR" property="shipperAppid" />
-    <result column="SHIPPER_SECRETKEY" jdbcType="VARCHAR" property="shipperSecretkey" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-  </resultMap>
-  <sql id="columns">
-    SHIPPER_ID, SHIPPER_NAME, SHIPPER_ABBREVIATION, SHIPPER_COMPANY_BRANCH, SHIPPER_BRANCH_FACTORY, 
-    SHIPPER_FACTORY_AREA, SHIPPER_PARTITION_CODE, SHIPPER_ADDRESS, SHIPPER_LEGAL_REPRESENTATIVE, 
-    SHIPPER_AGENT, SHIPPER_CONTACT_NUMBER, SHIPPER_FAX, SHIPPER_ACCOUNT, SHIPPER_ACCOUNT_BLANK, 
-    SHIPPER_REGISTER_NO, SHIPPER_DUTY_PARAGRAPH, SHIPPER_POSTAL_CODE, SHIPPER_CONTACTS_NAME, 
-    SHIPPER_REGISTER_CAPITAL, SHIPPER_BUSINESS_SCOPE, SHIPPER_ANNUAL_DATE, SHIPPER_COMPANY_STATUS_DESC, 
-    SHIPPER_OPERATION_PERIOD, SHIPPER_REGISTER_DATE, SHIPPER_REGISTER_ORGANIZATION, SHIPPER_REGISTER_APTITUDES, 
-    SHIPPER_CREDENTIAL_DESC, MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, SHIPPER_APPID, SHIPPER_SECRETKEY, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.SHIPPER_ID, t.SHIPPER_NAME, t.SHIPPER_ABBREVIATION, t.SHIPPER_COMPANY_BRANCH, t.SHIPPER_BRANCH_FACTORY, 
-    t.SHIPPER_FACTORY_AREA, t.SHIPPER_PARTITION_CODE, t.SHIPPER_ADDRESS, t.SHIPPER_LEGAL_REPRESENTATIVE, 
-    t.SHIPPER_AGENT, t.SHIPPER_CONTACT_NUMBER, t.SHIPPER_FAX, t.SHIPPER_ACCOUNT, t.SHIPPER_ACCOUNT_BLANK, 
-    t.SHIPPER_REGISTER_NO, t.SHIPPER_DUTY_PARAGRAPH, t.SHIPPER_POSTAL_CODE, t.SHIPPER_CONTACTS_NAME, 
-    t.SHIPPER_REGISTER_CAPITAL, t.SHIPPER_BUSINESS_SCOPE, t.SHIPPER_ANNUAL_DATE, t.SHIPPER_COMPANY_STATUS_DESC, 
-    t.SHIPPER_OPERATION_PERIOD, t.SHIPPER_REGISTER_DATE, t.SHIPPER_REGISTER_ORGANIZATION, 
-    t.SHIPPER_REGISTER_APTITUDES, t.SHIPPER_CREDENTIAL_DESC, t.MEMO, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.SHIPPER_APPID, 
-    t.SHIPPER_SECRETKEY, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_SHIPPER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_SHIPPER t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="shipperId != null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="shipperName != null and shipperName != ''">
-        and SHIPPER_NAME = #{shipperName}
-      </if>
-      <if test="shipperAbbreviation != null and shipperAbbreviation != ''">
-        and SHIPPER_ABBREVIATION = #{shipperAbbreviation}
-      </if>
-      <if test="shipperCompanyBranch != null and shipperCompanyBranch != ''">
-        and SHIPPER_COMPANY_BRANCH = #{shipperCompanyBranch}
-      </if>
-      <if test="shipperBranchFactory != null and shipperBranchFactory != ''">
-        and SHIPPER_BRANCH_FACTORY = #{shipperBranchFactory}
-      </if>
-      <if test="shipperFactoryArea != null and shipperFactoryArea != ''">
-        and SHIPPER_FACTORY_AREA = #{shipperFactoryArea}
-      </if>
-      <if test="shipperPartitionCode != null and shipperPartitionCode != ''">
-        and SHIPPER_PARTITION_CODE = #{shipperPartitionCode}
-      </if>
-      <if test="shipperAddress != null and shipperAddress != ''">
-        and SHIPPER_ADDRESS = #{shipperAddress}
-      </if>
-      <if test="shipperLegalRepresentative != null and shipperLegalRepresentative != ''">
-        and SHIPPER_LEGAL_REPRESENTATIVE = #{shipperLegalRepresentative}
-      </if>
-      <if test="shipperAgent != null and shipperAgent != ''">
-        and SHIPPER_AGENT = #{shipperAgent}
-      </if>
-      <if test="shipperContactNumber != null and shipperContactNumber != ''">
-        and SHIPPER_CONTACT_NUMBER = #{shipperContactNumber}
-      </if>
-      <if test="shipperFax != null and shipperFax != ''">
-        and SHIPPER_FAX = #{shipperFax}
-      </if>
-      <if test="shipperAccount != null and shipperAccount != ''">
-        and SHIPPER_ACCOUNT = #{shipperAccount}
-      </if>
-      <if test="shipperAccountBlank != null and shipperAccountBlank != ''">
-        and SHIPPER_ACCOUNT_BLANK = #{shipperAccountBlank}
-      </if>
-      <if test="shipperRegisterNo != null and shipperRegisterNo != ''">
-        and SHIPPER_REGISTER_NO = #{shipperRegisterNo}
-      </if>
-      <if test="shipperDutyParagraph != null and shipperDutyParagraph != ''">
-        and SHIPPER_DUTY_PARAGRAPH = #{shipperDutyParagraph}
-      </if>
-      <if test="shipperPostalCode != null and shipperPostalCode != ''">
-        and SHIPPER_POSTAL_CODE = #{shipperPostalCode}
-      </if>
-      <if test="shipperContactsName != null and shipperContactsName != ''">
-        and SHIPPER_CONTACTS_NAME = #{shipperContactsName}
-      </if>
-      <if test="shipperRegisterCapital != null">
-        and SHIPPER_REGISTER_CAPITAL = #{shipperRegisterCapital}
-      </if>
-      <if test="shipperBusinessScope != null and shipperBusinessScope != ''">
-        and SHIPPER_BUSINESS_SCOPE = #{shipperBusinessScope}
-      </if>
-      <if test="shipperAnnualDate != null and shipperAnnualDate != ''">
-        and SHIPPER_ANNUAL_DATE = #{shipperAnnualDate}
-      </if>
-      <if test="shipperCompanyStatusDesc != null and shipperCompanyStatusDesc != ''">
-        and SHIPPER_COMPANY_STATUS_DESC = #{shipperCompanyStatusDesc}
-      </if>
-      <if test="shipperOperationPeriod != null and shipperOperationPeriod != ''">
-        and SHIPPER_OPERATION_PERIOD = #{shipperOperationPeriod}
-      </if>
-      <if test="shipperRegisterDate != null">
-        and TO_CHAR(SHIPPER_REGISTER_DATE,'yyyy-MM-dd') = #{shipperRegisterDate}
-      </if>
-      <if test="shipperRegisterOrganization != null and shipperRegisterOrganization != ''">
-        and SHIPPER_REGISTER_ORGANIZATION = #{shipperRegisterOrganization}
-      </if>
-      <if test="shipperRegisterAptitudes != null and shipperRegisterAptitudes != ''">
-        and SHIPPER_REGISTER_APTITUDES = #{shipperRegisterAptitudes}
-      </if>
-      <if test="shipperCredentialDesc != null and shipperCredentialDesc != ''">
-        and SHIPPER_CREDENTIAL_DESC = #{shipperCredentialDesc}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </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="shipperAppid != null and shipperAppid != ''">
-        and SHIPPER_APPID = #{shipperAppid}
-      </if>
-      <if test="shipperSecretkey != null and shipperSecretkey != ''">
-        and SHIPPER_SECRETKEY = #{shipperSecretkey}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="shipperId != null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="shipperName != null and shipperName != ''">
-        and SHIPPER_NAME LIKE '%${shipperName}%'
-      </if>
-      <if test="shipperAbbreviation != null and shipperAbbreviation != ''">
-        and SHIPPER_ABBREVIATION LIKE '%${shipperAbbreviation}%'
-      </if>
-      <if test="shipperCompanyBranch != null and shipperCompanyBranch != ''">
-        and SHIPPER_COMPANY_BRANCH LIKE '%${shipperCompanyBranch}%'
-      </if>
-      <if test="shipperBranchFactory != null and shipperBranchFactory != ''">
-        and SHIPPER_BRANCH_FACTORY LIKE '%${shipperBranchFactory}%'
-      </if>
-      <if test="shipperFactoryArea != null and shipperFactoryArea != ''">
-        and SHIPPER_FACTORY_AREA LIKE '%${shipperFactoryArea}%'
-      </if>
-      <if test="shipperPartitionCode != null and shipperPartitionCode != ''">
-        and SHIPPER_PARTITION_CODE LIKE '%${shipperPartitionCode}%'
-      </if>
-      <if test="shipperAddress != null and shipperAddress != ''">
-        and SHIPPER_ADDRESS LIKE '%${shipperAddress}%'
-      </if>
-      <if test="shipperLegalRepresentative != null and shipperLegalRepresentative != ''">
-        and SHIPPER_LEGAL_REPRESENTATIVE LIKE '%${shipperLegalRepresentative}%'
-      </if>
-      <if test="shipperAgent != null and shipperAgent != ''">
-        and SHIPPER_AGENT LIKE '%${shipperAgent}%'
-      </if>
-      <if test="shipperContactNumber != null and shipperContactNumber != ''">
-        and SHIPPER_CONTACT_NUMBER LIKE '%${shipperContactNumber}%'
-      </if>
-      <if test="shipperFax != null and shipperFax != ''">
-        and SHIPPER_FAX LIKE '%${shipperFax}%'
-      </if>
-      <if test="shipperAccount != null and shipperAccount != ''">
-        and SHIPPER_ACCOUNT LIKE '%${shipperAccount}%'
-      </if>
-      <if test="shipperAccountBlank != null and shipperAccountBlank != ''">
-        and SHIPPER_ACCOUNT_BLANK LIKE '%${shipperAccountBlank}%'
-      </if>
-      <if test="shipperRegisterNo != null and shipperRegisterNo != ''">
-        and SHIPPER_REGISTER_NO LIKE '%${shipperRegisterNo}%'
-      </if>
-      <if test="shipperDutyParagraph != null and shipperDutyParagraph != ''">
-        and SHIPPER_DUTY_PARAGRAPH LIKE '%${shipperDutyParagraph}%'
-      </if>
-      <if test="shipperPostalCode != null and shipperPostalCode != ''">
-        and SHIPPER_POSTAL_CODE LIKE '%${shipperPostalCode}%'
-      </if>
-      <if test="shipperContactsName != null and shipperContactsName != ''">
-        and SHIPPER_CONTACTS_NAME LIKE '%${shipperContactsName}%'
-      </if>
-      <if test="shipperRegisterCapital != null">
-        and SHIPPER_REGISTER_CAPITAL = #{shipperRegisterCapital}
-      </if>
-      <if test="shipperBusinessScope != null and shipperBusinessScope != ''">
-        and SHIPPER_BUSINESS_SCOPE LIKE '%${shipperBusinessScope}%'
-      </if>
-      <if test="shipperAnnualDate != null and shipperAnnualDate != ''">
-        and SHIPPER_ANNUAL_DATE LIKE '%${shipperAnnualDate}%'
-      </if>
-      <if test="shipperCompanyStatusDesc != null and shipperCompanyStatusDesc != ''">
-        and SHIPPER_COMPANY_STATUS_DESC LIKE '%${shipperCompanyStatusDesc}%'
-      </if>
-      <if test="shipperOperationPeriod != null and shipperOperationPeriod != ''">
-        and SHIPPER_OPERATION_PERIOD LIKE '%${shipperOperationPeriod}%'
-      </if>
-      <if test="shipperRegisterDate != null">
-        and TO_CHAR(SHIPPER_REGISTER_DATE,'yyyy-MM-dd') = #{shipperRegisterDate}
-      </if>
-      <if test="shipperRegisterOrganization != null and shipperRegisterOrganization != ''">
-        and SHIPPER_REGISTER_ORGANIZATION LIKE '%${shipperRegisterOrganization}%'
-      </if>
-      <if test="shipperRegisterAptitudes != null and shipperRegisterAptitudes != ''">
-        and SHIPPER_REGISTER_APTITUDES LIKE '%${shipperRegisterAptitudes}%'
-      </if>
-      <if test="shipperCredentialDesc != null and shipperCredentialDesc != ''">
-        and SHIPPER_CREDENTIAL_DESC LIKE '%${shipperCredentialDesc}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </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="shipperAppid != null and shipperAppid != ''">
-        and SHIPPER_APPID LIKE '%${shipperAppid}%'
-      </if>
-      <if test="shipperSecretkey != null and shipperSecretkey != ''">
-        and SHIPPER_SECRETKEY LIKE '%${shipperSecretkey}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_SHIPPER
-    where SHIPPER_ID = #{shipperId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_SHIPPER
-    where 1!=1 
-      <if test="shipperName != null and shipperName != ''">
-        or SHIPPER_NAME = #{shipperName}
-      </if>
-      <if test="shipperAbbreviation != null and shipperAbbreviation != ''">
-        or SHIPPER_ABBREVIATION = #{shipperAbbreviation}
-      </if>
-      <if test="shipperCompanyBranch != null and shipperCompanyBranch != ''">
-        or SHIPPER_COMPANY_BRANCH = #{shipperCompanyBranch}
-      </if>
-      <if test="shipperBranchFactory != null and shipperBranchFactory != ''">
-        or SHIPPER_BRANCH_FACTORY = #{shipperBranchFactory}
-      </if>
-      <if test="shipperFactoryArea != null and shipperFactoryArea != ''">
-        or SHIPPER_FACTORY_AREA = #{shipperFactoryArea}
-      </if>
-      <if test="shipperPartitionCode != null and shipperPartitionCode != ''">
-        or SHIPPER_PARTITION_CODE = #{shipperPartitionCode}
-      </if>
-      <if test="shipperAddress != null and shipperAddress != ''">
-        or SHIPPER_ADDRESS = #{shipperAddress}
-      </if>
-      <if test="shipperLegalRepresentative != null and shipperLegalRepresentative != ''">
-        or SHIPPER_LEGAL_REPRESENTATIVE = #{shipperLegalRepresentative}
-      </if>
-      <if test="shipperAgent != null and shipperAgent != ''">
-        or SHIPPER_AGENT = #{shipperAgent}
-      </if>
-      <if test="shipperContactNumber != null and shipperContactNumber != ''">
-        or SHIPPER_CONTACT_NUMBER = #{shipperContactNumber}
-      </if>
-      <if test="shipperFax != null and shipperFax != ''">
-        or SHIPPER_FAX = #{shipperFax}
-      </if>
-      <if test="shipperAccount != null and shipperAccount != ''">
-        or SHIPPER_ACCOUNT = #{shipperAccount}
-      </if>
-      <if test="shipperAccountBlank != null and shipperAccountBlank != ''">
-        or SHIPPER_ACCOUNT_BLANK = #{shipperAccountBlank}
-      </if>
-      <if test="shipperRegisterNo != null and shipperRegisterNo != ''">
-        or SHIPPER_REGISTER_NO = #{shipperRegisterNo}
-      </if>
-      <if test="shipperDutyParagraph != null and shipperDutyParagraph != ''">
-        or SHIPPER_DUTY_PARAGRAPH = #{shipperDutyParagraph}
-      </if>
-      <if test="shipperPostalCode != null and shipperPostalCode != ''">
-        or SHIPPER_POSTAL_CODE = #{shipperPostalCode}
-      </if>
-      <if test="shipperContactsName != null and shipperContactsName != ''">
-        or SHIPPER_CONTACTS_NAME = #{shipperContactsName}
-      </if>
-      <if test="shipperRegisterCapital != null">
-        or SHIPPER_REGISTER_CAPITAL = #{shipperRegisterCapital}
-      </if>
-      <if test="shipperBusinessScope != null and shipperBusinessScope != ''">
-        or SHIPPER_BUSINESS_SCOPE = #{shipperBusinessScope}
-      </if>
-      <if test="shipperAnnualDate != null and shipperAnnualDate != ''">
-        or SHIPPER_ANNUAL_DATE = #{shipperAnnualDate}
-      </if>
-      <if test="shipperCompanyStatusDesc != null and shipperCompanyStatusDesc != ''">
-        or SHIPPER_COMPANY_STATUS_DESC = #{shipperCompanyStatusDesc}
-      </if>
-      <if test="shipperOperationPeriod != null and shipperOperationPeriod != ''">
-        or SHIPPER_OPERATION_PERIOD = #{shipperOperationPeriod}
-      </if>
-      <if test="shipperRegisterDate != null">
-        or TO_CHAR(SHIPPER_REGISTER_DATE,'yyyy-MM-dd') = '#{shipperRegisterDate}'
-      </if>
-      <if test="shipperRegisterOrganization != null and shipperRegisterOrganization != ''">
-        or SHIPPER_REGISTER_ORGANIZATION = #{shipperRegisterOrganization}
-      </if>
-      <if test="shipperRegisterAptitudes != null and shipperRegisterAptitudes != ''">
-        or SHIPPER_REGISTER_APTITUDES = #{shipperRegisterAptitudes}
-      </if>
-      <if test="shipperCredentialDesc != null and shipperCredentialDesc != ''">
-        or SHIPPER_CREDENTIAL_DESC = #{shipperCredentialDesc}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </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="shipperAppid != null and shipperAppid != ''">
-        or SHIPPER_APPID = #{shipperAppid}
-      </if>
-      <if test="shipperSecretkey != null and shipperSecretkey != ''">
-        or SHIPPER_SECRETKEY = #{shipperSecretkey}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsShipper">
-    insert into RMS_SHIPPER (SHIPPER_ID, SHIPPER_NAME, SHIPPER_ABBREVIATION, 
-      SHIPPER_COMPANY_BRANCH, SHIPPER_BRANCH_FACTORY, 
-      SHIPPER_FACTORY_AREA, SHIPPER_PARTITION_CODE, 
-      SHIPPER_ADDRESS, SHIPPER_LEGAL_REPRESENTATIVE, 
-      SHIPPER_AGENT, SHIPPER_CONTACT_NUMBER, SHIPPER_FAX, 
-      SHIPPER_ACCOUNT, SHIPPER_ACCOUNT_BLANK, SHIPPER_REGISTER_NO, 
-      SHIPPER_DUTY_PARAGRAPH, SHIPPER_POSTAL_CODE, 
-      SHIPPER_CONTACTS_NAME, SHIPPER_REGISTER_CAPITAL, 
-      SHIPPER_BUSINESS_SCOPE, SHIPPER_ANNUAL_DATE, 
-      SHIPPER_COMPANY_STATUS_DESC, SHIPPER_OPERATION_PERIOD, 
-      SHIPPER_REGISTER_DATE, SHIPPER_REGISTER_ORGANIZATION, 
-      SHIPPER_REGISTER_APTITUDES, SHIPPER_CREDENTIAL_DESC, 
-      MEMO, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      SHIPPER_APPID, SHIPPER_SECRETKEY, DELETED
-      )
-    values (#{shipperId,jdbcType=DECIMAL}, #{shipperName,jdbcType=VARCHAR}, #{shipperAbbreviation,jdbcType=VARCHAR}, 
-      #{shipperCompanyBranch,jdbcType=VARCHAR}, #{shipperBranchFactory,jdbcType=VARCHAR}, 
-      #{shipperFactoryArea,jdbcType=VARCHAR}, #{shipperPartitionCode,jdbcType=VARCHAR}, 
-      #{shipperAddress,jdbcType=VARCHAR}, #{shipperLegalRepresentative,jdbcType=VARCHAR}, 
-      #{shipperAgent,jdbcType=VARCHAR}, #{shipperContactNumber,jdbcType=VARCHAR}, #{shipperFax,jdbcType=VARCHAR}, 
-      #{shipperAccount,jdbcType=VARCHAR}, #{shipperAccountBlank,jdbcType=VARCHAR}, #{shipperRegisterNo,jdbcType=VARCHAR}, 
-      #{shipperDutyParagraph,jdbcType=VARCHAR}, #{shipperPostalCode,jdbcType=VARCHAR}, 
-      #{shipperContactsName,jdbcType=VARCHAR}, #{shipperRegisterCapital,jdbcType=DECIMAL}, 
-      #{shipperBusinessScope,jdbcType=VARCHAR}, #{shipperAnnualDate,jdbcType=VARCHAR}, 
-      #{shipperCompanyStatusDesc,jdbcType=VARCHAR}, #{shipperOperationPeriod,jdbcType=VARCHAR}, 
-      #{shipperRegisterDate,jdbcType=TIMESTAMP}, #{shipperRegisterOrganization,jdbcType=VARCHAR}, 
-      #{shipperRegisterAptitudes,jdbcType=VARCHAR}, #{shipperCredentialDesc,jdbcType=VARCHAR}, 
-      #{memo,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{shipperAppid,jdbcType=VARCHAR}, #{shipperSecretkey,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsShipper">
-    insert into RMS_SHIPPER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="shipperId != null">
-        SHIPPER_ID,
-      </if>
-      <if test="shipperName != null">
-        SHIPPER_NAME,
-      </if>
-      <if test="shipperAbbreviation != null">
-        SHIPPER_ABBREVIATION,
-      </if>
-      <if test="shipperCompanyBranch != null">
-        SHIPPER_COMPANY_BRANCH,
-      </if>
-      <if test="shipperBranchFactory != null">
-        SHIPPER_BRANCH_FACTORY,
-      </if>
-      <if test="shipperFactoryArea != null">
-        SHIPPER_FACTORY_AREA,
-      </if>
-      <if test="shipperPartitionCode != null">
-        SHIPPER_PARTITION_CODE,
-      </if>
-      <if test="shipperAddress != null">
-        SHIPPER_ADDRESS,
-      </if>
-      <if test="shipperLegalRepresentative != null">
-        SHIPPER_LEGAL_REPRESENTATIVE,
-      </if>
-      <if test="shipperAgent != null">
-        SHIPPER_AGENT,
-      </if>
-      <if test="shipperContactNumber != null">
-        SHIPPER_CONTACT_NUMBER,
-      </if>
-      <if test="shipperFax != null">
-        SHIPPER_FAX,
-      </if>
-      <if test="shipperAccount != null">
-        SHIPPER_ACCOUNT,
-      </if>
-      <if test="shipperAccountBlank != null">
-        SHIPPER_ACCOUNT_BLANK,
-      </if>
-      <if test="shipperRegisterNo != null">
-        SHIPPER_REGISTER_NO,
-      </if>
-      <if test="shipperDutyParagraph != null">
-        SHIPPER_DUTY_PARAGRAPH,
-      </if>
-      <if test="shipperPostalCode != null">
-        SHIPPER_POSTAL_CODE,
-      </if>
-      <if test="shipperContactsName != null">
-        SHIPPER_CONTACTS_NAME,
-      </if>
-      <if test="shipperRegisterCapital != null">
-        SHIPPER_REGISTER_CAPITAL,
-      </if>
-      <if test="shipperBusinessScope != null">
-        SHIPPER_BUSINESS_SCOPE,
-      </if>
-      <if test="shipperAnnualDate != null">
-        SHIPPER_ANNUAL_DATE,
-      </if>
-      <if test="shipperCompanyStatusDesc != null">
-        SHIPPER_COMPANY_STATUS_DESC,
-      </if>
-      <if test="shipperOperationPeriod != null">
-        SHIPPER_OPERATION_PERIOD,
-      </if>
-      <if test="shipperRegisterDate != null">
-        SHIPPER_REGISTER_DATE,
-      </if>
-      <if test="shipperRegisterOrganization != null">
-        SHIPPER_REGISTER_ORGANIZATION,
-      </if>
-      <if test="shipperRegisterAptitudes != null">
-        SHIPPER_REGISTER_APTITUDES,
-      </if>
-      <if test="shipperCredentialDesc != null">
-        SHIPPER_CREDENTIAL_DESC,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </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="shipperAppid != null">
-        SHIPPER_APPID,
-      </if>
-      <if test="shipperSecretkey != null">
-        SHIPPER_SECRETKEY,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="shipperId != null">
-        #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="shipperName != null">
-        #{shipperName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAbbreviation != null">
-        #{shipperAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCompanyBranch != null">
-        #{shipperCompanyBranch,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperBranchFactory != null">
-        #{shipperBranchFactory,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperFactoryArea != null">
-        #{shipperFactoryArea,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperPartitionCode != null">
-        #{shipperPartitionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAddress != null">
-        #{shipperAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperLegalRepresentative != null">
-        #{shipperLegalRepresentative,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAgent != null">
-        #{shipperAgent,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperContactNumber != null">
-        #{shipperContactNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperFax != null">
-        #{shipperFax,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAccount != null">
-        #{shipperAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAccountBlank != null">
-        #{shipperAccountBlank,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterNo != null">
-        #{shipperRegisterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperDutyParagraph != null">
-        #{shipperDutyParagraph,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperPostalCode != null">
-        #{shipperPostalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperContactsName != null">
-        #{shipperContactsName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterCapital != null">
-        #{shipperRegisterCapital,jdbcType=DECIMAL},
-      </if>
-      <if test="shipperBusinessScope != null">
-        #{shipperBusinessScope,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAnnualDate != null">
-        #{shipperAnnualDate,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCompanyStatusDesc != null">
-        #{shipperCompanyStatusDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperOperationPeriod != null">
-        #{shipperOperationPeriod,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterDate != null">
-        #{shipperRegisterDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shipperRegisterOrganization != null">
-        #{shipperRegisterOrganization,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterAptitudes != null">
-        #{shipperRegisterAptitudes,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCredentialDesc != null">
-        #{shipperCredentialDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,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="shipperAppid != null">
-        #{shipperAppid,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperSecretkey != null">
-        #{shipperSecretkey,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsShipper">
-    update RMS_SHIPPER
-    set SHIPPER_NAME = #{shipperName,jdbcType=VARCHAR},
-      SHIPPER_ABBREVIATION = #{shipperAbbreviation,jdbcType=VARCHAR},
-      SHIPPER_COMPANY_BRANCH = #{shipperCompanyBranch,jdbcType=VARCHAR},
-      SHIPPER_BRANCH_FACTORY = #{shipperBranchFactory,jdbcType=VARCHAR},
-      SHIPPER_FACTORY_AREA = #{shipperFactoryArea,jdbcType=VARCHAR},
-      SHIPPER_PARTITION_CODE = #{shipperPartitionCode,jdbcType=VARCHAR},
-      SHIPPER_ADDRESS = #{shipperAddress,jdbcType=VARCHAR},
-      SHIPPER_LEGAL_REPRESENTATIVE = #{shipperLegalRepresentative,jdbcType=VARCHAR},
-      SHIPPER_AGENT = #{shipperAgent,jdbcType=VARCHAR},
-      SHIPPER_CONTACT_NUMBER = #{shipperContactNumber,jdbcType=VARCHAR},
-      SHIPPER_FAX = #{shipperFax,jdbcType=VARCHAR},
-      SHIPPER_ACCOUNT = #{shipperAccount,jdbcType=VARCHAR},
-      SHIPPER_ACCOUNT_BLANK = #{shipperAccountBlank,jdbcType=VARCHAR},
-      SHIPPER_REGISTER_NO = #{shipperRegisterNo,jdbcType=VARCHAR},
-      SHIPPER_DUTY_PARAGRAPH = #{shipperDutyParagraph,jdbcType=VARCHAR},
-      SHIPPER_POSTAL_CODE = #{shipperPostalCode,jdbcType=VARCHAR},
-      SHIPPER_CONTACTS_NAME = #{shipperContactsName,jdbcType=VARCHAR},
-      SHIPPER_REGISTER_CAPITAL = #{shipperRegisterCapital,jdbcType=DECIMAL},
-      SHIPPER_BUSINESS_SCOPE = #{shipperBusinessScope,jdbcType=VARCHAR},
-      SHIPPER_ANNUAL_DATE = #{shipperAnnualDate,jdbcType=VARCHAR},
-      SHIPPER_COMPANY_STATUS_DESC = #{shipperCompanyStatusDesc,jdbcType=VARCHAR},
-      SHIPPER_OPERATION_PERIOD = #{shipperOperationPeriod,jdbcType=VARCHAR},
-      SHIPPER_REGISTER_DATE = #{shipperRegisterDate,jdbcType=TIMESTAMP},
-      SHIPPER_REGISTER_ORGANIZATION = #{shipperRegisterOrganization,jdbcType=VARCHAR},
-      SHIPPER_REGISTER_APTITUDES = #{shipperRegisterAptitudes,jdbcType=VARCHAR},
-      SHIPPER_CREDENTIAL_DESC = #{shipperCredentialDesc,jdbcType=VARCHAR},
-      MEMO = #{memo,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},
-      SHIPPER_APPID = #{shipperAppid,jdbcType=VARCHAR},
-      SHIPPER_SECRETKEY = #{shipperSecretkey,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where SHIPPER_ID = #{shipperId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsShipper">
-    update RMS_SHIPPER
-    <set>
-      <if test="shipperName != null">
-        SHIPPER_NAME = #{shipperName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAbbreviation != null">
-        SHIPPER_ABBREVIATION = #{shipperAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCompanyBranch != null">
-        SHIPPER_COMPANY_BRANCH = #{shipperCompanyBranch,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperBranchFactory != null">
-        SHIPPER_BRANCH_FACTORY = #{shipperBranchFactory,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperFactoryArea != null">
-        SHIPPER_FACTORY_AREA = #{shipperFactoryArea,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperPartitionCode != null">
-        SHIPPER_PARTITION_CODE = #{shipperPartitionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAddress != null">
-        SHIPPER_ADDRESS = #{shipperAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperLegalRepresentative != null">
-        SHIPPER_LEGAL_REPRESENTATIVE = #{shipperLegalRepresentative,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAgent != null">
-        SHIPPER_AGENT = #{shipperAgent,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperContactNumber != null">
-        SHIPPER_CONTACT_NUMBER = #{shipperContactNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperFax != null">
-        SHIPPER_FAX = #{shipperFax,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAccount != null">
-        SHIPPER_ACCOUNT = #{shipperAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAccountBlank != null">
-        SHIPPER_ACCOUNT_BLANK = #{shipperAccountBlank,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterNo != null">
-        SHIPPER_REGISTER_NO = #{shipperRegisterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperDutyParagraph != null">
-        SHIPPER_DUTY_PARAGRAPH = #{shipperDutyParagraph,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperPostalCode != null">
-        SHIPPER_POSTAL_CODE = #{shipperPostalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperContactsName != null">
-        SHIPPER_CONTACTS_NAME = #{shipperContactsName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterCapital != null">
-        SHIPPER_REGISTER_CAPITAL = #{shipperRegisterCapital,jdbcType=DECIMAL},
-      </if>
-      <if test="shipperBusinessScope != null">
-        SHIPPER_BUSINESS_SCOPE = #{shipperBusinessScope,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAnnualDate != null">
-        SHIPPER_ANNUAL_DATE = #{shipperAnnualDate,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCompanyStatusDesc != null">
-        SHIPPER_COMPANY_STATUS_DESC = #{shipperCompanyStatusDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperOperationPeriod != null">
-        SHIPPER_OPERATION_PERIOD = #{shipperOperationPeriod,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterDate != null">
-        SHIPPER_REGISTER_DATE = #{shipperRegisterDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shipperRegisterOrganization != null">
-        SHIPPER_REGISTER_ORGANIZATION = #{shipperRegisterOrganization,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperRegisterAptitudes != null">
-        SHIPPER_REGISTER_APTITUDES = #{shipperRegisterAptitudes,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCredentialDesc != null">
-        SHIPPER_CREDENTIAL_DESC = #{shipperCredentialDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,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="shipperAppid != null">
-        SHIPPER_APPID = #{shipperAppid,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperSecretkey != null">
-        SHIPPER_SECRETKEY = #{shipperSecretkey,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where SHIPPER_ID = #{shipperId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where SHIPPER_ID = #{shipperId,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_SHIPPER 
-      (SHIPPER_ID, 
-      SHIPPER_NAME, SHIPPER_ABBREVIATION, 
-      SHIPPER_COMPANY_BRANCH, SHIPPER_BRANCH_FACTORY, 
-      SHIPPER_FACTORY_AREA, SHIPPER_PARTITION_CODE, 
-      SHIPPER_ADDRESS, SHIPPER_LEGAL_REPRESENTATIVE, 
-      SHIPPER_AGENT, SHIPPER_CONTACT_NUMBER, 
-      SHIPPER_FAX, SHIPPER_ACCOUNT, SHIPPER_ACCOUNT_BLANK, 
-      SHIPPER_REGISTER_NO, SHIPPER_DUTY_PARAGRAPH, 
-      SHIPPER_POSTAL_CODE, SHIPPER_CONTACTS_NAME, 
-      SHIPPER_REGISTER_CAPITAL, SHIPPER_BUSINESS_SCOPE, 
-      SHIPPER_ANNUAL_DATE, SHIPPER_COMPANY_STATUS_DESC, 
-      SHIPPER_OPERATION_PERIOD, SHIPPER_REGISTER_DATE, 
-      SHIPPER_REGISTER_ORGANIZATION, SHIPPER_REGISTER_APTITUDES, 
-      SHIPPER_CREDENTIAL_DESC, MEMO, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, SHIPPER_APPID, 
-      SHIPPER_SECRETKEY, DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.shipperId,jdbcType=DECIMAL}, 
-      #{item.shipperName,jdbcType=VARCHAR}, #{item.shipperAbbreviation,jdbcType=VARCHAR}, 
-      #{item.shipperCompanyBranch,jdbcType=VARCHAR}, #{item.shipperBranchFactory,jdbcType=VARCHAR}, 
-      #{item.shipperFactoryArea,jdbcType=VARCHAR}, #{item.shipperPartitionCode,jdbcType=VARCHAR}, 
-      #{item.shipperAddress,jdbcType=VARCHAR}, #{item.shipperLegalRepresentative,jdbcType=VARCHAR}, 
-      #{item.shipperAgent,jdbcType=VARCHAR}, #{item.shipperContactNumber,jdbcType=VARCHAR}, 
-      #{item.shipperFax,jdbcType=VARCHAR}, #{item.shipperAccount,jdbcType=VARCHAR}, #{item.shipperAccountBlank,jdbcType=VARCHAR}, 
-      #{item.shipperRegisterNo,jdbcType=VARCHAR}, #{item.shipperDutyParagraph,jdbcType=VARCHAR}, 
-      #{item.shipperPostalCode,jdbcType=VARCHAR}, #{item.shipperContactsName,jdbcType=VARCHAR}, 
-      #{item.shipperRegisterCapital,jdbcType=DECIMAL}, #{item.shipperBusinessScope,jdbcType=VARCHAR}, 
-      #{item.shipperAnnualDate,jdbcType=VARCHAR}, #{item.shipperCompanyStatusDesc,jdbcType=VARCHAR}, 
-      #{item.shipperOperationPeriod,jdbcType=VARCHAR}, #{item.shipperRegisterDate,jdbcType=TIMESTAMP}, 
-      #{item.shipperRegisterOrganization,jdbcType=VARCHAR}, #{item.shipperRegisterAptitudes,jdbcType=VARCHAR}, 
-      #{item.shipperCredentialDesc,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.shipperAppid,jdbcType=VARCHAR}, 
-      #{item.shipperSecretkey,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_SHIPPER
-     set
-       SHIPPER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
-       </foreach>
-       ,SHIPPER_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperName,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ABBREVIATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAbbreviation,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_COMPANY_BRANCH=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperCompanyBranch,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_BRANCH_FACTORY=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperBranchFactory,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_FACTORY_AREA=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperFactoryArea,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_PARTITION_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperPartitionCode,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_LEGAL_REPRESENTATIVE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperLegalRepresentative,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_AGENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAgent,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_CONTACT_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperContactNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_FAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperFax,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ACCOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAccount,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ACCOUNT_BLANK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAccountBlank,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_REGISTER_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperRegisterNo,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_DUTY_PARAGRAPH=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperDutyParagraph,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_POSTAL_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperPostalCode,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_CONTACTS_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperContactsName,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_REGISTER_CAPITAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperRegisterCapital,jdbcType=DECIMAL}
-       </foreach>
-       ,SHIPPER_BUSINESS_SCOPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperBusinessScope,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ANNUAL_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAnnualDate,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_COMPANY_STATUS_DESC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperCompanyStatusDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_OPERATION_PERIOD=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperOperationPeriod,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_REGISTER_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperRegisterDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SHIPPER_REGISTER_ORGANIZATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperRegisterOrganization,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_REGISTER_APTITUDES=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperRegisterAptitudes,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_CREDENTIAL_DESC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperCredentialDesc,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_APPID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperAppid,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_SECRETKEY=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.shipperSecretkey,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-          when #{item.shipperId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where SHIPPER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.shipperId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_SHIPPER
-    where SHIPPER_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <!--  展示托运人信息-->
-  <select id="getShipperList" parameterType="java.util.Map" resultType="java.util.Map">
-    select * from
-    (
-    select
-    RS.SHIPPER_ID as "shipperId",
-    RS.SHIPPER_NAME as "shipperName",
-    RS.SHIPPER_ABBREVIATION as "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH as "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY as "shipperBranchFactory"
-    from  RMS_SHIPPER RS
-    where RS.DELETED !=1
-    ORDER BY RS.INSERT_TIME DESC
-    )
-    <where>
-      <if test="shipperId!= null">
-        and
-        <foreach collection="shipperId" item="item" open="(" separator="," close=")">
-          "shipperId" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperName!= null">
-        and
-        <foreach collection="shipperName" item="item" open="(" separator="," close=")">
-          "shipperName" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperAbbreviation!= null">
-        and
-        <foreach collection="shipperAbbreviation" item="item" open="(" separator="," close=")">
-          "shipperAbbreviation" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
-        and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  <!--  根据id值获取托运人信息-->
-  <select id="selectShipperById" resultType="java.util.LinkedHashMap">
-    select
-    RS.SHIPPER_ID as "shipperId",
-    RS.SHIPPER_NAME as "shipperName",
-    RS.SHIPPER_ABBREVIATION as "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH as "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY as "shipperBranchFactory"
-    from RMS_SHIPPER RS
-    where RS.SHIPPER_ID=#{id}
-    and RS.DELETED != 1
-  </select>
-
-    <select id="selectByParametersCompanyBranch" resultType="java.lang.Integer">
-      SELECT count(*)
-        FROM RMS_SHIPPER RS
-        WHERE  RS.SHIPPER_COMPANY_BRANCH =#{shipperCompanyBranch}
-        AND RS.DELETED=0
-    </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class


+ 0 - 955
target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

@@ -1,955 +0,0 @@
-<?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.mapper.RmsSupplierMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsSupplier">
-    <id column="SUPPLIER_ID" jdbcType="DECIMAL" property="supplierId" />
-    <result column="SUPPLIER_NAME" jdbcType="VARCHAR" property="supplierName" />
-    <result column="SUPPLIER_ABBREVIATION" jdbcType="VARCHAR" property="supplierAbbreviation" />
-    <result column="SUPPLIER_ADDRESS" jdbcType="VARCHAR" property="supplierAddress" />
-    <result column="SUPPLIER_LEGAL_REPRESENTATIVE" jdbcType="VARCHAR" property="supplierLegalRepresentative" />
-    <result column="SUPPLIER_REGISTER_NO" jdbcType="VARCHAR" property="supplierRegisterNo" />
-    <result column="SUPPLIER_AGENT" jdbcType="VARCHAR" property="supplierAgent" />
-    <result column="SUPPLIER_CONTACT_NUMBER" jdbcType="VARCHAR" property="supplierContactNumber" />
-    <result column="SUPPLIER_FAX" jdbcType="VARCHAR" property="supplierFax" />
-    <result column="SUPPLIER_ACCOUNT" jdbcType="VARCHAR" property="supplierAccount" />
-    <result column="SUPPLIER_ACCOUNT_BLANK" jdbcType="VARCHAR" property="supplierAccountBlank" />
-    <result column="SUPPLIER_DUTY_PARAGRAPH" jdbcType="VARCHAR" property="supplierDutyParagraph" />
-    <result column="SUPPLIER_POSTAL_CODE" jdbcType="VARCHAR" property="supplierPostalCode" />
-    <result column="SUPPLIER_REGISTER_CAPITAL" jdbcType="VARCHAR" property="supplierRegisterCapital" />
-    <result column="SUPPLIERBUSINESS_SCOPE" jdbcType="VARCHAR" property="supplierbusinessScope" />
-    <result column="SUPPLIER_COMPANY_STATUS" jdbcType="VARCHAR" property="supplierCompanyStatus" />
-    <result column="SUPPLIER_OPERATION_PERIOD" jdbcType="VARCHAR" property="supplierOperationPeriod" />
-    <result column="SUPPLIER_REGISTER_DATE" jdbcType="TIMESTAMP" property="supplierRegisterDate" />
-    <result column="SUPPLIER_REGISTER_ORGANIZATION" jdbcType="VARCHAR" property="supplierRegisterOrganization" />
-    <result column="SUPPLIER_REGISTER_APTITUDES" jdbcType="VARCHAR" property="supplierRegisterAptitudes" />
-    <result column="SUPPLIER_CREDENTIAL" jdbcType="VARCHAR" property="supplierCredential" />
-    <result column="SUPPLIER_CONTACTS_NAME" jdbcType="VARCHAR" property="supplierContactsName" />
-    <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="SUPPLIER_BUSINESS_LICENSE" jdbcType="BLOB" property="supplierBusinessLicense" />
-    <result column="SUPPLIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="supplierBusinessAblelicense" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-  </resultMap>
-  <sql id="columns">
-    SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-    SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, SUPPLIER_ACCOUNT, 
-    SUPPLIER_ACCOUNT_BLANK, SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, SUPPLIER_REGISTER_CAPITAL, 
-    SUPPLIERBUSINESS_SCOPE, SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, SUPPLIER_REGISTER_DATE, 
-    SUPPLIER_REGISTER_ORGANIZATION, SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-    SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE,DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.SUPPLIER_ID, t.SUPPLIER_NAME, t.SUPPLIER_ABBREVIATION, t.SUPPLIER_ADDRESS, t.SUPPLIER_LEGAL_REPRESENTATIVE, 
-    t.SUPPLIER_REGISTER_NO, t.SUPPLIER_AGENT, t.SUPPLIER_CONTACT_NUMBER, t.SUPPLIER_FAX, 
-    t.SUPPLIER_ACCOUNT, t.SUPPLIER_ACCOUNT_BLANK, t.SUPPLIER_DUTY_PARAGRAPH, t.SUPPLIER_POSTAL_CODE, 
-    t.SUPPLIER_REGISTER_CAPITAL, t.SUPPLIERBUSINESS_SCOPE, t.SUPPLIER_COMPANY_STATUS, 
-    t.SUPPLIER_OPERATION_PERIOD, t.SUPPLIER_REGISTER_DATE, t.SUPPLIER_REGISTER_ORGANIZATION, 
-    t.SUPPLIER_REGISTER_APTITUDES, t.SUPPLIER_CREDENTIAL, t.SUPPLIER_CONTACTS_NAME, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.SUPPLIER_BUSINESS_LICENSE, 
-    t.SUPPLIER_BUSINESS_ABLELICENSE,t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RMS_SUPPLIER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RMS_SUPPLIER t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="supplierId != null">
-        and SUPPLIER_ID = #{supplierId}
-      </if>
-      <if test="supplierName != null and supplierName != ''">
-        and SUPPLIER_NAME = #{supplierName}
-      </if>
-      <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
-        and SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
-      </if>
-      <if test="supplierAddress != null and supplierAddress != ''">
-        and SUPPLIER_ADDRESS = #{supplierAddress}
-      </if>
-      <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
-        and SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
-      </if>
-      <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
-        and SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
-      </if>
-      <if test="supplierAgent != null and supplierAgent != ''">
-        and SUPPLIER_AGENT = #{supplierAgent}
-      </if>
-      <if test="supplierContactNumber != null and supplierContactNumber != ''">
-        and SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
-      </if>
-      <if test="supplierFax != null and supplierFax != ''">
-        and SUPPLIER_FAX = #{supplierFax}
-      </if>
-      <if test="supplierAccount != null and supplierAccount != ''">
-        and SUPPLIER_ACCOUNT = #{supplierAccount}
-      </if>
-      <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
-        and SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
-      </if>
-      <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
-        and SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
-      </if>
-      <if test="supplierPostalCode != null and supplierPostalCode != ''">
-        and SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
-      </if>
-      <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
-        and SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
-      </if>
-      <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
-        and SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
-      </if>
-      <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
-        and SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
-      </if>
-      <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
-        and SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
-      </if>
-      <if test="supplierRegisterDate != null">
-        and TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = #{supplierRegisterDate}
-      </if>
-      <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
-        and SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
-      </if>
-      <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
-        and SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
-      </if>
-      <if test="supplierCredential != null and supplierCredential != ''">
-        and SUPPLIER_CREDENTIAL = #{supplierCredential}
-      </if>
-      <if test="supplierContactsName != null and supplierContactsName != ''">
-        and SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
-      </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="supplierBusinessLicense != null">
-        and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        and SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="supplierId != null">
-        and SUPPLIER_ID = #{supplierId}
-      </if>
-      <if test="supplierName != null and supplierName != ''">
-        and SUPPLIER_NAME LIKE '%${supplierName}%'
-      </if>
-      <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
-        and SUPPLIER_ABBREVIATION LIKE '%${supplierAbbreviation}%'
-      </if>
-      <if test="supplierAddress != null and supplierAddress != ''">
-        and SUPPLIER_ADDRESS LIKE '%${supplierAddress}%'
-      </if>
-      <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
-        and SUPPLIER_LEGAL_REPRESENTATIVE LIKE '%${supplierLegalRepresentative}%'
-      </if>
-      <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
-        and SUPPLIER_REGISTER_NO LIKE '%${supplierRegisterNo}%'
-      </if>
-      <if test="supplierAgent != null and supplierAgent != ''">
-        and SUPPLIER_AGENT LIKE '%${supplierAgent}%'
-      </if>
-      <if test="supplierContactNumber != null and supplierContactNumber != ''">
-        and SUPPLIER_CONTACT_NUMBER LIKE '%${supplierContactNumber}%'
-      </if>
-      <if test="supplierFax != null and supplierFax != ''">
-        and SUPPLIER_FAX LIKE '%${supplierFax}%'
-      </if>
-      <if test="supplierAccount != null and supplierAccount != ''">
-        and SUPPLIER_ACCOUNT LIKE '%${supplierAccount}%'
-      </if>
-      <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
-        and SUPPLIER_ACCOUNT_BLANK LIKE '%${supplierAccountBlank}%'
-      </if>
-      <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
-        and SUPPLIER_DUTY_PARAGRAPH LIKE '%${supplierDutyParagraph}%'
-      </if>
-      <if test="supplierPostalCode != null and supplierPostalCode != ''">
-        and SUPPLIER_POSTAL_CODE LIKE '%${supplierPostalCode}%'
-      </if>
-      <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
-        and SUPPLIER_REGISTER_CAPITAL LIKE '%${supplierRegisterCapital}%'
-      </if>
-      <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
-        and SUPPLIERBUSINESS_SCOPE LIKE '%${supplierbusinessScope}%'
-      </if>
-      <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
-        and SUPPLIER_COMPANY_STATUS LIKE '%${supplierCompanyStatus}%'
-      </if>
-      <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
-        and SUPPLIER_OPERATION_PERIOD LIKE '%${supplierOperationPeriod}%'
-      </if>
-      <if test="supplierRegisterDate != null">
-        and TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = #{supplierRegisterDate}
-      </if>
-      <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
-        and SUPPLIER_REGISTER_ORGANIZATION LIKE '%${supplierRegisterOrganization}%'
-      </if>
-      <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
-        and SUPPLIER_REGISTER_APTITUDES LIKE '%${supplierRegisterAptitudes}%'
-      </if>
-      <if test="supplierCredential != null and supplierCredential != ''">
-        and SUPPLIER_CREDENTIAL LIKE '%${supplierCredential}%'
-      </if>
-      <if test="supplierContactsName != null and supplierContactsName != ''">
-        and SUPPLIER_CONTACTS_NAME LIKE '%${supplierContactsName}%'
-      </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="supplierBusinessLicense != null">
-        and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        and SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_SUPPLIER
-    where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_SUPPLIER
-    where 1!=1 
-      <if test="supplierName != null and supplierName != ''">
-        or SUPPLIER_NAME = #{supplierName}
-      </if>
-      <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
-        or SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
-      </if>
-      <if test="supplierAddress != null and supplierAddress != ''">
-        or SUPPLIER_ADDRESS = #{supplierAddress}
-      </if>
-      <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
-        or SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
-      </if>
-      <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
-        or SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
-      </if>
-      <if test="supplierAgent != null and supplierAgent != ''">
-        or SUPPLIER_AGENT = #{supplierAgent}
-      </if>
-      <if test="supplierContactNumber != null and supplierContactNumber != ''">
-        or SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
-      </if>
-      <if test="supplierFax != null and supplierFax != ''">
-        or SUPPLIER_FAX = #{supplierFax}
-      </if>
-      <if test="supplierAccount != null and supplierAccount != ''">
-        or SUPPLIER_ACCOUNT = #{supplierAccount}
-      </if>
-      <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
-        or SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
-      </if>
-      <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
-        or SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
-      </if>
-      <if test="supplierPostalCode != null and supplierPostalCode != ''">
-        or SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
-      </if>
-      <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
-        or SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
-      </if>
-      <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
-        or SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
-      </if>
-      <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
-        or SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
-      </if>
-      <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
-        or SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
-      </if>
-      <if test="supplierRegisterDate != null">
-        or TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = '#{supplierRegisterDate}'
-      </if>
-      <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
-        or SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
-      </if>
-      <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
-        or SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
-      </if>
-      <if test="supplierCredential != null and supplierCredential != ''">
-        or SUPPLIER_CREDENTIAL = #{supplierCredential}
-      </if>
-      <if test="supplierContactsName != null and supplierContactsName != ''">
-        or SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
-      </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="supplierBusinessLicense != null">
-        or SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        or SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsSupplier">
-    insert into RMS_SUPPLIER (SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, 
-      SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-      SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, 
-      SUPPLIER_FAX, SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK, 
-      SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, 
-      SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE, 
-      SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, 
-      SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION, 
-      SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-      SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE,DELETED
-      )
-    values (#{supplierId,jdbcType=DECIMAL}, #{supplierName,jdbcType=VARCHAR}, #{supplierAbbreviation,jdbcType=VARCHAR}, 
-      #{supplierAddress,jdbcType=VARCHAR}, #{supplierLegalRepresentative,jdbcType=VARCHAR}, 
-      #{supplierRegisterNo,jdbcType=VARCHAR}, #{supplierAgent,jdbcType=VARCHAR}, #{supplierContactNumber,jdbcType=VARCHAR}, 
-      #{supplierFax,jdbcType=VARCHAR}, #{supplierAccount,jdbcType=VARCHAR}, #{supplierAccountBlank,jdbcType=VARCHAR}, 
-      #{supplierDutyParagraph,jdbcType=VARCHAR}, #{supplierPostalCode,jdbcType=VARCHAR}, 
-      #{supplierRegisterCapital,jdbcType=VARCHAR}, #{supplierbusinessScope,jdbcType=VARCHAR}, 
-      #{supplierCompanyStatus,jdbcType=VARCHAR}, #{supplierOperationPeriod,jdbcType=VARCHAR}, 
-      #{supplierRegisterDate,jdbcType=TIMESTAMP}, #{supplierRegisterOrganization,jdbcType=VARCHAR}, 
-      #{supplierRegisterAptitudes,jdbcType=VARCHAR}, #{supplierCredential,jdbcType=VARCHAR}, 
-      #{supplierContactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{supplierBusinessLicense,jdbcType=BLOB}, #{supplierBusinessAblelicense,jdbcType=BLOB}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
-    insert into RMS_SUPPLIER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="supplierId != null">
-        SUPPLIER_ID,
-      </if>
-      <if test="supplierName != null">
-        SUPPLIER_NAME,
-      </if>
-      <if test="supplierAbbreviation != null">
-        SUPPLIER_ABBREVIATION,
-      </if>
-      <if test="supplierAddress != null">
-        SUPPLIER_ADDRESS,
-      </if>
-      <if test="supplierLegalRepresentative != null">
-        SUPPLIER_LEGAL_REPRESENTATIVE,
-      </if>
-      <if test="supplierRegisterNo != null">
-        SUPPLIER_REGISTER_NO,
-      </if>
-      <if test="supplierAgent != null">
-        SUPPLIER_AGENT,
-      </if>
-      <if test="supplierContactNumber != null">
-        SUPPLIER_CONTACT_NUMBER,
-      </if>
-      <if test="supplierFax != null">
-        SUPPLIER_FAX,
-      </if>
-      <if test="supplierAccount != null">
-        SUPPLIER_ACCOUNT,
-      </if>
-      <if test="supplierAccountBlank != null">
-        SUPPLIER_ACCOUNT_BLANK,
-      </if>
-      <if test="supplierDutyParagraph != null">
-        SUPPLIER_DUTY_PARAGRAPH,
-      </if>
-      <if test="supplierPostalCode != null">
-        SUPPLIER_POSTAL_CODE,
-      </if>
-      <if test="supplierRegisterCapital != null">
-        SUPPLIER_REGISTER_CAPITAL,
-      </if>
-      <if test="supplierbusinessScope != null">
-        SUPPLIERBUSINESS_SCOPE,
-      </if>
-      <if test="supplierCompanyStatus != null">
-        SUPPLIER_COMPANY_STATUS,
-      </if>
-      <if test="supplierOperationPeriod != null">
-        SUPPLIER_OPERATION_PERIOD,
-      </if>
-      <if test="supplierRegisterDate != null">
-        SUPPLIER_REGISTER_DATE,
-      </if>
-      <if test="supplierRegisterOrganization != null">
-        SUPPLIER_REGISTER_ORGANIZATION,
-      </if>
-      <if test="supplierRegisterAptitudes != null">
-        SUPPLIER_REGISTER_APTITUDES,
-      </if>
-      <if test="supplierCredential != null">
-        SUPPLIER_CREDENTIAL,
-      </if>
-      <if test="supplierContactsName != null">
-        SUPPLIER_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="supplierBusinessLicense != null">
-        SUPPLIER_BUSINESS_LICENSE,
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        SUPPLIER_BUSINESS_ABLELICENSE,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="supplierId != null">
-        #{supplierId,jdbcType=DECIMAL},
-      </if>
-      <if test="supplierName != null">
-        #{supplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAbbreviation != null">
-        #{supplierAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAddress != null">
-        #{supplierAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierLegalRepresentative != null">
-        #{supplierLegalRepresentative,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterNo != null">
-        #{supplierRegisterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAgent != null">
-        #{supplierAgent,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierContactNumber != null">
-        #{supplierContactNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierFax != null">
-        #{supplierFax,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAccount != null">
-        #{supplierAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAccountBlank != null">
-        #{supplierAccountBlank,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierDutyParagraph != null">
-        #{supplierDutyParagraph,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierPostalCode != null">
-        #{supplierPostalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterCapital != null">
-        #{supplierRegisterCapital,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierbusinessScope != null">
-        #{supplierbusinessScope,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierCompanyStatus != null">
-        #{supplierCompanyStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierOperationPeriod != null">
-        #{supplierOperationPeriod,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterDate != null">
-        #{supplierRegisterDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="supplierRegisterOrganization != null">
-        #{supplierRegisterOrganization,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterAptitudes != null">
-        #{supplierRegisterAptitudes,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierCredential != null">
-        #{supplierCredential,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierContactsName != null">
-        #{supplierContactsName,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="supplierBusinessLicense != null">
-        #{supplierBusinessLicense,jdbcType=BLOB},
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        #{supplierBusinessAblelicense,jdbcType=BLOB},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsSupplier">
-    update RMS_SUPPLIER
-    set SUPPLIER_NAME = #{supplierName,jdbcType=VARCHAR},
-      SUPPLIER_ABBREVIATION = #{supplierAbbreviation,jdbcType=VARCHAR},
-      SUPPLIER_ADDRESS = #{supplierAddress,jdbcType=VARCHAR},
-      SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_NO = #{supplierRegisterNo,jdbcType=VARCHAR},
-      SUPPLIER_AGENT = #{supplierAgent,jdbcType=VARCHAR},
-      SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber,jdbcType=VARCHAR},
-      SUPPLIER_FAX = #{supplierFax,jdbcType=VARCHAR},
-      SUPPLIER_ACCOUNT = #{supplierAccount,jdbcType=VARCHAR},
-      SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank,jdbcType=VARCHAR},
-      SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph,jdbcType=VARCHAR},
-      SUPPLIER_POSTAL_CODE = #{supplierPostalCode,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital,jdbcType=VARCHAR},
-      SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope,jdbcType=VARCHAR},
-      SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus,jdbcType=VARCHAR},
-      SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_DATE = #{supplierRegisterDate,jdbcType=TIMESTAMP},
-      SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
-      SUPPLIER_CREDENTIAL = #{supplierCredential,jdbcType=VARCHAR},
-      SUPPLIER_CONTACTS_NAME = #{supplierContactsName,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},
-      SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
-      SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense,jdbcType=BLOB},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
-    update RMS_SUPPLIER
-    <set>
-      <if test="supplierName != null">
-        SUPPLIER_NAME = #{supplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAbbreviation != null">
-        SUPPLIER_ABBREVIATION = #{supplierAbbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAddress != null">
-        SUPPLIER_ADDRESS = #{supplierAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierLegalRepresentative != null">
-        SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterNo != null">
-        SUPPLIER_REGISTER_NO = #{supplierRegisterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAgent != null">
-        SUPPLIER_AGENT = #{supplierAgent,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierContactNumber != null">
-        SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierFax != null">
-        SUPPLIER_FAX = #{supplierFax,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAccount != null">
-        SUPPLIER_ACCOUNT = #{supplierAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierAccountBlank != null">
-        SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierDutyParagraph != null">
-        SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierPostalCode != null">
-        SUPPLIER_POSTAL_CODE = #{supplierPostalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterCapital != null">
-        SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierbusinessScope != null">
-        SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierCompanyStatus != null">
-        SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierOperationPeriod != null">
-        SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterDate != null">
-        SUPPLIER_REGISTER_DATE = #{supplierRegisterDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="supplierRegisterOrganization != null">
-        SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierRegisterAptitudes != null">
-        SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierCredential != null">
-        SUPPLIER_CREDENTIAL = #{supplierCredential,jdbcType=VARCHAR},
-      </if>
-      <if test="supplierContactsName != null">
-        SUPPLIER_CONTACTS_NAME = #{supplierContactsName,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="supplierBusinessLicense != null">
-        SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense,jdbcType=BLOB},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where SUPPLIER_ID = #{supplierId,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_SUPPLIER 
-      (SUPPLIER_ID, 
-      SUPPLIER_NAME, SUPPLIER_ABBREVIATION, 
-      SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-      SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, 
-      SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, 
-      SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK, 
-      SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, 
-      SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE, 
-      SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, 
-      SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION, 
-      SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-      SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE,DELETED
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.supplierId,jdbcType=DECIMAL}, 
-      #{item.supplierName,jdbcType=VARCHAR}, #{item.supplierAbbreviation,jdbcType=VARCHAR}, 
-      #{item.supplierAddress,jdbcType=VARCHAR}, #{item.supplierLegalRepresentative,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterNo,jdbcType=VARCHAR}, #{item.supplierAgent,jdbcType=VARCHAR}, 
-      #{item.supplierContactNumber,jdbcType=VARCHAR}, #{item.supplierFax,jdbcType=VARCHAR}, 
-      #{item.supplierAccount,jdbcType=VARCHAR}, #{item.supplierAccountBlank,jdbcType=VARCHAR}, 
-      #{item.supplierDutyParagraph,jdbcType=VARCHAR}, #{item.supplierPostalCode,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterCapital,jdbcType=VARCHAR}, #{item.supplierbusinessScope,jdbcType=VARCHAR}, 
-      #{item.supplierCompanyStatus,jdbcType=VARCHAR}, #{item.supplierOperationPeriod,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterDate,jdbcType=TIMESTAMP}, #{item.supplierRegisterOrganization,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}, #{item.supplierCredential,jdbcType=VARCHAR}, 
-      #{item.supplierContactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.supplierBusinessLicense,jdbcType=BLOB}, #{item.supplierBusinessAblelicense,jdbcType=BLOB}, #{item.deleted,jdbcType=DECIMAL
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_SUPPLIER
-     set
-       SUPPLIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierId,jdbcType=DECIMAL}
-       </foreach>
-       ,SUPPLIER_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierName,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ABBREVIATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAbbreviation,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_LEGAL_REPRESENTATIVE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierLegalRepresentative,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterNo,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_AGENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAgent,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CONTACT_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_FAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierFax,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ACCOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccount,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ACCOUNT_BLANK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccountBlank,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_DUTY_PARAGRAPH=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierDutyParagraph,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_POSTAL_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierPostalCode,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_CAPITAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterCapital,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIERBUSINESS_SCOPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierbusinessScope,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_COMPANY_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCompanyStatus,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_OPERATION_PERIOD=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierOperationPeriod,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SUPPLIER_REGISTER_ORGANIZATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterOrganization,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_APTITUDES=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CREDENTIAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCredential,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CONTACTS_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactsName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_BUSINESS_LICENSE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessLicense,jdbcType=BLOB}
-       </foreach>
-       ,SUPPLIER_BUSINESS_ABLELICENSE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessAblelicense,jdbcType=BLOB}
-       </foreach>
-      ,DELETED=
-      <foreach close="end" collection="list" index="index" item="item" open="case SHIPPER_ID" separator=" ">
-        when #{item.shipperId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-      </foreach>
-     where SUPPLIER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.supplierId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_SUPPLIER
-    where SUPPLIER_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <!-- 展示供应商信息 -->
-  <select id="getSupplierList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT *
-    FROM (
-    SELECT
-    RS.SUPPLIER_ID AS "supplierId",
-    RS.SUPPLIER_NAME AS "supplierName",
-    RS.SUPPLIER_ADDRESS AS "supplierAddress",
-    RS.SUPPLIER_REGISTER_DATE AS "supplierRegisterDate",
-    RS.SUPPLIER_CONTACTS_NAME AS "supplierContactsName",
-    RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber"
-    FROM RMS_SUPPLIER RS
-    WHERE RS.DELETED != 1
-    ORDER BY RS.INSERT_TIME DESC
-    )
-    <where>
-      <if test="supplierId!= null">
-        and
-        <foreach collection="supplierId" item="item" open="(" separator="," close=")">
-          "supplierId" in #{item}
-        </foreach>
-      </if>
-      <if test="supplierName!= null">
-        and
-        <foreach collection="supplierName" item="item" open="(" separator="," close=")">
-          "supplierName" in #{item}
-        </foreach>
-      </if>
-      <if test="supplierAddress!= null">
-        and
-        <foreach collection="supplierAddress" item="item" open="(" separator="," close=")">
-          "supplierAddress" in #{item}
-        </foreach>
-      </if>
-      <if test="supplierRegisterDate!= null">
-        and
-        <foreach collection="supplierRegisterDate" item="item" open="(" separator="," close=")">
-          "supplierRegisterDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-        </foreach>
-      </if>
-      <if test="supplierContactsName!= null">
-        and
-        <foreach collection="supplierContactsName" item="item" open="(" separator="," close=")">
-          "supplierContactsName" in #{item}
-        </foreach>
-      </if>
-      <if test="supplierContactNumber!= null">
-        and
-        <foreach collection="supplierContactNumber" item="item" open="(" separator="," close=")">
-          "supplierContactNumber" in #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  <!--    根据id值展示供应商信息-->
-  <select id="selectSupplierById" resultType="java.util.LinkedHashMap">
-        SELECT
-        RS.SUPPLIER_ID AS "supplierId",
-        RS.SUPPLIER_DUTY_PARAGRAPH AS "supplierDutyParagraph",
-        RS.SUPPLIER_NAME AS "supplierName",
-        RS.SUPPLIER_ADDRESS AS "supplierAddress",
-        RS.SUPPLIER_REGISTER_DATE AS "supplierRegisterDate",
-        RS.SUPPLIER_CONTACTS_NAME AS "supplierContactsName",
-        RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber"
-        FROM RMS_SUPPLIER RS
-        WHERE RS.SUPPLIER_ID=#{id}
-    </select>
-<!--  根据名称查询当前表中相对应的供应商的数量-->
-    <select id="selectByParametersSupplierName" resultType="java.lang.Integer">
-      SELECT count(*)
-        FROM RMS_SUPPLIER RS
-        WHERE RS.SUPPLIER_NAME = #{supplierName}
-        AND RS.DELETED=0
-    </select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.class


+ 0 - 576
target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMapper.xml

@@ -1,576 +0,0 @@
-<?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.mapper.RmsTruckCalculateMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsTruckCalculate">
-    <id column="TRUCK_CALCULATE_ID" jdbcType="DECIMAL" property="truckCalculateId" />
-    <result column="TRUCK_CALCULATE_NUMBER" jdbcType="VARCHAR" property="truckCalculateNumber" />
-    <result column="TRUCK_CALCULATE_STATUS" jdbcType="VARCHAR" property="truckCalculateStatus" />
-    <result column="TRUCK_CALCULATE_PRIORITY" jdbcType="DECIMAL" property="truckCalculatePriority" />
-    <result column="TRUCK_CALCULATE_LONGITUDE" jdbcType="VARCHAR" property="truckCalculateLongitude" />
-    <result column="TRUCK_CALCULATE_LATITUDE" jdbcType="VARCHAR" property="truckCalculateLatitude" />
-    <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="TRUCK_CALCULATE_STATUS_TIME" jdbcType="TIMESTAMP" property="truckCalculateStatusTime" />
-    <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId"/>
-    <result column="CALCULATE_TYPE" jdbcType="VARCHAR" property="calculateType"/>
-  </resultMap>
-  <sql id="columns">
-    TRUCK_CALCULATE_ID, TRUCK_CALCULATE_NUMBER, TRUCK_CALCULATE_STATUS, TRUCK_CALCULATE_PRIORITY, 
-    TRUCK_CALCULATE_LONGITUDE, TRUCK_CALCULATE_LATITUDE, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, TRUCK_CALCULATE_STATUS_TIME,SHIPPER_ID,CALCULATE_TYPE
-  </sql>
-  <sql id="columns_alias">
-    t.TRUCK_CALCULATE_ID, t.TRUCK_CALCULATE_NUMBER, t.TRUCK_CALCULATE_STATUS, t.TRUCK_CALCULATE_PRIORITY, 
-    t.TRUCK_CALCULATE_LONGITUDE, t.TRUCK_CALCULATE_LATITUDE, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.TRUCK_CALCULATE_STATUS_TIME,SHIPPER_ID,CALCULATE_TYPE
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_TRUCK_CALCULATE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_TRUCK_CALCULATE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="truckCalculateId != null">
-        and TRUCK_CALCULATE_ID = #{truckCalculateId}
-      </if>
-      <if test="shipperId != null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="truckCalculateNumber != null and truckCalculateNumber != ''">
-        and TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber}
-      </if>
-      <if test="truckCalculateStatus != null and truckCalculateStatus != ''">
-        and TRUCK_CALCULATE_STATUS = #{truckCalculateStatus}
-      </if>
-      <if test="truckCalculatePriority != null">
-        and TRUCK_CALCULATE_PRIORITY = #{truckCalculatePriority}
-      </if>
-      <if test="truckCalculateLongitude != null and truckCalculateLongitude != ''">
-        and TRUCK_CALCULATE_LONGITUDE = #{truckCalculateLongitude}
-      </if>
-      <if test="truckCalculateLatitude != null and truckCalculateLatitude != ''">
-        and TRUCK_CALCULATE_LATITUDE = #{truckCalculateLatitude}
-      </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="truckCalculateStatusTime != null">
-        and TO_CHAR(TRUCK_CALCULATE_STATUS_TIME,'yyyy-MM-dd') = #{truckCalculateStatusTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="truckCalculateId != null">
-        and TRUCK_CALCULATE_ID = #{truckCalculateId}
-      </if>
-      <if test="shipperId != null">
-        and SHIPPERID = #{shipperId}
-      </if>
-      <if test="truckCalculateNumber != null and truckCalculateNumber != ''">
-        and TRUCK_CALCULATE_NUMBER LIKE '%${truckCalculateNumber}%'
-      </if>
-      <if test="truckCalculateStatus != null and truckCalculateStatus != ''">
-        and TRUCK_CALCULATE_STATUS LIKE '%${truckCalculateStatus}%'
-      </if>
-      <if test="truckCalculatePriority != null">
-        and TRUCK_CALCULATE_PRIORITY = #{truckCalculatePriority}
-      </if>
-      <if test="truckCalculateLongitude != null and truckCalculateLongitude != ''">
-        and TRUCK_CALCULATE_LONGITUDE LIKE '%${truckCalculateLongitude}%'
-      </if>
-      <if test="truckCalculateLatitude != null and truckCalculateLatitude != ''">
-        and TRUCK_CALCULATE_LATITUDE LIKE '%${truckCalculateLatitude}%'
-      </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="truckCalculateStatusTime != null">
-        and TO_CHAR(TRUCK_CALCULATE_STATUS_TIME,'yyyy-MM-dd') = #{truckCalculateStatusTime}
-      </if>
-      <if test="shipperId !=null">
-        and SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="calculateType !=null">
-        and CALCULATE_TYPE = #{calculateType}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_TRUCK_CALCULATE
-    where TRUCK_CALCULATE_ID = #{truckCalculateId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_TRUCK_CALCULATE
-    where 1!=1
-        <if test="shipperId != null">
-            or SHIPPER_ID = #{shipperId}
-        </if>
-      <if test="truckCalculateNumber != null and truckCalculateNumber != ''">
-        or TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber}
-      </if>
-      <if test="truckCalculateStatus != null and truckCalculateStatus != ''">
-        or TRUCK_CALCULATE_STATUS = #{truckCalculateStatus}
-      </if>
-      <if test="truckCalculatePriority != null">
-        or TRUCK_CALCULATE_PRIORITY = #{truckCalculatePriority}
-      </if>
-      <if test="truckCalculateLongitude != null and truckCalculateLongitude != ''">
-        or TRUCK_CALCULATE_LONGITUDE = #{truckCalculateLongitude}
-      </if>
-      <if test="truckCalculateLatitude != null and truckCalculateLatitude != ''">
-        or TRUCK_CALCULATE_LATITUDE = #{truckCalculateLatitude}
-      </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="truckCalculateStatusTime != null">
-        or TO_CHAR(TRUCK_CALCULATE_STATUS_TIME,'yyyy-MM-dd') = '#{truckCalculateStatusTime}'
-      </if>
-      <if test="shipperId !=null">
-        or SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="calculateType !=null">
-        or CALCULATE_TYPE =#{calculateType}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsTruckCalculate">
-    insert into RMS_TRUCK_CALCULATE (TRUCK_CALCULATE_ID, TRUCK_CALCULATE_NUMBER, 
-      TRUCK_CALCULATE_STATUS, TRUCK_CALCULATE_PRIORITY, 
-      TRUCK_CALCULATE_LONGITUDE, TRUCK_CALCULATE_LATITUDE, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK,
-      DELETED, TRUCK_CALCULATE_STATUS_TIME,SHIPPER_ID,CALCULATE_TYPE)
-    values (#{truckCalculateId,jdbcType=DECIMAL}, #{truckCalculateNumber,jdbcType=VARCHAR}, 
-      #{truckCalculateStatus,jdbcType=VARCHAR}, #{truckCalculatePriority,jdbcType=DECIMAL}, 
-      #{truckCalculateLongitude,jdbcType=VARCHAR}, #{truckCalculateLatitude,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
-      #{deleted,jdbcType=DECIMAL}, #{truckCalculateStatusTime,jdbcType=TIMESTAMP},#{shipperId,jdbcType=DECIMAL},#{calculateType,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsTruckCalculate">
-    insert into RMS_TRUCK_CALCULATE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="truckCalculateId != null">
-        TRUCK_CALCULATE_ID,
-      </if>
-      <if test="shipperId !=null">
-        SHIPPER_ID,
-      </if>
-      <if test="truckCalculateNumber != null">
-        TRUCK_CALCULATE_NUMBER,
-      </if>
-      <if test="truckCalculateStatus != null">
-        TRUCK_CALCULATE_STATUS,
-      </if>
-      <if test="truckCalculatePriority != null">
-        TRUCK_CALCULATE_PRIORITY,
-      </if>
-      <if test="truckCalculateLongitude != null">
-        TRUCK_CALCULATE_LONGITUDE,
-      </if>
-      <if test="truckCalculateLatitude != null">
-        TRUCK_CALCULATE_LATITUDE,
-      </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="truckCalculateStatusTime != null">
-        TRUCK_CALCULATE_STATUS_TIME,
-      </if>
-      <if test="shipperId != null">
-        SHIPPER_ID,
-      </if>
-      <if test="calculateType != null">
-        CALCULATE_TYPE
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="truckCalculateId != null">
-        #{truckCalculateId,jdbcType=DECIMAL},
-      </if>
-      <if test="shipperId != null">
-        #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateNumber != null">
-        #{truckCalculateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculateStatus != null">
-        #{truckCalculateStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculatePriority != null">
-        #{truckCalculatePriority,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateLongitude != null">
-        #{truckCalculateLongitude,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculateLatitude != null">
-        #{truckCalculateLatitude,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="truckCalculateStatusTime != null">
-        #{truckCalculateStatusTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shipperId != null">
-      #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="calculateType !=null">
-        #{calculateType,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsTruckCalculate">
-    update RMS_TRUCK_CALCULATE
-    set TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber,jdbcType=VARCHAR},
-      TRUCK_CALCULATE_STATUS = #{truckCalculateStatus,jdbcType=VARCHAR},
-      TRUCK_CALCULATE_PRIORITY = #{truckCalculatePriority,jdbcType=DECIMAL},
-      TRUCK_CALCULATE_LONGITUDE = #{truckCalculateLongitude,jdbcType=VARCHAR},
-      TRUCK_CALCULATE_LATITUDE = #{truckCalculateLatitude,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},
-      TRUCK_CALCULATE_STATUS_TIME = #{truckCalculateStatusTime,jdbcType=TIMESTAMP},
-      SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      CALCULATE_TYPE = #{calculateType,jdbcType=VARCHAR}
-    where TRUCK_CALCULATE_ID = #{truckCalculateId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsTruckCalculate">
-    update RMS_TRUCK_CALCULATE
-    <set>
-      <if test="shipperId != null">
-       SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateNumber != null">
-        TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculateStatus != null">
-        TRUCK_CALCULATE_STATUS = #{truckCalculateStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculatePriority != null">
-        TRUCK_CALCULATE_PRIORITY = #{truckCalculatePriority,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateLongitude != null">
-        TRUCK_CALCULATE_LONGITUDE = #{truckCalculateLongitude,jdbcType=VARCHAR},
-      </if>
-      <if test="truckCalculateLatitude != null">
-        TRUCK_CALCULATE_LATITUDE = #{truckCalculateLatitude,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="truckCalculateStatusTime != null">
-        TRUCK_CALCULATE_STATUS_TIME = #{truckCalculateStatusTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shipperId !=null">
-        SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="calculateType">
-        CALCULATE_TYPE = #{calculateType,jdbcType=VARCHAR}
-      </if>
-    </set>
-    where TRUCK_CALCULATE_ID = #{truckCalculateId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where TRUCK_CALCULATE_ID = #{truckCalculateId,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_TRUCK_CALCULATE 
-      (TRUCK_CALCULATE_ID, 
-      TRUCK_CALCULATE_NUMBER, TRUCK_CALCULATE_STATUS, 
-      TRUCK_CALCULATE_PRIORITY, TRUCK_CALCULATE_LONGITUDE, 
-      TRUCK_CALCULATE_LATITUDE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, TRUCK_CALCULATE_STATUS_TIME,SHIPPER_ID,CALCULATE_TYPE
-    )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.truckCalculateId,jdbcType=DECIMAL}, 
-      #{item.truckCalculateNumber,jdbcType=VARCHAR}, #{item.truckCalculateStatus,jdbcType=VARCHAR}, 
-      #{item.truckCalculatePriority,jdbcType=DECIMAL}, #{item.truckCalculateLongitude,jdbcType=VARCHAR}, 
-      #{item.truckCalculateLatitude,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.truckCalculateStatusTime,jdbcType=TIMESTAMP},
-      #{item.shipperId,jdbcType=DECIMAL},#{item.calculateType,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_TRUCK_CALCULATE
-     set
-       TRUCK_CALCULATE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateId,jdbcType=DECIMAL}
-       </foreach>
-        ,SHIPPER_ID=
-         <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-            when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
-         </foreach>
-       ,TRUCK_CALCULATE_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,TRUCK_CALCULATE_STATUS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateStatus,jdbcType=VARCHAR}
-       </foreach>
-       ,TRUCK_CALCULATE_PRIORITY=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculatePriority,jdbcType=DECIMAL}
-       </foreach>
-       ,TRUCK_CALCULATE_LONGITUDE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateLongitude,jdbcType=VARCHAR}
-       </foreach>
-       ,TRUCK_CALCULATE_LATITUDE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateLatitude,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,TRUCK_CALCULATE_STATUS_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_ID" close="end">
-          when #{item.truckCalculateId,jdbcType=DECIMAL} then #{item.truckCalculateStatusTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where TRUCK_CALCULATE_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.truckCalculateId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_TRUCK_CALCULATE
-    where TRUCK_CALCULATE_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select  id="getTruckCalculateList" parameterType="java.util.Map" resultType="java.util.Map">
-  SELECT * FROM
-  (
-  SELECT
-  RTC.TRUCK_CALCULATE_ID AS "truckCalculateId",
-  RTC.TRUCK_CALCULATE_NUMBER AS "truckCalculateNumber",
-  RTC.TRUCK_CALCULATE_STATUS AS "truckCalculateStatus",
-  RTC.TRUCK_CALCULATE_STATUS_TIME AS "truckCalculateStatusTime",
-  RTC.TRUCK_CALCULATE_LONGITUDE AS "truckCalculateLongitude",
-  RTC.TRUCK_CALCULATE_LATITUDE AS "truckCalculateLatitude",
-  RTC.CALCULATE_TYPE AS "calculateType"
-  FROM RMS_TRUCK_CALCULATE RTC
-  WHERE RTC.DELETED!=1
-  ORDER BY RTC.INSERT_TIME DESC
-  )
-  <where>
-    <if test="truckCalculateId!= null">
-      and
-      <foreach collection="truckCalculateId" item="item" open="(" separator="," close=")">
-        "truckCalculateId" in #{item}
-      </foreach>
-    </if>
-    <if test="truckCalculateNumber!= null">
-      and
-      <foreach collection="truckCalculateNumber" item="item" open="(" separator="," close=")">
-        "truckCalculateNumber" in #{item}
-      </foreach>
-    </if>
-    <if test="truckCalculateStatus!= null">
-      and
-      <foreach collection="truckCalculateStatus" item="item" open="(" separator="," close=")">
-        "truckCalculateStatus" in #{item}
-      </foreach>
-    </if>
-    <if test="truckCalculateStatusTime!= null">
-      and
-      <foreach collection="truckCalculateStatusTime" item="item" open="(" separator="," close=")">
-        "truckCalculateStatusTime" in #{item}
-      </foreach>
-    </if>
-    <if test="truckCalculateLongitude!= null">
-      and
-      <foreach collection="truckCalculateLongitude" item="item" open="(" separator="," close=")">
-        "truckCalculateLongitude" in #{item}
-      </foreach>
-    </if>
-    <if test="truckCalculateLatitude!= null">
-      and
-      <foreach collection="truckCalculateLatitude" item="item" open="(" separator="," close=")">
-        "truckCalculateLatitude" in #{item}
-      </foreach>
-    </if>
-    <if test="calculateType!= null">
-      and
-      <foreach collection="calculateType" item="item" open="(" separator="," close=")">
-        "calculateType" in #{item}
-      </foreach>
-    </if>
-  </where>
-    <include refid="orderBy"></include>
-  </select>
-  <sql id="orderBy">
-    <if test="orderField!=null and orderField !=''">
-      order by "${orderField}"
-      <if test="orderType !=null and orderType !=''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-
-
-<select id="getTruckCalculateById" parameterType="java.util.Map" resultType="java.util.Map">
-   SELECT
-  RTC.TRUCK_CALCULATE_ID AS "truckCalculateId",
-  RTC.TRUCK_CALCULATE_NUMBER AS "truckCalculateNumber",
-  RTC.TRUCK_CALCULATE_STATUS AS "truckCalculateStatus",
-  RTC.TRUCK_CALCULATE_STATUS_TIME AS "truckCalculateStatusTime",
-  RTC.TRUCK_CALCULATE_LONGITUDE AS "truckCalculateLongitude",
-  RTC.TRUCK_CALCULATE_LATITUDE AS "truckCalculateLatitude",
-  RTC.CALCULATE_TYPE AS "calculateType"
-  FROM RMS_TRUCK_CALCULATE RTC
-  WHERE RTC.TRUCK_CALCULATE_ID=#{id}
-</select>
-
-<select id="selectTruckCalculateMaterialId" parameterType="java.util.Map"  resultType="java.util.Map">
-  SELECT
-  RTCM.TRUCK_CALCULATE_ID AS "truckCalculateId",
-  RTCM.MATERIAL_ID AS "materialId"
-  FROM RMS_TRUCK_CALCULATE RTC
-  LEFT JOIN
-  RMS_TRUCK_CALCULATE_MATERIAL RTCM
-  ON
-  RTC.TRUCK_CALCULATE_ID=RTCM.TRUCK_CALCULATE_ID
-</select>
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.class


+ 0 - 318
target/classes/com/steerinfo/dil/mapper/RmsTruckCalculateMaterialMapper.xml

@@ -1,318 +0,0 @@
-<?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.mapper.RmsTruckCalculateMaterialMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsTruckCalculateMaterial">
-    <id column="TRUCK_CALCULATE_MATERIAL_ID" jdbcType="DECIMAL" property="truckCalculateMaterialId" />
-    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-    <result column="TRUCK_CALCULATE_ID" jdbcType="DECIMAL" property="truckCalculateId" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    TRUCK_CALCULATE_MATERIAL_ID, MATERIAL_ID, TRUCK_CALCULATE_ID, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.TRUCK_CALCULATE_MATERIAL_ID, t.MATERIAL_ID, t.TRUCK_CALCULATE_ID, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_TRUCK_CALCULATE_MATERIAL
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_TRUCK_CALCULATE_MATERIAL t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="truckCalculateMaterialId != null">
-        and TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="truckCalculateId != null">
-        and TRUCK_CALCULATE_ID = #{truckCalculateId}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="truckCalculateMaterialId != null">
-        and TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="truckCalculateId != null">
-        and TRUCK_CALCULATE_ID = #{truckCalculateId}
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_TRUCK_CALCULATE_MATERIAL
-    where TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_TRUCK_CALCULATE_MATERIAL
-    where 1!=1 
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="truckCalculateId != null">
-        or TRUCK_CALCULATE_ID = #{truckCalculateId}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsTruckCalculateMaterial">
-    insert into RMS_TRUCK_CALCULATE_MATERIAL (TRUCK_CALCULATE_MATERIAL_ID, MATERIAL_ID,
-      TRUCK_CALCULATE_ID, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED)
-    values (#{truckCalculateMaterialId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
-      #{truckCalculateId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsTruckCalculateMaterial">
-    insert into RMS_TRUCK_CALCULATE_MATERIAL
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="truckCalculateMaterialId != null">
-        TRUCK_CALCULATE_MATERIAL_ID,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID,
-      </if>
-      <if test="truckCalculateId != null">
-        TRUCK_CALCULATE_ID,
-      </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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="truckCalculateMaterialId != null">
-        #{truckCalculateMaterialId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateId != null">
-        #{truckCalculateId,jdbcType=DECIMAL},
-      </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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsTruckCalculateMaterial">
-    update RMS_TRUCK_CALCULATE_MATERIAL
-    set MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      TRUCK_CALCULATE_ID = #{truckCalculateId,jdbcType=DECIMAL},
-      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}
-    where TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsTruckCalculateMaterial">
-    update RMS_TRUCK_CALCULATE_MATERIAL
-    <set>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="truckCalculateId != null">
-        TRUCK_CALCULATE_ID = #{truckCalculateId,jdbcType=DECIMAL},
-      </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>
-    </set>
-    where TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where TRUCK_CALCULATE_MATERIAL_ID = #{truckCalculateMaterialId,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_TRUCK_CALCULATE_MATERIAL 
-      (TRUCK_CALCULATE_MATERIAL_ID, 
-      MATERIAL_ID, TRUCK_CALCULATE_ID,
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.truckCalculateMaterialId,jdbcType=DECIMAL}, 
-      #{item.materialId,jdbcType=DECIMAL}, #{item.truckCalculateId,jdbcType=DECIMAL},
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_TRUCK_CALCULATE_MATERIAL
-     set
-       TRUCK_CALCULATE_MATERIAL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.truckCalculateMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,TRUCK_CALCULATE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.truckCalculateId,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case TRUCK_CALCULATE_MATERIAL_ID" close="end">
-          when #{item.truckCalculateMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-     where TRUCK_CALCULATE_MATERIAL_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.truckCalculateMaterialId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_TRUCK_CALCULATE_MATERIAL
-    where TRUCK_CALCULATE_MATERIAL_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.class


+ 0 - 268
target/classes/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.xml

@@ -1,268 +0,0 @@
-<?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.mapper.RmsUnitOfMeasureMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsUnitOfMeasure">
-    <id column="UNIT_OF_MEASURE_ID" jdbcType="DECIMAL" property="unitOfMeasureId" />
-    <result column="UNIT_OF_MEASURE_NAME" jdbcType="VARCHAR" property="unitOfMeasureName" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    UNIT_OF_MEASURE_ID, UNIT_OF_MEASURE_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.UNIT_OF_MEASURE_ID, t.UNIT_OF_MEASURE_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_UNIT_OF_MEASURE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_UNIT_OF_MEASURE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="unitOfMeasureId != null">
-        and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
-      </if>
-      <if test="unitOfMeasureName != null and unitOfMeasureName != ''">
-        and UNIT_OF_MEASURE_NAME = #{unitOfMeasureName}
-      </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>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="unitOfMeasureId != null">
-        and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
-      </if>
-      <if test="unitOfMeasureName != null and unitOfMeasureName != ''">
-        and UNIT_OF_MEASURE_NAME LIKE '%${unitOfMeasureName}%'
-      </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>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RMS_UNIT_OF_MEASURE
-    where UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_UNIT_OF_MEASURE
-    where 1!=1 
-      <if test="unitOfMeasureName != null and unitOfMeasureName != ''">
-        or UNIT_OF_MEASURE_NAME = #{unitOfMeasureName}
-      </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>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsUnitOfMeasure">
-    insert into RMS_UNIT_OF_MEASURE (UNIT_OF_MEASURE_ID, UNIT_OF_MEASURE_NAME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{unitOfMeasureId,jdbcType=DECIMAL}, #{unitOfMeasureName,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsUnitOfMeasure">
-    insert into RMS_UNIT_OF_MEASURE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="unitOfMeasureId != null">
-        UNIT_OF_MEASURE_ID,
-      </if>
-      <if test="unitOfMeasureName != null">
-        UNIT_OF_MEASURE_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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="unitOfMeasureId != null">
-        #{unitOfMeasureId,jdbcType=DECIMAL},
-      </if>
-      <if test="unitOfMeasureName != null">
-        #{unitOfMeasureName,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsUnitOfMeasure">
-    update RMS_UNIT_OF_MEASURE
-    set UNIT_OF_MEASURE_NAME = #{unitOfMeasureName,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}
-    where UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsUnitOfMeasure">
-    update RMS_UNIT_OF_MEASURE
-    <set>
-      <if test="unitOfMeasureName != null">
-        UNIT_OF_MEASURE_NAME = #{unitOfMeasureName,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>
-    </set>
-    where UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where UNIT_OF_MEASURE_ID = #{unitOfMeasureId,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_UNIT_OF_MEASURE 
-      (UNIT_OF_MEASURE_ID, 
-      UNIT_OF_MEASURE_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.unitOfMeasureId,jdbcType=DECIMAL}, 
-      #{item.unitOfMeasureName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_UNIT_OF_MEASURE
-     set
-       UNIT_OF_MEASURE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.unitOfMeasureId,jdbcType=DECIMAL}
-       </foreach>
-       ,UNIT_OF_MEASURE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.unitOfMeasureName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_OF_MEASURE_ID" close="end">
-          when #{item.unitOfMeasureId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where UNIT_OF_MEASURE_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.unitOfMeasureId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RMS_UNIT_OF_MEASURE
-    where UNIT_OF_MEASURE_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示!!!-->
-  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  
-</mapper>

BIN
target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.class


+ 1 - 22
target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -449,10 +449,7 @@
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
     RS.SHIPPER_NAME AS "shipperName",
-    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
-    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -484,24 +481,6 @@
           "shipperAbbreviation" in #{item}
         </foreach>
       </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
-        and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperFactoryArea!= null">
-        and
-        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
-          "shipperFactoryArea" in #{item}
-        </foreach>
-      </if>
     </where>
     <include refid="orderBy"></include>
   </select>

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


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


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


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


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


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


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


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


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


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


Some files were not shown because too many files changed in this diff