asd

.idea/workspace.xml

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AnalysisUIOptions">
-    <option name="GROUP_BY_SEVERITY" value="true" />
-  </component>
-  <component name="BranchesTreeState">
-    <expand>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-    </expand>
-    <select />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="de9b1cef-bcce-4b24-a294-70008dd01a64" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/OmsshipInstructionsCapacityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/OmsshipInstructionsCapacityServiceImpl.class" afterDir="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="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="localRepository" value="C:\Maven\cangku" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../project/apache-maven-3.5.0" />
-        <option name="userSettingsFile" value="D:\project\apache-maven-3.5.0\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="ProblemsViewState">
-    <option name="selectedIndex" value="2" />
-  </component>
-  <component name="ProjectId" id="20Xm1mGUleoJWX8DlQSIRJX7coB" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showVisibilityIcons" 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" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="full.screen.before.presentation.mode" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <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" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <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="project.structure.last.edited" value="问题" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
-    <property name="settings.editor.splitter.proportion" value="0.3058104" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.steerinfo.dil.util" />
-      <recent name="com.steerinfo.dil.service" />
-      <recent name="com.steerinfo.dil.service.impl" />
-      <recent name="com.steerinfo.dil.mapper" />
-      <recent name="com.steerinfo.dil.controller" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\stworkspace\rms12.7\DAL-DAZHOU-TMSSHIP-API\src\main\resources\com\steerinfo\dil\mapper" />
-      <recent name="C:\stworkspace\rms12.7\DAL-DAZHOU-TMSSHIP-API\src\main\java\com\steerinfo\dil\service\impl" />
-      <recent name="C:\stworkspace\rms12.7\DAL-DAZHOU-TMSSHIP-API\src\main\java\com\steerinfo\dil\service" />
-      <recent name="C:\stworkspace\rms12.7\DAL-DAZHOU-TMSSHIP-API\src\main\java\com\steerinfo\dil\model" />
-      <recent name="C:\stworkspace\rms12.7\DAL-DAZHOU-TMSSHIP-API\src\main\java\com\steerinfo\dil\mapper" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="DilApplicationMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="dil-tms" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.steerinfo.DilApplicationMain" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="de9b1cef-bcce-4b24-a294-70008dd01a64" name="Default Changelist" comment="" />
-      <created>1636199093883</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1636199093883</updated>
-      <workItem from="1636199098738" duration="318000" />
-      <workItem from="1636199434496" duration="710000" />
-      <workItem from="1636200960445" duration="235000" />
-      <workItem from="1636201360682" duration="245000" />
-      <workItem from="1636201868226" duration="4010000" />
-      <workItem from="1636332801851" duration="7402000" />
-      <workItem from="1636444138333" duration="2914000" />
-      <workItem from="1636512186193" duration="10149000" />
-      <workItem from="1636531534134" duration="1058000" />
-      <workItem from="1636532620106" duration="5825000" />
-      <workItem from="1636544341470" duration="12000" />
-      <workItem from="1636544395355" duration="5839000" />
-      <workItem from="1636593806560" duration="13974000" />
-      <workItem from="1636682548627" duration="2585000" />
-      <workItem from="1636685226129" duration="4073000" />
-      <workItem from="1636700814042" duration="442000" />
-      <workItem from="1636702370148" duration="5105000" />
-      <workItem from="1636719939751" duration="1666000" />
-      <workItem from="1636766353639" duration="2925000" />
-      <workItem from="1638761496956" duration="9004000" />
-      <workItem from="1638770862849" duration="18765000" />
-      <workItem from="1638839054806" duration="12266000" />
-      <workItem from="1638878496787" duration="775000" />
-      <workItem from="1638879307128" duration="410000" />
-      <workItem from="1638879743061" duration="4527000" />
-      <workItem from="1638924203240" duration="4209000" />
-      <workItem from="1639136974680" duration="13884000" />
-      <workItem from="1639186339530" duration="1399000" />
-      <workItem from="1639356858265" duration="2852000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="574" y="117" key="#com.intellij.ide.util.MemberChooser" timestamp="1639292450929">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="574" y="117" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1639292450929" />
-    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1639362264773">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639362264773" />
-    <state width="1493" height="124" key="GridCell.Tab.0.bottom" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.0.center" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.0.left" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.0.right" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.1.bottom" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.1.center" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.1.left" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.1.right" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.2.bottom" timestamp="1639364745999">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
-    <state width="1493" height="124" key="GridCell.Tab.2.center" timestamp="1639364745999">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
-    <state width="1493" height="124" key="GridCell.Tab.2.left" timestamp="1639364745998">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639364745998" />
-    <state width="1493" height="124" key="GridCell.Tab.2.right" timestamp="1639364745999">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1493" height="124" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639364745999" />
-    <state x="270" y="56" key="SettingsEditor" timestamp="1639362268876">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639362268876" />
-    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1639360145823">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1639360145823" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/AmsshipDeliveryAttorneyServiceImpl.java</url>
-          <line>44</line>
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/AmsshipCargoTransferResultController.java</url>
-          <line>165</line>
-          <option name="timeStamp" value="20" />
-        </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/AmsshipCargoTransferResultController.java</url>
-          <line>176</line>
-          <option name="timeStamp" value="23" />
-        </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/TmsshipLoadShipResultServiceImpl.java</url>
-          <line>116</line>
-          <option name="timeStamp" value="25" />
-        </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java</url>
-          <line>25</line>
-          <option name="timeStamp" value="26" />
-        </line-breakpoint>
-        <line-breakpoint type="java-method">
-          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/AmsshipCargoTransferResultController.java</url>
-          <line>157</line>
-          <properties class="com.steerinfo.dil.controller.AmsshipCargoTransferResultController" method="getGroupList">
-            <option name="EMULATED" value="true" />
-          </properties>
-          <option name="timeStamp" value="17" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>

dil-tms.iml

@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <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>

src/main/java/com/steerinfo/dil/controller/DilBatchController.java

@@ -2,9 +2,9 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;

src/main/java/com/steerinfo/dil/feign/ESFeign.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.161:8089/api/v1/es")
+@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.166:8089/api/v1/es")
 public interface ESFeign {
     @PostMapping("getConResult")
     PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -73,7 +73,7 @@ public class DataChange {
         if(date == null)
             return null;
         try{
-             changeDate = (Date) date;
+            changeDate = (Date) date;
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -152,7 +152,7 @@ public class DataChange {
                         ? "0000" + id : id < 100000
                         ? "000" + id : id < 1000000
                         ? "00" + id : id < 10000000
-                        ? "0" + id : id
+                        ? "0" + id : id.toString()
         );
         return sb.toString();
     }

src/main/resources/bootstrap.yml

@@ -14,15 +14,15 @@ spring:
 
 openfeign:
   WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
 
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

target/classes/application-dev.yml

@@ -1,9 +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: dil-shiptms-api-dev
-

target/classes/application-prod.yml

@@ -1,9 +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: dil-shiptms-api-dev
-

target/classes/bootstrap.yml

@@ -1,60 +0,0 @@
-api.version: api/v1/shipTms
-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:
-
-openfeign:
-  WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
-
-#eureka设置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
-  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
-
-
-
-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: 8090

target/classes/com/steerinfo/dil/mapper/AmsshipCargoTransferResultMapper.xml

@@ -1,755 +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.AmsshipCargoTransferResultMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipCargoTransferResult">
-        <id column="CARGO_TRANSFER_RESULT_ID" jdbcType="DECIMAL" property="cargoTransferResultId" />
-        <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber" />
-        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-        <result column="RESULT_CONTACT_PERSON" jdbcType="VARCHAR" property="resultContactPerson" />
-        <result column="RESULT_TELEPHONE_FAX" jdbcType="VARCHAR" property="resultTelephoneFax" />
-        <result column="GROUP_ID" jdbcType="DECIMAL" property="groupId" />
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-        <result column="RESULT_NUMBER_OF_LOANS" jdbcType="DECIMAL" property="resultNumberOfLoans" />
-        <result column="RESULT_FREIGHT_FORWARDING_INFO" jdbcType="VARCHAR" property="resultFreightForwardingInfo" />
-        <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-        <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="RESULT_DATE_OF_LOANS" jdbcType="TIMESTAMP" property="resultDateOfLoans" />
-    </resultMap>
-    <sql id="columns">
-    CARGO_TRANSFER_RESULT_ID, RESULT_NUMBER, CARRIER_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
-    GROUP_ID, BATCH_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO, 
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, DELETED, RESULT_DATE_OF_LOANS
-    </sql>
-    <sql id="columns_alias">
-        t.CARGO_TRANSFER_RESULT_ID, t.RESULT_NUMBER, t.CARRIER_ID, t.RESULT_CONTACT_PERSON, 
-    t.RESULT_TELEPHONE_FAX, t.GROUP_ID, t.BATCH_ID, t.RESULT_NUMBER_OF_LOANS, t.RESULT_FREIGHT_FORWARDING_INFO, 
-    t.RESULT_MEMO, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.RESULT_DATE_OF_LOANS
-    </sql>
-    <sql id="select">
-        SELECT <include refid="columns" /> FROM AMSSHIP_CARGO_TRANSFER_RESULT
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM AMSSHIP_CARGO_TRANSFER_RESULT t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="cargoTransferResultId != null">
-                and CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
-            </if>
-            <if test="resultNumber != null and resultNumber != ''">
-                and RESULT_NUMBER = #{resultNumber}
-            </if>
-            <if test="carrierId != null">
-                and CARRIER_ID = #{carrierId}
-            </if>
-            <if test="resultContactPerson != null and resultContactPerson != ''">
-                and RESULT_CONTACT_PERSON = #{resultContactPerson}
-            </if>
-            <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
-                and RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
-            </if>
-            <if test="groupId != null">
-                and GROUP_ID = #{groupId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="resultNumberOfLoans != null">
-                and RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
-            </if>
-            <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
-                and RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
-            </if>
-            <if test="resultMemo != null and resultMemo != ''">
-                and RESULT_MEMO = #{resultMemo}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="resultDateOfLoans != null">
-                and TO_CHAR(RESULT_DATE_OF_LOANS,'yyyy-MM-dd') = #{resultDateOfLoans}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="cargoTransferResultId != null">
-                and CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
-            </if>
-            <if test="resultNumber != null and resultNumber != ''">
-                and RESULT_NUMBER LIKE '%${resultNumber}%'
-            </if>
-            <if test="carrierId != null">
-                and CARRIER_ID = #{carrierId}
-            </if>
-            <if test="resultContactPerson != null and resultContactPerson != ''">
-                and RESULT_CONTACT_PERSON LIKE '%${resultContactPerson}%'
-            </if>
-            <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
-                and RESULT_TELEPHONE_FAX LIKE '%${resultTelephoneFax}%'
-            </if>
-            <if test="groupId != null">
-                and GROUP_ID = #{groupId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="resultNumberOfLoans != null">
-                and RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
-            </if>
-            <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
-                and RESULT_FREIGHT_FORWARDING_INFO LIKE '%${resultFreightForwardingInfo}%'
-            </if>
-            <if test="resultMemo != null and resultMemo != ''">
-                and RESULT_MEMO LIKE '%${resultMemo}%'
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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="resultDateOfLoans != null">
-                and TO_CHAR(RESULT_DATE_OF_LOANS,'yyyy-MM-dd') = #{resultDateOfLoans}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete from AMSSHIP_CARGO_TRANSFER_RESULT
-        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from AMSSHIP_CARGO_TRANSFER_RESULT
-        where 1!=1
-        <if test="resultNumber != null and resultNumber != ''">
-            or RESULT_NUMBER = #{resultNumber}
-        </if>
-        <if test="carrierId != null">
-            or CARRIER_ID = #{carrierId}
-        </if>
-        <if test="resultContactPerson != null and resultContactPerson != ''">
-            or RESULT_CONTACT_PERSON = #{resultContactPerson}
-        </if>
-        <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
-            or RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
-        </if>
-        <if test="groupId != null">
-            or GROUP_ID = #{groupId}
-        </if>
-        <if test="batchId != null">
-            or BATCH_ID = #{batchId}
-        </if>
-        <if test="resultNumberOfLoans != null">
-            or RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
-        </if>
-        <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
-            or RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
-        </if>
-        <if test="resultMemo != null and resultMemo != ''">
-            or RESULT_MEMO = #{resultMemo}
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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="resultDateOfLoans != null">
-            or TO_CHAR(RESULT_DATE_OF_LOANS,'yyyy-MM-dd') = '#{resultDateOfLoans}'
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
-        insert into AMSSHIP_CARGO_TRANSFER_RESULT (CARGO_TRANSFER_RESULT_ID, RESULT_NUMBER,
-                                                   CARRIER_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
-                                                   GROUP_ID, BATCH_ID, RESULT_NUMBER_OF_LOANS,
-                                                   RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO,
-                                                   DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-                                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                                   INSERT_UPDATE_REMARK, DELETED, RESULT_DATE_OF_LOANS
-        )
-        values (#{cargoTransferResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR},
-                #{carrierId,jdbcType=DECIMAL}, #{resultContactPerson,jdbcType=VARCHAR}, #{resultTelephoneFax,jdbcType=VARCHAR},
-                #{groupId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{resultNumberOfLoans,jdbcType=DECIMAL},
-                #{resultFreightForwardingInfo,jdbcType=VARCHAR}, #{resultMemo,jdbcType=VARCHAR},
-                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{resultDateOfLoans,jdbcType=TIMESTAMP}
-               )
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
-        insert into AMSSHIP_CARGO_TRANSFER_RESULT
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="cargoTransferResultId != null">
-                CARGO_TRANSFER_RESULT_ID,
-            </if>
-            <if test="resultNumber != null">
-                RESULT_NUMBER,
-            </if>
-            <if test="carrierId != null">
-                CARRIER_ID,
-            </if>
-            <if test="resultContactPerson != null">
-                RESULT_CONTACT_PERSON,
-            </if>
-            <if test="resultTelephoneFax != null">
-                RESULT_TELEPHONE_FAX,
-            </if>
-            <if test="groupId != null">
-                GROUP_ID,
-            </if>
-            <if test="batchId != null">
-                BATCH_ID,
-            </if>
-            <if test="resultNumberOfLoans != null">
-                RESULT_NUMBER_OF_LOANS,
-            </if>
-            <if test="resultFreightForwardingInfo != null">
-                RESULT_FREIGHT_FORWARDING_INFO,
-            </if>
-            <if test="resultMemo != null">
-                RESULT_MEMO,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="resultDateOfLoans != null">
-                RESULT_DATE_OF_LOANS,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="cargoTransferResultId != null">
-                #{cargoTransferResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultNumber != null">
-                #{resultNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierId != null">
-                #{carrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultContactPerson != null">
-                #{resultContactPerson,jdbcType=VARCHAR},
-            </if>
-            <if test="resultTelephoneFax != null">
-                #{resultTelephoneFax,jdbcType=VARCHAR},
-            </if>
-            <if test="groupId != null">
-                #{groupId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultNumberOfLoans != null">
-                #{resultNumberOfLoans,jdbcType=DECIMAL},
-            </if>
-            <if test="resultFreightForwardingInfo != null">
-                #{resultFreightForwardingInfo,jdbcType=VARCHAR},
-            </if>
-            <if test="resultMemo != null">
-                #{resultMemo,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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="resultDateOfLoans != null">
-                #{resultDateOfLoans,jdbcType=TIMESTAMP},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
-        update AMSSHIP_CARGO_TRANSFER_RESULT
-        set RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-            CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-            RESULT_CONTACT_PERSON = #{resultContactPerson,jdbcType=VARCHAR},
-            RESULT_TELEPHONE_FAX = #{resultTelephoneFax,jdbcType=VARCHAR},
-            GROUP_ID = #{groupId,jdbcType=DECIMAL},
-            BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans,jdbcType=DECIMAL},
-            RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
-            RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-            DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME = #{deleteTime,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},
-            RESULT_DATE_OF_LOANS = #{resultDateOfLoans,jdbcType=TIMESTAMP}
-        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
-        update AMSSHIP_CARGO_TRANSFER_RESULT
-        <set>
-            <if test="resultNumber != null">
-                RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierId != null">
-                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultContactPerson != null">
-                RESULT_CONTACT_PERSON = #{resultContactPerson,jdbcType=VARCHAR},
-            </if>
-            <if test="resultTelephoneFax != null">
-                RESULT_TELEPHONE_FAX = #{resultTelephoneFax,jdbcType=VARCHAR},
-            </if>
-            <if test="groupId != null">
-                GROUP_ID = #{groupId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultNumberOfLoans != null">
-                RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans,jdbcType=DECIMAL},
-            </if>
-            <if test="resultFreightForwardingInfo != null">
-                RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
-            </if>
-            <if test="resultMemo != null">
-                RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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="resultDateOfLoans != null">
-                RESULT_DATE_OF_LOANS = #{resultDateOfLoans,jdbcType=TIMESTAMP},
-            </if>
-        </set>
-        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select" />
-        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,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 AMSSHIP_CARGO_TRANSFER_RESULT
-        (CARGO_TRANSFER_RESULT_ID,
-        RESULT_NUMBER, CARRIER_ID, RESULT_CONTACT_PERSON,
-        RESULT_TELEPHONE_FAX, GROUP_ID,
-        BATCH_ID, RESULT_NUMBER_OF_LOANS,
-        RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO,
-        DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-        INSERT_TIME, UPDATE_USERNAME,
-        UPDATE_TIME, INSERT_UPDATE_REMARK,
-        DELETED, RESULT_DATE_OF_LOANS)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.cargoTransferResultId,jdbcType=DECIMAL},
-        #{item.resultNumber,jdbcType=VARCHAR}, #{item.carrierId,jdbcType=DECIMAL}, #{item.resultContactPerson,jdbcType=VARCHAR},
-        #{item.resultTelephoneFax,jdbcType=VARCHAR}, #{item.groupId,jdbcType=DECIMAL},
-        #{item.batchId,jdbcType=DECIMAL}, #{item.resultNumberOfLoans,jdbcType=DECIMAL},
-        #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}, #{item.resultMemo,jdbcType=VARCHAR},
-        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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.resultDateOfLoans,jdbcType=TIMESTAMP} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update AMSSHIP_CARGO_TRANSFER_RESULT
-        set
-        CARGO_TRANSFER_RESULT_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.cargoTransferResultId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_NUMBER=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_CONTACT_PERSON=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultContactPerson,jdbcType=VARCHAR}
-        </foreach>
-        ,RESULT_TELEPHONE_FAX=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultTelephoneFax,jdbcType=VARCHAR}
-        </foreach>
-        ,GROUP_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.groupId,jdbcType=DECIMAL}
-        </foreach>
-        ,BATCH_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_NUMBER_OF_LOANS=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultNumberOfLoans,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_FREIGHT_FORWARDING_INFO=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}
-        </foreach>
-        ,RESULT_MEMO=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_DATE_OF_LOANS=
-        <foreach close="end" collection="list" index="index" item="item" open="case CARGO_TRANSFER_RESULT_ID" separator=" ">
-            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultDateOfLoans,jdbcType=TIMESTAMP}
-        </foreach>
-        where CARGO_TRANSFER_RESULT_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-            #{item.cargoTransferResultId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from AMSSHIP_CARGO_TRANSFER_RESULT
-        where CARGO_TRANSFER_RESULT_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-    <select id="seletCargoTransfer" resultType="java.util.Map">
-        select *
-        from
-        (select
-        t1.RESULT_NUMBER "resultNumber",
-        t4.PORT_NAME "carrierName",
-        t1.RESULT_CONTACT_PERSON "resultContactPerson",
-        t1.RESULT_TELEPHONE_FAX "ResultTelephoneFax",
-        t2.PIER_NAME "pierName",
-        t6.MATERIAL_NAME "materialName",
-        t5.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        t5.BATCH_ID "batchId",
-        t1.RESULT_NUMBER_OF_LOANS "resultNumberOf",
-        t1.RESULT_FREIGHT_FORWARDING_INFO "resultInfo",
-        t1.CARGO_TRANSFER_RESULT_ID "cargoTransferResultId",
-        t1.RESULT_MEMO "resultMemo",
-        t1.INSERT_TIME "insertTime"
-        from AMSSHIP_CARGO_TRANSFER_RESULT t1
-        left join RMS_PIER t2
-        on t1.GROUP_ID=t2.PIER_ID
-        left join AMSSHIP_DELIVERY_NOTICE t3
-        on t1.BATCH_ID=t3.BATCH_ID
-        left join RMS_PORT t4
-        on t1.CARRIER_ID=t4.PORT_ID
-        left join DIL_BATCH t5
-        on t1.BATCH_ID=t5.BATCH_ID
-        left join RMS_MATERIAL t6
-        on t5.MATERIAL_ID=t6.MATERIAL_ID
-        where t1.deleted = 0
-        )
-        <where>
-            <if test="resultNumber!= null">
-                and t1.RESULT_NUMBER in
-                <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="resultContactPerson!= null">
-                and t1.RESULT_CONTACT_PERSON in
-                <foreach collection="resultContactPerson" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="ResultTelephoneFax!= null">
-                and t1.RESULT_TELEPHONE_FAX in
-                <foreach collection="ResultTelephoneFax" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="resultMemo!= null">
-                and t1.RESULT_MEMO in
-                <foreach collection="resultMemo" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="resultNumberOf!= null">
-                and t1.RESULT_NUMBER_OF_LOANS in
-                <foreach collection="resultNumberOf" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="pierName!= null">
-                and t2.PIER_NAME in
-                <foreach collection="pierName" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="materialCapacityName!= null">
-                and t3.MATERIAL_CAPACITY_NAME in
-                <foreach collection="materialCapacityName" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="carrierName!= null">
-                and t4.CARRIER_NAME in
-                <foreach collection="carrierName" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="materialName!= null">
-                and t5.MATERIAL_NAME in
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-    <!--根据时间排序-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <!--  自动生成Id-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(CARGO_TRANSFER_RESULT_ID) + 1
-        FROM AMSSHIP_CARGO_TRANSFER_RESULT
-    </select>
-    <!-- 下拉框绑定Id-->
-<!--    &lt;!&ndash;  下拉框中获取货权转移单位 &ndash;&gt;-->
-<!--    <select id="getShipper" resultType="java.util.LinkedHashMap">-->
-<!--        select RS.SHIPPER_ID   "id",-->
-<!--               RS.SHIPPER_ID   "value",-->
-<!--               RS.SHIPPER_NAME "label"-->
-<!--        from RMS_SHIPPER RS-->
-<!--    </select>-->
-
-    <!--  下拉框中获取物资名称 -->
-    <select id="getCargoId" resultType="java.util.LinkedHashMap">
-        select RM.MATERIAL_ID   "id",
-               RM.MATERIAL_ID   "value",
-               RM.MATERIAL_NAME "label"
-        from RMS_MATERIAL RM
-    </select>
-    <select id="insertBetchId" resultType="java.util.LinkedHashMap">
-        select
-            BATCH_ID "id",
-            BATCH_ID "value",
-            CONCAT(CONCAT(RM.MATERIAL_NAME, '"'), CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"')) "label"
-        from DIL_BATCH DB
-        left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = DB.MATERIAL_ID
-    </select>
-    <!--  根据id查询所需更改的所有数据-->
-    <select id="selectByOrder" resultType="java.util.Map">
-        select t1.CARRIER_ID                     "carrierId",
-               t1.RESULT_TELEPHONE_FAX           "resultTelephoneFax",
-               t1.RESULT_CONTACT_PERSON          "resultContactPerson",
-               t1.RESULT_NUMBER_OF_LOANS         "resultNumberOfLoans",
-               t1.RESULT_FREIGHT_FORWARDING_INFO "resultFreignForwardingInfo",
-               t1.RESULT_MEMO                    "resultMemo",
-               t1.GROUP_ID                       "groupId",
-               t1.BATCH_ID                       "batchId"
-        from AMSSHIP_CARGO_TRANSFER_RESULT t1
-        where t1.CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
-    </select>
-
-    <select id="selectPortId" resultType="DECIMAL" parameterType="DECIMAL">
-        SELECT PORT_ID
-        FROM RMS_PIER
-        WHERE PIER_ID = #{pierId}
-    </select>
-    <!-- 查询船运物资id-->
-    <select id="selectMaterialId" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-        select
-                RM.MATERIAL_ID "materialId",
-                RM.MATERIAL_NAME  "materialName"
-
-        from      RMS_MATERIAL RM
-                 left join RMS_MATERIAL_TYPE RMT
-                 on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
-        where    RM.MATERIAL_LENGTH is NULL  and RM.MATERIAL_SPECIFICATION is NULL
-          and    RMT.MATERIAL_TYPE_ID=1
-    </select>
-   <!-- 获得货权转移送达单位-->
-   <select id="selectShipperName" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-       select  RS.PORT_NAME "portName",
-               RS.PORT_ID  "portId"
-       from RMS_PORT RS
-       left join RMS_PORT_TYPE RPT
-       on RS.PORT_TYPE_ID=RPT.PORT_TYPE_ID
-       where RPT.PORT_TYPE_ID=2
-    </select>
-    <!--  下拉框中获取收货人单位 -->
-    <select id="getGroup" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-        select RP.PIER_ID   "pierId",
-               RP.PIER_NAME  "pierName"
-        from   RMS_PIER RP
-    </select>
-
-</mapper>

target/classes/com/steerinfo/dil/mapper/AmsshipDeliveryAttorneyMapper.xml

@@ -1,698 +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.AmsshipDeliveryAttorneyMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
-        <id column="ATTORNEY_ID" jdbcType="DECIMAL" property="attorneyId" />
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-        <result column="PORT_ID" jdbcType="DECIMAL" property="portId" />
-        <result column="DOWN_SWIM_PORT_ID" jdbcType="DECIMAL" property="downSwimPortId" />
-        <result column="ATTORNEY_PICKUP_CONTACT_PERSON" jdbcType="VARCHAR" property="attorneyPickupContactPerson" />
-        <result column="ATTORENY_PICKUP_IDCARD" jdbcType="VARCHAR" property="attorenyPickupIdcard" />
-        <result column="ATTORNEY_CONTACT_TELEPHONE" jdbcType="VARCHAR" property="attorneyContactTelephone" />
-        <result column="ATTORNEY_TIME" jdbcType="TIMESTAMP" property="attorneyTime" />
-        <result column="ATTORNEY_PDFFILE" jdbcType="VARCHAR" property="attorneyPdffile" />
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-        <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="ATTORNEY_DISTRIBUTION_STATUS" jdbcType="DECIMAL" property="attorneyDistributionStatus" />
-    </resultMap>
-    <sql id="columns">
-        ATTORNEY_ID, BATCH_ID, PORT_ID, DOWN_SWIM_PORT_ID, ATTORNEY_PICKUP_CONTACT_PERSON, 
-    ATTORENY_PICKUP_IDCARD, ATTORNEY_CONTACT_TELEPHONE, ATTORNEY_TIME, ATTORNEY_PDFFILE, 
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, DELETED, ATTORNEY_DISTRIBUTION_STATUS
-    </sql>
-    <sql id="columns_alias">
-        t.ATTORNEY_ID, t.BATCH_ID, t.PORT_ID, t.DOWN_SWIM_PORT_ID, t.ATTORNEY_PICKUP_CONTACT_PERSON, 
-    t.ATTORENY_PICKUP_IDCARD, t.ATTORNEY_CONTACT_TELEPHONE, t.ATTORNEY_TIME, t.ATTORNEY_PDFFILE, 
-    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ATTORNEY_DISTRIBUTION_STATUS
-    </sql>
-    <sql id="select">
-        SELECT <include refid="columns" /> FROM AMSSHIP_DELIVERY_ATTORNEY
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM AMSSHIP_DELIVERY_ATTORNEY t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="attorneyId != null">
-                and ATTORNEY_ID = #{attorneyId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="portId != null">
-                and PORT_ID = #{portId}
-            </if>
-            <if test="downSwimPortId != null">
-                and DOWN_SWIM_PORT_ID = #{downSwimPortId}
-            </if>
-            <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
-                and ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson}
-            </if>
-            <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
-                and ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard}
-            </if>
-            <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
-                and ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone}
-            </if>
-            <if test="attorneyTime != null">
-                and TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = #{attorneyTime}
-            </if>
-            <if test="attorneyPdffile != null and attorneyPdffile != ''">
-                and ATTORNEY_PDFFILE = #{attorneyPdffile}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="attorneyDistributionStatus != null">
-                and ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="attorneyId != null">
-                and ATTORNEY_ID = #{attorneyId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="portId != null">
-                and PORT_ID = #{portId}
-            </if>
-            <if test="downSwimPortId != null">
-                and DOWN_SWIM_PORT_ID = #{downSwimPortId}
-            </if>
-            <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
-                and ATTORNEY_PICKUP_CONTACT_PERSON LIKE '%${attorneyPickupContactPerson}%'
-            </if>
-            <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
-                and ATTORENY_PICKUP_IDCARD LIKE '%${attorenyPickupIdcard}%'
-            </if>
-            <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
-                and ATTORNEY_CONTACT_TELEPHONE LIKE '%${attorneyContactTelephone}%'
-            </if>
-            <if test="attorneyTime != null">
-                and TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = #{attorneyTime}
-            </if>
-            <if test="attorneyPdffile != null and attorneyPdffile != ''">
-                and ATTORNEY_PDFFILE LIKE '%${attorneyPdffile}%'
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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="attorneyDistributionStatus != null">
-                and ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete from AMSSHIP_DELIVERY_ATTORNEY
-        where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from AMSSHIP_DELIVERY_ATTORNEY
-        where 1!=1
-        <if test="batchId != null">
-            or BATCH_ID = #{batchId}
-        </if>
-        <if test="portId != null">
-            or PORT_ID = #{portId}
-        </if>
-        <if test="downSwimPortId != null">
-            or DOWN_SWIM_PORT_ID = #{downSwimPortId}
-        </if>
-        <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
-            or ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson}
-        </if>
-        <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
-            or ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard}
-        </if>
-        <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
-            or ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone}
-        </if>
-        <if test="attorneyTime != null">
-            or TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = '#{attorneyTime}'
-        </if>
-        <if test="attorneyPdffile != null and attorneyPdffile != ''">
-            or ATTORNEY_PDFFILE = #{attorneyPdffile}
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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="attorneyDistributionStatus != null">
-            or ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
-        insert into AMSSHIP_DELIVERY_ATTORNEY (ATTORNEY_ID, BATCH_ID, PORT_ID,
-                                               DOWN_SWIM_PORT_ID, ATTORNEY_PICKUP_CONTACT_PERSON,
-                                               ATTORENY_PICKUP_IDCARD, ATTORNEY_CONTACT_TELEPHONE,
-                                               ATTORNEY_TIME, ATTORNEY_PDFFILE, DELETE_NAME,
-                                               DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
-                                               UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-                                               DELETED, ATTORNEY_DISTRIBUTION_STATUS)
-        values (#{attorneyId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{portId,jdbcType=DECIMAL},
-                #{downSwimPortId,jdbcType=DECIMAL}, #{attorneyPickupContactPerson,jdbcType=VARCHAR},
-                #{attorenyPickupIdcard,jdbcType=VARCHAR}, #{attorneyContactTelephone,jdbcType=VARCHAR},
-                #{attorneyTime,jdbcType=TIMESTAMP}, #{attorneyPdffile,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR},
-                #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
-                #{deleted,jdbcType=DECIMAL}, #{attorneyDistributionStatus,jdbcType=DECIMAL})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
-        insert into AMSSHIP_DELIVERY_ATTORNEY
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="attorneyId != null">
-                ATTORNEY_ID,
-            </if>
-            <if test="batchId != null">
-                BATCH_ID,
-            </if>
-            <if test="portId != null">
-                PORT_ID,
-            </if>
-            <if test="downSwimPortId != null">
-                DOWN_SWIM_PORT_ID,
-            </if>
-            <if test="attorneyPickupContactPerson != null">
-                ATTORNEY_PICKUP_CONTACT_PERSON,
-            </if>
-            <if test="attorenyPickupIdcard != null">
-                ATTORENY_PICKUP_IDCARD,
-            </if>
-            <if test="attorneyContactTelephone != null">
-                ATTORNEY_CONTACT_TELEPHONE,
-            </if>
-            <if test="attorneyTime != null">
-                ATTORNEY_TIME,
-            </if>
-            <if test="attorneyPdffile != null">
-                ATTORNEY_PDFFILE,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="attorneyDistributionStatus != null">
-                ATTORNEY_DISTRIBUTION_STATUS,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="attorneyId != null">
-                #{attorneyId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="portId != null">
-                #{portId,jdbcType=DECIMAL},
-            </if>
-            <if test="downSwimPortId != null">
-                #{downSwimPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="attorneyPickupContactPerson != null">
-                #{attorneyPickupContactPerson,jdbcType=VARCHAR},
-            </if>
-            <if test="attorenyPickupIdcard != null">
-                #{attorenyPickupIdcard,jdbcType=VARCHAR},
-            </if>
-            <if test="attorneyContactTelephone != null">
-                #{attorneyContactTelephone,jdbcType=VARCHAR},
-            </if>
-            <if test="attorneyTime != null">
-                #{attorneyTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="attorneyPdffile != null">
-                #{attorneyPdffile,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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="attorneyDistributionStatus != null">
-                #{attorneyDistributionStatus,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
-        update AMSSHIP_DELIVERY_ATTORNEY
-        set BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            PORT_ID = #{portId,jdbcType=DECIMAL},
-            DOWN_SWIM_PORT_ID = #{downSwimPortId,jdbcType=DECIMAL},
-            ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson,jdbcType=VARCHAR},
-            ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard,jdbcType=VARCHAR},
-            ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone,jdbcType=VARCHAR},
-            ATTORNEY_TIME = #{attorneyTime,jdbcType=TIMESTAMP},
-            ATTORNEY_PDFFILE = #{attorneyPdffile,jdbcType=VARCHAR},
-            DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME = #{deleteTime,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},
-            ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus,jdbcType=DECIMAL}
-        where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
-        update AMSSHIP_DELIVERY_ATTORNEY
-        <set>
-            <if test="batchId != null">
-                BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="portId != null">
-                PORT_ID = #{portId,jdbcType=DECIMAL},
-            </if>
-            <if test="downSwimPortId != null">
-                DOWN_SWIM_PORT_ID = #{downSwimPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="attorneyPickupContactPerson != null">
-                ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson,jdbcType=VARCHAR},
-            </if>
-            <if test="attorenyPickupIdcard != null">
-                ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard,jdbcType=VARCHAR},
-            </if>
-            <if test="attorneyContactTelephone != null">
-                ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone,jdbcType=VARCHAR},
-            </if>
-            <if test="attorneyTime != null">
-                ATTORNEY_TIME = #{attorneyTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="attorneyPdffile != null">
-                ATTORNEY_PDFFILE = #{attorneyPdffile,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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="attorneyDistributionStatus != null">
-                ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select" />
-        where ATTORNEY_ID = #{attorneyId,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 AMSSHIP_DELIVERY_ATTORNEY
-        (ATTORNEY_ID,
-        BATCH_ID, PORT_ID, DOWN_SWIM_PORT_ID,
-        ATTORNEY_PICKUP_CONTACT_PERSON, ATTORENY_PICKUP_IDCARD,
-        ATTORNEY_CONTACT_TELEPHONE, ATTORNEY_TIME,
-        ATTORNEY_PDFFILE, DELETE_NAME,
-        DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED,
-        ATTORNEY_DISTRIBUTION_STATUS)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.attorneyId,jdbcType=DECIMAL},
-        #{item.batchId,jdbcType=DECIMAL}, #{item.portId,jdbcType=DECIMAL}, #{item.downSwimPortId,jdbcType=DECIMAL},
-        #{item.attorneyPickupContactPerson,jdbcType=VARCHAR}, #{item.attorenyPickupIdcard,jdbcType=VARCHAR},
-        #{item.attorneyContactTelephone,jdbcType=VARCHAR}, #{item.attorneyTime,jdbcType=TIMESTAMP},
-        #{item.attorneyPdffile,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
-        #{item.deleteTime,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.attorneyDistributionStatus,jdbcType=DECIMAL} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update AMSSHIP_DELIVERY_ATTORNEY
-        set
-        ATTORNEY_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyId,jdbcType=DECIMAL}
-        </foreach>
-        ,BATCH_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-        </foreach>
-        ,PORT_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
-        </foreach>
-        ,DOWN_SWIM_PORT_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.downSwimPortId,jdbcType=DECIMAL}
-        </foreach>
-        ,ATTORNEY_PICKUP_CONTACT_PERSON=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyPickupContactPerson,jdbcType=VARCHAR}
-        </foreach>
-        ,ATTORENY_PICKUP_IDCARD=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorenyPickupIdcard,jdbcType=VARCHAR}
-        </foreach>
-        ,ATTORNEY_CONTACT_TELEPHONE=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyContactTelephone,jdbcType=VARCHAR}
-        </foreach>
-        ,ATTORNEY_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,ATTORNEY_PDFFILE=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyPdffile,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,ATTORNEY_DISTRIBUTION_STATUS=
-        <foreach close="end" collection="list" index="index" item="item" open="case ATTORNEY_ID" separator=" ">
-            when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyDistributionStatus,jdbcType=DECIMAL}
-        </foreach>
-        where ATTORNEY_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-            #{item.attorneyId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from AMSSHIP_DELIVERY_ATTORNEY
-        where ATTORNEY_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <!--展示货权转移列表-->
-    <select id="selectdeliveryAttorney" resultType="java.util.Map">
-        select *
-        from(select
-        t3.SHIPPER_NAME "shipperName",
-        t4.PORT_NAME "carrierName",
-        t6.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        t8.MATERIAL_NAME "materialName",
-        t5.PORT_NAME "portName",
-        t5.PORT_NAME "portName1",
-        t1.ATTORNEY_PICKUP_CONTACT_PERSON "attorneyPickupContactPerson",
-        t1.ATTORENY_PICKUP_IDCARD "attorneyPickupIdcard",
-        t1.ATTORNEY_CONTACT_TELEPHONE "attorneyContactTelephone",
-        t1.ATTORNEY_TIME "attorneyTime",
-        t2.CARRIER_ID "carrierId",
-        t2.REQUESTER_GROUP_ID "groupId",
-        t1.ATTORNEY_ID "attorneyId",
-        t1.BATCH_ID "batchId",
-        t1.INSERT_TIME "insertTime",
-        ALUMINA_CONTENT "purchaseOrderMaterialNumber"
-        from AMSSHIP_DELIVERY_ATTORNEY t1
-        left join AMSSHIP_DELIVERY_NOTICE t2
-        on t1.BATCH_ID=t2.BATCH_ID
-        left join RMS_SHIPPER t3
-        on t2.REQUESTER_GROUP_ID=t3.SHIPPER_ID
-        left join RMS_PORT t4
-        on t2.CARRIER_ID=t4.PORT_ID
-        left join RMS_PORT t5
-        on t1.PORT_ID=t5.PORT_ID
-        left join DIL_BATCH t6
-        on t1.BATCH_ID=t6.BATCH_ID
-        left join AMS_PURCHASE_ORDER t7
-        on t6.BATCH_ID=t7.BATCH_ID
-        left join RMS_MATERIAL t8
-        on t6.MATERIAL_ID=t8.MATERIAL_ID
-        left join AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-        on t1.BATCH_ID = ACTR.BATCH_ID
-        where t1.deleted = 0 and t1.ATTORNEY_DISTRIBUTION_STATUS=#{status}
-        )
-        <where>
-            <if test="shipperName!= null">
-                and t3.SHIPPER_NAME in
-                <foreach close=")" collection="shipperName" item="item" open="(" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="carrierName!= null">
-                and t4.CARRIER_NAME in
-                <foreach close=")" collection="carrierName" item="item" open="(" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="materialName!= null">
-                and t8.MATERIAL_NAME in
-                <foreach close=")" collection="materialName" item="item" open="(" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="portName!= null">
-                and t5.PORT_NAME in
-                <foreach close=")" collection="portName" item="item" open="(" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="portName1!= null">
-                and t5.PORT_NAME in
-                <foreach close=")" collection="portName1" item="item" open="(" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime" />
-    </select>
-    <!--根据时间排序-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-
-    <!--  下拉框中获取收货人单位 -->
-    <select id="getPortName" resultType="java.util.LinkedHashMap">
-        select RP.PORT_ID   "id",
-               RP.PORT_ID   "value",
-               RP.PORT_NAME "label"
-        from RMS_PORT RP
-        WHERE RP.PORT_TYPE_ID = 1
-    </select>
-    <!--  下拉框中获取放货通知单id-->
-    <select id="getNoticeId" resultType="java.util.LinkedHashMap">
-        select ADN.NOTICE_ID "id",
-               ADN.NOTICE_ID "value",
-               ADN.NOTICE_ID "label"
-        from AMSSHIP_DELIVERY_NOTICE ADN
-    </select>
-    <!--  根据主键id进行查询-->
-    <select id="getDeliveryAttorneyId" resultType="java.util.Map">
-        select t1.BATCH_ID                       "batchId",
-               t1.PORT_ID                        "portId",
-               t1.DOWN_SWIM_PORT_ID              "downSwimPortId",
-               t1.ATTORNEY_PICKUP_CONTACT_PERSON "attorneyPickupContactPerson",
-               t1.ATTORENY_PICKUP_IDCARD         "attorneyPickupIdcard",
-               t1.ATTORNEY_CONTACT_TELEPHONE     "attorneyContactTelephone",
-               t1.ATTORNEY_TIME                  "attorneytime",
-               t1.ATTORNEY_PDFFILE               "attorneyPdffile"
-
-        from AMSSHIP_DELIVERY_ATTORNEY t1
-        where t1.ATTORNEY_ID = #{attorneyId}
-    </select>
-    <!--得到提货通知单id-->
-    <select id="getAttorneyId" resultType="java.util.LinkedHashMap">
-        SELECT ada.ATTORNEY_ID                    "id",
-               ada.ATTORNEY_ID                    "value",
-               ada.ATTORNEY_PICKUP_CONTACT_PERSON "label"
-        FROM AMSSHIP_DELIVERY_ATTORNEY ada
-    </select>
-
-    <!--得到发件人id（港口）-->
-    <select id="getPortId" resultType="java.util.LinkedHashMap">
-        SELECT rp.PORT_ID   "id",
-               rp.PORT_ID   "value",
-               rp.PORT_NAME "label"
-        FROM RMS_PORT rp
-    </select>
-
-    <!--得到收件人id（下游码头）-->
-    <select id="getPierId" resultType="java.util.LinkedHashMap">
-        SELECT rp.PIER_ID   "id",
-               rp.PIER_ID   "value",
-               rp.PIER_NAME "label"
-        FROM RMS_PIER rp
-    </select>
-
-    <select id="getRmRawId" resultType="java.util.LinkedHashMap">
-        SELECT rrmr.GM_ID      "id",
-               rrmr.GM_ID      "value",
-               rrmr.GM_TONNAGE "label"
-        FROM WMSH_GRID_MATERIAL rrmr
-    </select>
-
-</mapper>

target/classes/com/steerinfo/dil/mapper/AmsshipDeliveryNoticeMapper.xml

@@ -1,980 +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.AmsshipDeliveryNoticeMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    <id column="NOTICE_ID" jdbcType="DECIMAL" property="noticeId" />
-    <result column="REQUESTER_GROUP_ID" jdbcType="DECIMAL" property="requesterGroupId" />
-    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-    <result column="NOTICE_COMMERCE_METHOD" jdbcType="VARCHAR" property="noticeCommerceMethod" />
-    <result column="NOTICE_HANDOVER_METHOD" jdbcType="VARCHAR" property="noticeHandoverMethod" />
-    <result column="PORT_ID" jdbcType="DECIMAL" property="portId" />
-    <result column="NOTICE_PORT_CONSTRUCTION_FEE" jdbcType="DECIMAL" property="noticePortConstructionFee" />
-    <result column="NOTICE_DELIVERY_TIME" jdbcType="TIMESTAMP" property="noticeDeliveryTime" />
-    <result column="NOTICE_PILE_FREE_DAYS" jdbcType="DECIMAL" property="noticePileFreeDays" />
-    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-    <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="NOTICE_DISTRIBUTION_STATUS" jdbcType="VARCHAR" property="noticeDistributionStatus" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-    <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-    <result column="PURCHASE_CONTRACT_UNIT_PRICE" jdbcType="DECIMAL" property="purchaseContractUnitPrice" />
-    <result column="PURCHASE_CONTRACT_MOISTURE" jdbcType="VARCHAR" property="purchaseContractMoisture" />
-    <result column="TFE_CONTENT" jdbcType="DECIMAL" property="tfeContent" />
-    <result column="SILICA_CONTENT" jdbcType="DECIMAL" property="silicaContent" />
-    <result column="ALUMINA_CONTENT" jdbcType="DECIMAL" property="aluminaContent" />
-    <result column="PHOSPHORUS_CONTENT" jdbcType="DECIMAL" property="phosphorusContent" />
-    <result column="MANGANESE_CONTENT" jdbcType="DECIMAL" property="manganeseContent" />
-  </resultMap>
-  <sql id="columns">
-    NOTICE_ID, REQUESTER_GROUP_ID, CARRIER_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
-    PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS,
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS, DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
-    PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT, SILICA_CONTENT,
-    ALUMINA_CONTENT, PHOSPHORUS_CONTENT, MANGANESE_CONTENT
-  </sql>
-  <sql id="columns_alias">
-    t.NOTICE_ID, t.REQUESTER_GROUP_ID, t.CARRIER_ID, t.NOTICE_COMMERCE_METHOD, t.NOTICE_HANDOVER_METHOD,
-    t.PORT_ID, t.NOTICE_PORT_CONSTRUCTION_FEE, t.NOTICE_DELIVERY_TIME, t.NOTICE_PILE_FREE_DAYS,
-    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.NOTICE_DISTRIBUTION_STATUS, t.DELETED, t.BATCH_ID,
-    t.PURCHASE_CONTRACT_UNIT_PRICE, t.PURCHASE_CONTRACT_MOISTURE, t.PURCHASE_CONTRACT_QUALITYINDEX,
-    t.TFE_CONTENT, t.SILICA_CONTENT, t.ALUMINA_CONTENT, t.PHOSPHORUS_CONTENT, t.MANGANESE_CONTENT
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM AMSSHIP_DELIVERY_NOTICE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM AMSSHIP_DELIVERY_NOTICE t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="noticeId != null">
-        and NOTICE_ID = #{noticeId}
-      </if>
-      <if test="requesterGroupId != null">
-        and REQUESTER_GROUP_ID = #{requesterGroupId}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
-        and NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
-      </if>
-      <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
-        and NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
-      </if>
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="noticePortConstructionFee != null">
-        and NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
-      </if>
-      <if test="noticeDeliveryTime != null">
-        and TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = #{noticeDeliveryTime}
-      </if>
-      <if test="noticePileFreeDays != null">
-        and NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME = #{deleteTime}
-      </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="noticeDistributionStatus != null and noticeDistributionStatus != ''">
-        and NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="batchId != null">
-        and BATCH_ID = #{batchId}
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        and PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
-      </if>
-      <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
-        and PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
-      </if>
-      <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
-        and PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex}
-      </if>
-      <if test="tfeContent != null">
-        and TFE_CONTENT = #{tfeContent}
-      </if>
-      <if test="silicaContent != null">
-        and  SILICA_CONTENT = #{silicaContent}
-      </if>
-      <if test="aluminaContent != null">
-        and ALUMINA_CONTENT = #{aluminaContent}
-      </if>
-      <if test="phosphorusContent != null">
-        and PHOSPHORUS_CONTENT = #{phosphorusContent}
-      </if>
-      <if test="manganeseContent != null">
-        and MANGANESE_CONTENT = #{manganeseContent}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="noticeId != null">
-        and NOTICE_ID = #{noticeId}
-      </if>
-      <if test="requesterGroupId != null">
-        and REQUESTER_GROUP_ID = #{requesterGroupId}
-      </if>
-      <if test="carrierId != null">
-        and CARRIER_ID = #{carrierId}
-      </if>
-      <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
-        and NOTICE_COMMERCE_METHOD LIKE '%${noticeCommerceMethod}%'
-      </if>
-      <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
-        and NOTICE_HANDOVER_METHOD LIKE '%${noticeHandoverMethod}%'
-      </if>
-      <if test="portId != null">
-        and PORT_ID = #{portId}
-      </if>
-      <if test="noticePortConstructionFee != null">
-        and NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
-      </if>
-      <if test="noticeDeliveryTime != null">
-        and TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = #{noticeDeliveryTime}
-      </if>
-      <if test="noticePileFreeDays != null">
-        and NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME LIKE '%${deleteName}%'
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME LIKE '%${deleteTime}%'
-      </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="noticeDistributionStatus != null and noticeDistributionStatus != ''">
-        and NOTICE_DISTRIBUTION_STATUS LIKE '%${noticeDistributionStatus}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="batchId != null">
-        and BATCH_ID = #{batchId}
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        and PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
-      </if>
-      <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
-        and PURCHASE_CONTRACT_MOISTURE LIKE '%${purchaseContractMoisture}%'
-      </if>
-      <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
-        and PURCHASE_CONTRACT_QUALITYINDEX LIKE '%${purchaseContractQualityindex}%'
-      </if>
-      <if test="tfeContent != null">
-        and TFE_CONTENT = #{tfeContent}
-      </if>
-      <if test="silicaContent != null">
-        and  SILICA_CONTENT = #{silicaContent}
-      </if>
-      <if test="aluminaContent != null">
-        and ALUMINA_CONTENT = #{aluminaContent}
-      </if>
-      <if test="phosphorusContent != null">
-        and PHOSPHORUS_CONTENT = #{phosphorusContent}
-      </if>
-      <if test="manganeseContent != null">
-        and MANGANESE_CONTENT = #{manganeseContent}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-    delete from AMSSHIP_DELIVERY_NOTICE
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from AMSSHIP_DELIVERY_NOTICE
-    where 1!=1
-    <if test="requesterGroupId != null">
-      or REQUESTER_GROUP_ID = #{requesterGroupId}
-    </if>
-    <if test="carrierId != null">
-      or CARRIER_ID = #{carrierId}
-    </if>
-    <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
-      or NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
-    </if>
-    <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
-      or NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
-    </if>
-    <if test="portId != null">
-      or PORT_ID = #{portId}
-    </if>
-    <if test="noticePortConstructionFee != null">
-      or NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
-    </if>
-    <if test="noticeDeliveryTime != null">
-      or TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = '#{noticeDeliveryTime}'
-    </if>
-    <if test="noticePileFreeDays != null">
-      or NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
-    </if>
-    <if test="deleteName != null and deleteName != ''">
-      or DELETE_NAME = #{deleteName}
-    </if>
-    <if test="deleteTime != null and deleteTime != ''">
-      or DELETE_TIME = #{deleteTime}
-    </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="noticeDistributionStatus != null and noticeDistributionStatus != ''">
-      or NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
-    </if>
-    <if test="deleted != null">
-      or DELETED = #{deleted}
-    </if>
-    <if test="batchId != null">
-      or BATCH_ID = #{batchId}
-    </if>
-    <if test="purchaseContractUnitPrice != null">
-      or PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
-    </if>
-    <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
-      or PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
-    </if>
-    <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
-      or PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex}
-    </if>
-    <if test="tfeContent != null">
-      or TFE_CONTENT = #{tfeContent}
-    </if>
-    <if test="silicaContent != null">
-      or  SILICA_CONTENT = #{silicaContent}
-    </if>
-    <if test="aluminaContent != null">
-      or ALUMINA_CONTENT = #{aluminaContent}
-    </if>
-    <if test="phosphorusContent != null">
-      or PHOSPHORUS_CONTENT = #{phosphorusContent}
-    </if>
-    <if test="manganeseContent != null">
-      or MANGANESE_CONTENT = #{manganeseContent}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    insert into AMSSHIP_DELIVERY_NOTICE (NOTICE_ID, REQUESTER_GROUP_ID, CARRIER_ID,
-                                         NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
-                                         PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME,
-                                         NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME,
-                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS,
-                                         DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
-                                         PURCHASE_CONTRACT_MOISTURE, PURCHASE_CONTRACT_QUALITYINDEX,
-                                         TFE_CONTENT, "SILICA_CONTENT", ALUMINA_CONTENT,
-                                         PHOSPHORUS_CONTENT, MANGANESE_CONTENT)
-    values (#{noticeId,jdbcType=DECIMAL}, #{requesterGroupId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-            #{noticeCommerceMethod,jdbcType=VARCHAR}, #{noticeHandoverMethod,jdbcType=VARCHAR},
-            #{portId,jdbcType=DECIMAL}, #{noticePortConstructionFee,jdbcType=DECIMAL}, #{noticeDeliveryTime,jdbcType=TIMESTAMP},
-            #{noticePileFreeDays,jdbcType=DECIMAL}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
-            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{noticeDistributionStatus,jdbcType=VARCHAR},
-            #{deleted,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{purchaseContractUnitPrice,jdbcType=DECIMAL},
-            #{purchaseContractMoisture,jdbcType=VARCHAR}, #{purchaseContractQualityindex,jdbcType=VARCHAR},
-            #{tfeContent,jdbcType=DECIMAL}, #{silicaContent,jdbcType=DECIMAL}, #{aluminaContent,jdbcType=DECIMAL},
-            #{phosphorusContent,jdbcType=DECIMAL}, #{manganeseContent,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    insert into AMSSHIP_DELIVERY_NOTICE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="noticeId != null">
-        NOTICE_ID,
-      </if>
-      <if test="requesterGroupId != null">
-        REQUESTER_GROUP_ID,
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID,
-      </if>
-      <if test="noticeCommerceMethod != null">
-        NOTICE_COMMERCE_METHOD,
-      </if>
-      <if test="noticeHandoverMethod != null">
-        NOTICE_HANDOVER_METHOD,
-      </if>
-      <if test="portId != null">
-        PORT_ID,
-      </if>
-      <if test="noticePortConstructionFee != null">
-        NOTICE_PORT_CONSTRUCTION_FEE,
-      </if>
-      <if test="noticeDeliveryTime != null">
-        NOTICE_DELIVERY_TIME,
-      </if>
-      <if test="noticePileFreeDays != null">
-        NOTICE_PILE_FREE_DAYS,
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </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="noticeDistributionStatus != null">
-        NOTICE_DISTRIBUTION_STATUS,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-      <if test="batchId != null">
-        BATCH_ID,
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        PURCHASE_CONTRACT_UNIT_PRICE,
-      </if>
-      <if test="purchaseContractMoisture != null">
-        PURCHASE_CONTRACT_MOISTURE,
-      </if>
-      <if test="purchaseContractQualityindex != null">
-        PURCHASE_CONTRACT_QUALITYINDEX,
-      </if>
-      <if test="tfeContent != null">
-        TFE_CONTENT,
-      </if>
-      <if test="silicaContent != null">
-        "SILICA_CONTENT",
-      </if>
-      <if test="aluminaContent != null">
-        ALUMINA_CONTENT,
-      </if>
-      <if test="phosphorusContent != null">
-        PHOSPHORUS_CONTENT,
-      </if>
-      <if test="manganeseContent != null">
-        MANGANESE_CONTENT,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="noticeId != null">
-        #{noticeId,jdbcType=DECIMAL},
-      </if>
-      <if test="requesterGroupId != null">
-        #{requesterGroupId,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="noticeCommerceMethod != null">
-        #{noticeCommerceMethod,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeHandoverMethod != null">
-        #{noticeHandoverMethod,jdbcType=VARCHAR},
-      </if>
-      <if test="portId != null">
-        #{portId,jdbcType=DECIMAL},
-      </if>
-      <if test="noticePortConstructionFee != null">
-        #{noticePortConstructionFee,jdbcType=DECIMAL},
-      </if>
-      <if test="noticeDeliveryTime != null">
-        #{noticeDeliveryTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="noticePileFreeDays != null">
-        #{noticePileFreeDays,jdbcType=DECIMAL},
-      </if>
-      <if test="deleteName != null">
-        #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,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="noticeDistributionStatus != null">
-        #{noticeDistributionStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="batchId != null">
-        #{batchId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        #{purchaseContractUnitPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseContractMoisture != null">
-        #{purchaseContractMoisture,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseContractQualityindex != null">
-        #{purchaseContractQualityindex,jdbcType=VARCHAR},
-      </if>
-      <if test="tfeContent != null">
-        #{tfeContent,jdbcType=DECIMAL},
-      </if>
-      <if test="silicaContent != null">
-        #{silicaContent,jdbcType=DECIMAL},
-      </if>
-      <if test="aluminaContent != null">
-        #{aluminaContent,jdbcType=DECIMAL},
-      </if>
-      <if test="phosphorusContent != null">
-        #{phosphorusContent,jdbcType=DECIMAL},
-      </if>
-      <if test="manganeseContent != null">
-        #{manganeseContent,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    update AMSSHIP_DELIVERY_NOTICE
-    set REQUESTER_GROUP_ID = #{requesterGroupId,jdbcType=DECIMAL},
-        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-        NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod,jdbcType=VARCHAR},
-        NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
-        PORT_ID = #{portId,jdbcType=DECIMAL},
-        NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
-        NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
-        NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-        DELETE_TIME = #{deleteTime,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},
-        NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=VARCHAR},
-        DELETED = #{deleted,jdbcType=DECIMAL},
-        BATCH_ID = #{batchId,jdbcType=DECIMAL},
-        PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
-        PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
-        PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex,jdbcType=VARCHAR},
-        TFE_CONTENT = #{tfeContent,jdbcType=DECIMAL},
-        SILICA_CONTENT = #{silicaContent,jdbcType=DECIMAL},
-        ALUMINA_CONTENT = #{aluminaContent,jdbcType=DECIMAL},
-        PHOSPHORUS_CONTENT = #{phosphorusContent,jdbcType=DECIMAL},
-        MANGANESE_CONTENT = #{manganeseContent,jdbcType=DECIMAL}
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    update AMSSHIP_DELIVERY_NOTICE
-    <set>
-      <if test="requesterGroupId != null">
-        REQUESTER_GROUP_ID = #{requesterGroupId,jdbcType=DECIMAL},
-      </if>
-      <if test="carrierId != null">
-        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      </if>
-      <if test="noticeCommerceMethod != null">
-        NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeHandoverMethod != null">
-        NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
-      </if>
-      <if test="portId != null">
-        PORT_ID = #{portId,jdbcType=DECIMAL},
-      </if>
-      <if test="noticePortConstructionFee != null">
-        NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
-      </if>
-      <if test="noticeDeliveryTime != null">
-        NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="noticePileFreeDays != null">
-        NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,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="noticeDistributionStatus != null">
-        NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="batchId != null">
-        BATCH_ID = #{batchId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseContractMoisture != null">
-        PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseContractQualityindex != null">
-        PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex,jdbcType=VARCHAR},
-      </if>
-      <if test="tfeContent != null">
-        TFE_CONTENT = #{tfeContent,jdbcType=DECIMAL},
-      </if>
-      <if test="silicaContent != null">
-        SILICA_CONTENT = #{silicaContent,jdbcType=DECIMAL},
-      </if>
-      <if test="aluminaContent != null">
-        ALUMINA_CONTENT = #{aluminaContent,jdbcType=DECIMAL},
-      </if>
-      <if test="phosphorusContent != null">
-        PHOSPHORUS_CONTENT = #{phosphorusContent,jdbcType=DECIMAL},
-      </if>
-      <if test="manganeseContent != null">
-        MANGANESE_CONTENT = #{manganeseContent,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" 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 AMSSHIP_DELIVERY_NOTICE
-    (NOTICE_ID,
-    REQUESTER_GROUP_ID, CARRIER_ID,
-    NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
-    PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE,
-    NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS,
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK,
-    NOTICE_DISTRIBUTION_STATUS, DELETED,
-    BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
-    PURCHASE_CONTRACT_MOISTURE, PURCHASE_CONTRACT_QUALITYINDEX,
-    TFE_CONTENT, SILICA_CONTENT, ALUMINA_CONTENT,
-    PHOSPHORUS_CONTENT, MANGANESE_CONTENT
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.noticeId,jdbcType=DECIMAL},
-    #{item.requesterGroupId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL},
-    #{item.noticeCommerceMethod,jdbcType=VARCHAR}, #{item.noticeHandoverMethod,jdbcType=VARCHAR},
-    #{item.portId,jdbcType=DECIMAL}, #{item.noticePortConstructionFee,jdbcType=DECIMAL},
-    #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}, #{item.noticePileFreeDays,jdbcType=DECIMAL},
-    #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.noticeDistributionStatus,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-    #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseContractUnitPrice,jdbcType=DECIMAL},
-    #{item.purchaseContractMoisture,jdbcType=VARCHAR}, #{item.purchaseContractQualityindex,jdbcType=VARCHAR},
-    #{item.tfeContent,jdbcType=DECIMAL}, #{item.silicaContent,jdbcType=DECIMAL}, #{item.aluminaContent,jdbcType=DECIMAL},
-    #{item.phosphorusContent,jdbcType=DECIMAL}, #{item.manganeseContent,jdbcType=DECIMAL}
-    from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update AMSSHIP_DELIVERY_NOTICE
-    set
-    NOTICE_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeId,jdbcType=DECIMAL}
-    </foreach>
-    ,REQUESTER_GROUP_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.requesterGroupId,jdbcType=DECIMAL}
-    </foreach>
-    ,CARRIER_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-    </foreach>
-    ,NOTICE_COMMERCE_METHOD=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeCommerceMethod,jdbcType=VARCHAR}
-    </foreach>
-    ,NOTICE_HANDOVER_METHOD=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeHandoverMethod,jdbcType=VARCHAR}
-    </foreach>
-    ,PORT_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
-    </foreach>
-    ,NOTICE_PORT_CONSTRUCTION_FEE=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePortConstructionFee,jdbcType=DECIMAL}
-    </foreach>
-    ,NOTICE_DELIVERY_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,NOTICE_PILE_FREE_DAYS=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePileFreeDays,jdbcType=DECIMAL}
-    </foreach>
-    ,DELETE_NAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,NOTICE_DISTRIBUTION_STATUS=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDistributionStatus,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETED=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-    </foreach>
-    ,BATCH_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASE_CONTRACT_UNIT_PRICE=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractUnitPrice,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASE_CONTRACT_MOISTURE=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractMoisture,jdbcType=VARCHAR}
-    </foreach>
-    ,PURCHASE_CONTRACT_QUALITYINDEX=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractQualityindex,jdbcType=VARCHAR}
-    </foreach>
-    ,TFE_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.tfeContent,jdbcType=DECIMAL}
-    </foreach>
-    ,SILICA_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.silicaContent,jdbcType=DECIMAL}
-    </foreach>
-    ,ALUMINA_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.aluminaContent,jdbcType=DECIMAL}
-    </foreach>
-    ,PHOSPHORUS_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.phosphorusContent,jdbcType=DECIMAL}
-    </foreach>
-    ,MANGANESE_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-      when #{item.noticeId,jdbcType=DECIMAL} then #{item.manganeseContent,jdbcType=DECIMAL}
-    </foreach>
-    where NOTICE_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-      #{item.noticeId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from AMSSHIP_DELIVERY_NOTICE
-    where NOTICE_ID in
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!--展示提货委托通知  -->
-  <select id="selectShipDeliveryNotice" resultType="java.util.Map">
-    select *
-    from
-    (
-    select
-    t3.SHIPPER_NAME  "shipperName",
-    t4.PORT_NAME "carrierName",
-    t1.NOTICE_COMMERCE_METHOD   "noticeCommerceMethod",
-    t1.NOTICE_HANDOVER_METHOD   "noticeHandoverMethod",
-    t1.NOTICE_PORT_CONSTRUCTION_FEE  "noticePortConstructionFee",
-    t1.NOTICE_DELIVERY_TIME  "noticeDeliveryTime",
-    t1.NOTICE_PILE_FREE_DAYS  "noticePileFreeDays",
-    t1.PURCHASE_CONTRACT_UNIT_PRICE "purchaseContractUnitPrice",
-    t1.PURCHASE_CONTRACT_MOISTURE "purchaseContractMoisture",
-    t1.TFE_CONTENT "tfeContent",
-    t1.PHOSPHORUS_CONTENT "phosphorusContent",
-    t1.ALUMINA_CONTENT "aluminaContent",
-    t1.MANGANESE_CONTENT "manganeseContent",
-    t1.SILICA_CONTENT "silicaContent",
-    t8.MATERIAL_NAME "materialName",
-    t7.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-    t5.RESULT_NUMBER_OF_LOANS  "resultNumberOfLoans",
-    t6.PORT_NAME "portName",
-    t1.NOTICE_ID  "noticeId",
-    t1.BATCH_ID "batchId",
-    t1.INSERT_TIME "insertTime"
-    from  AMSSHIP_DELIVERY_NOTICE t1
-    left join RMS_SHIPPER t3
-    on t1.REQUESTER_GROUP_ID=t3.SHIPPER_ID
-    left join RMS_PORT t4
-    on t1.CARRIER_ID=t4.PORT_ID
-    left join AMSSHIP_CARGO_TRANSFER_RESULT t5
-    on t1.BATCH_ID=t5.BATCH_ID
-    left join  RMS_PORT t6
-    on t1.PORT_ID=t6.PORT_ID
-    left join  DIL_BATCH t7
-    on t1.BATCH_ID=t7.BATCH_ID
-    left join RMS_MATERIAL t8
-    on t7.MATERIAL_ID=t8.MATERIAL_ID
-
-    where  t1.deleted = 0 and t1.NOTICE_DISTRIBUTION_STATUS=#{status}
-    )
-    <where>
-      <if test="materialCapacityName!= null">
-        and t1.MATERIAL_CAPACITY_NAME in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="noticeCommerceMethod!= null">
-        and t1.NOTICE_COMMERCE_METHOD in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="noticeHandoverMethod!= null">
-        and t1.NOTICE_HANDOVER_METHOD in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="noticePortConstructionFee!= null">
-        and t1.NOTICE_PORT_CONSTRUCTION_FEE in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="noticeDeliveryTime!= null">
-        and   t1.NOTICE_DELIVERY_TIME in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="noticePileFreeDays!= null">
-        and   t1.NOTICE_PILE_FREE_DAYS in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="shipperName!= null">
-        and   t3.SHIPPER_NAME in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="carrierName!= null">
-        and   t4.CARRIER_NAME in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="resultNumberOfLoans!= null">
-        and    t5.RESULT_NUMBER_OF_LOANS in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <where>
-      <if test="portName!= null">
-        and    t6.PORT_NAME in
-        <foreach close=")" collection="resultNumber" item="item" open="(" separator=",">
-          #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderByInsertTime" />
-  </select>
-  <sql id="orderByInsertTime">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
-  </sql>
-
-  <!-- 自动生成id-->
-  <select id="selectMaxId" resultType="DECIMAL">
-    SELECT MAX(NOTICE_ID)+1 FROM AMSSHIP_DELIVERY_NOTICE
-  </select>
-  <!--  下拉框中获取货权转移编号 -->
-  <select id="getResultNumber" resultType="java.util.LinkedHashMap">
-    select
-      CARGO.CARGO_TRANSFER_RESULT_ID "id",
-      CARGO.CARGO_TRANSFER_RESULT_ID "value",
-      CARGO.RESULT_NUMBER "label"
-    from
-      AMSSHIP_CARGO_TRANSFER_RESULT   CARGO
-  </select>
-  <!--  下拉框中获取承运单位 -->
-  <select id="getcarrier" resultType="java.util.LinkedHashMap">
-    select
-      RC.CARRIER_ID   "id",
-      RC.CARRIER_ID   "value",
-      RC.CARRIER_NAME  "label"
-    from
-      RMS_CARRIER   RC
-  </select>
-  <!--  下拉框中获取托运单位 -->
-  <select id="getShipper" resultType="java.util.LinkedHashMap">
-    select
-      RS.SHIPPER_ID "id",
-      RS.SHIPPER_ID "value",
-      RS.SHIPPER_NAME "label"
-    from
-      RMS_SHIPPER RS
-  </select>
-  <!--渲染数据-->
-  <select id="selectByNoticeId" resultType="java.util.Map">
-    select
-      t1.BATCH_ID "batchId",
-      t1.REQUESTER_GROUP_ID "requesterGroupId",
-      t1.CARRIER_ID  "carrierId",
-      t1.NOTICE_COMMERCE_METHOD "noticeCommerceMethod",
-      t1.NOTICE_HANDOVER_METHOD "noticeHandoverMethod",
-      t1.PORT_ID  "portId",
-      t1.NOTICE_PORT_CONSTRUCTION_FEE "noticePortConstructionFee",
-      t1.NOTICE_DELIVERY_TIME "noticeDeliveryTime",
-      t1.NOTICE_PILE_FREE_DAYS "noticePileFreeDays",
-      t1.PURCHASE_CONTRACT_UNIT_PRICE "purchaseContractUnitPrice",
-      t1.PURCHASE_CONTRACT_MOISTURE "purchaseContractMoisture",
-      t1.NOTICE_DISTRIBUTION_STATUS "noticeDistrbutionStatus",
-      t1.ALUMINA_CONTENT "aluminaContent",
-      t1.MANGANESE_CONTENT "manganeseContent",
-      t1.PHOSPHORUS_CONTENT "phosphorusContent",
-      t1.TFE_CONTENT "tfeContent",
-      t1.SILICA_CONTENT "silicaContent"
-    from
-      AMSSHIP_DELIVERY_NOTICE t1
-    where
-      t1.NOTICE_ID=#{noticeId}
-  </select>
-
-</mapper>

target/classes/com/steerinfo/dil/mapper/DilBatchMapper.xml

@@ -1,321 +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.DilBatchMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilBatch">
-    <id column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-    <result column="RESULT_FOREIGN_SHIP_NAME" jdbcType="VARCHAR" property="resultForeignShipName" />
-    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-    <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">
-    BATCH_ID, RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.BATCH_ID, t.RESULT_FOREIGN_SHIP_NAME, t.MATERIAL_ID, 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 DIL_BATCH
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM DIL_BATCH t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="batchId != null">
-        and BATCH_ID = #{batchId}
-      </if>
-      <if test="resultForeignShipName != null and resultForeignShipName != ''">
-        and RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </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="batchId != null">
-        and BATCH_ID = #{batchId}
-      </if>
-      <if test="resultForeignShipName != null and resultForeignShipName != ''">
-        and RESULT_FOREIGN_SHIP_NAME LIKE '%${resultForeignShipName}%'
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </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 DIL_BATCH
-    where BATCH_ID = #{batchId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_BATCH
-    where 1!=1 
-      <if test="resultForeignShipName != null and resultForeignShipName != ''">
-        or RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </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.DilBatch">
-    insert into DIL_BATCH (BATCH_ID, RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{batchId,jdbcType=DECIMAL}, #{resultForeignShipName,jdbcType=VARCHAR}, #{materialId,jdbcType=DECIMAL}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilBatch">
-    insert into DIL_BATCH
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="batchId != null">
-        BATCH_ID,
-      </if>
-      <if test="resultForeignShipName != null">
-        RESULT_FOREIGN_SHIP_NAME,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_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>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="batchId != null">
-        #{batchId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultForeignShipName != null">
-        #{resultForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialId != null">
-        #{materialId,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>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilBatch">
-    update DIL_BATCH
-    set RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName,jdbcType=VARCHAR},
-      MATERIAL_ID = #{materialId,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}
-    where BATCH_ID = #{batchId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilBatch">
-    update DIL_BATCH
-    <set>
-      <if test="resultForeignShipName != null">
-        RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,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>
-    </set>
-    where BATCH_ID = #{batchId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-    <include refid="select" />
-    where BATCH_ID = #{batchId,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_BATCH 
-      (BATCH_ID, 
-      RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.batchId,jdbcType=DECIMAL}, 
-      #{item.resultForeignShipName,jdbcType=VARCHAR}, #{item.materialId,jdbcType=DECIMAL}, 
-      #{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 DIL_BATCH
-     set
-       BATCH_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_FOREIGN_SHIP_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.resultForeignShipName,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
-          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where BATCH_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.batchId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_BATCH
-    where BATCH_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-<!-- 获取批次id-->
-<select id="getBatchList" resultType="java.util.Map" parameterType="java.util.Map">
-  select  DB.RESULT_FOREIGN_SHIP_NAME "shipName",
-          RM.MATERIAL_NAME "materialName",
-          DB.BATCH_ID "batchId",
-          DB.INSERT_TIME "insertTime"
-  from DIL_BATCH DB
-  LEFT JOIN RMS_MATERIAL RM
-  ON RM.MATERIAL_ID=DB.MATERIAL_ID
-</select>
-<!--获取货权转移批次id -->
-  <select id="getBatchListFortTransfer" resultType="java.util.Map" parameterType="java.util.Map">
-    select DB.RESULT_FOREIGN_SHIP_NAME "shipName",
-           RM.MATERIAL_NAME "materialName",
-           DB.BATCH_ID "batchId"
-
-    from AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-    LEFT JOIN DIL_BATCH DB
-    on ACTR.BATCH_ID = DB.BATCH_ID
-    LEFT JOIN RMS_MATERIAL RM
-    ON RM.MATERIAL_ID=DB.MATERIAL_ID
-    order by  DB.INSERT_TIME desc
-</select>
-<!--  根据用户输入模糊查询江船船名-->
-    <select id="getShipNameList"  resultType="java.util.Map" parameterType="java.lang.String">
-      select  RC.CAPACITY_NUMBER as "capacityName",
-              RC.CAPACITY_ID as "capacityId"
-      from RMS_CAPACITY RC
-      where RC.CAPACITY_NUMBER like #{state}
-    </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/OmsshipInstructionsCapacityMapper.xml

@@ -1,554 +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.OmsshipInstructionsCapacityMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
-    <id column="INSTRUCTIONS_CAPACITY_ID" jdbcType="DECIMAL" property="instructionsCapacityId" />
-    <result column="INSTRUCTIONS_ID" jdbcType="DECIMAL" property="instructionsId" />
-    <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
-    <result column="INSTRUCTION_PLANNED_LOADING" jdbcType="DECIMAL" property="instructionPlannedLoading" />
-    <result column="INSTRUCTIONS_SHIP_POSITION" jdbcType="VARCHAR" property="instructionsShipPosition" />
-    <result column="INSTRUCTION_CONTACT_INF" jdbcType="VARCHAR" property="instructionContactInf" />
-    <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="INSTRUCTIONS_CAPACITY_STATUS" jdbcType="VARCHAR" property="instructionsCapacityStatus" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-    <result column="INSTRUCTION_ESARRIVAL_TIME" jdbcType="TIMESTAMP" property="instructionEsarrivalTime" />
-  </resultMap>
-  <sql id="columns">
-    INSTRUCTIONS_CAPACITY_ID, INSTRUCTIONS_ID, CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
-    INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF, INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
-    DELETED, INSTRUCTION_ESARRIVAL_TIME
-  </sql>
-  <sql id="columns_alias">
-    t.INSTRUCTIONS_CAPACITY_ID, t.INSTRUCTIONS_ID, t.CAPACITY_ID, t.INSTRUCTION_PLANNED_LOADING,
-    t.INSTRUCTIONS_SHIP_POSITION, t.INSTRUCTION_CONTACT_INF, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.INSTRUCTIONS_CAPACITY_STATUS,
-    t.DELETED, t.INSTRUCTION_ESARRIVAL_TIME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM OMSSHIP_INSTRUCTIONS_CAPACITY
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM OMSSHIP_INSTRUCTIONS_CAPACITY t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="instructionsCapacityId != null">
-        and INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
-      </if>
-      <if test="instructionsId != null">
-        and INSTRUCTIONS_ID = #{instructionsId}
-      </if>
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="instructionPlannedLoading != null">
-        and INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
-      </if>
-      <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
-        and INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition}
-      </if>
-      <if test="instructionContactInf != null and instructionContactInf != ''">
-        and INSTRUCTION_CONTACT_INF = #{instructionContactInf}
-      </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="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
-        and INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="instructionEsarrivalTime != null">
-        and TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = #{instructionEsarrivalTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="instructionsCapacityId != null">
-        and INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
-      </if>
-      <if test="instructionsId != null">
-        and INSTRUCTIONS_ID = #{instructionsId}
-      </if>
-      <if test="capacityId != null">
-        and CAPACITY_ID = #{capacityId}
-      </if>
-      <if test="instructionPlannedLoading != null">
-        and INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
-      </if>
-      <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
-        and INSTRUCTIONS_SHIP_POSITION LIKE '%${instructionsShipPosition}%'
-      </if>
-      <if test="instructionContactInf != null and instructionContactInf != ''">
-        and INSTRUCTION_CONTACT_INF LIKE '%${instructionContactInf}%'
-      </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="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
-        and INSTRUCTIONS_CAPACITY_STATUS LIKE '%${instructionsCapacityStatus}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="instructionEsarrivalTime != null">
-        and TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = #{instructionEsarrivalTime}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
-    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
-    where 1!=1
-    <if test="instructionsId != null">
-      or INSTRUCTIONS_ID = #{instructionsId}
-    </if>
-    <if test="capacityId != null">
-      or CAPACITY_ID = #{capacityId}
-    </if>
-    <if test="instructionPlannedLoading != null">
-      or INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
-    </if>
-    <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
-      or INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition}
-    </if>
-    <if test="instructionContactInf != null and instructionContactInf != ''">
-      or INSTRUCTION_CONTACT_INF = #{instructionContactInf}
-    </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="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
-      or INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus}
-    </if>
-    <if test="deleted != null">
-      or DELETED = #{deleted}
-    </if>
-    <if test="instructionEsarrivalTime != null">
-      or TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = '#{instructionEsarrivalTime}'
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
-    insert into OMSSHIP_INSTRUCTIONS_CAPACITY (INSTRUCTIONS_CAPACITY_ID, INSTRUCTIONS_ID,
-      CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
-      INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF,
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-      UPDATE_TIME, INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
-      DELETED, INSTRUCTION_ESARRIVAL_TIME)
-    values (#{instructionsCapacityId,jdbcType=DECIMAL}, #{instructionsId,jdbcType=DECIMAL},
-      #{capacityId,jdbcType=DECIMAL}, #{instructionPlannedLoading,jdbcType=DECIMAL},
-      #{instructionsShipPosition,jdbcType=VARCHAR}, #{instructionContactInf,jdbcType=VARCHAR},
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{instructionsCapacityStatus,jdbcType=VARCHAR},
-      #{deleted,jdbcType=DECIMAL}, #{instructionEsarrivalTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
-    insert into OMSSHIP_INSTRUCTIONS_CAPACITY
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="instructionsCapacityId != null">
-        INSTRUCTIONS_CAPACITY_ID,
-      </if>
-      <if test="instructionsId != null">
-        INSTRUCTIONS_ID,
-      </if>
-      <if test="capacityId != null">
-        CAPACITY_ID,
-      </if>
-      <if test="instructionPlannedLoading != null">
-        INSTRUCTION_PLANNED_LOADING,
-      </if>
-      <if test="instructionsShipPosition != null">
-        INSTRUCTIONS_SHIP_POSITION,
-      </if>
-      <if test="instructionContactInf != null">
-        INSTRUCTION_CONTACT_INF,
-      </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="instructionsCapacityStatus != null">
-        INSTRUCTIONS_CAPACITY_STATUS,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-      <if test="instructionEsarrivalTime != null">
-        INSTRUCTION_ESARRIVAL_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="instructionsCapacityId != null">
-        #{instructionsCapacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionsId != null">
-        #{instructionsId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityId != null">
-        #{capacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionPlannedLoading != null">
-        #{instructionPlannedLoading,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionsShipPosition != null">
-        #{instructionsShipPosition,jdbcType=VARCHAR},
-      </if>
-      <if test="instructionContactInf != null">
-        #{instructionContactInf,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="instructionsCapacityStatus != null">
-        #{instructionsCapacityStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionEsarrivalTime != null">
-        #{instructionEsarrivalTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
-    update OMSSHIP_INSTRUCTIONS_CAPACITY
-    set INSTRUCTIONS_ID = #{instructionsId,jdbcType=DECIMAL},
-      CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-      INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading,jdbcType=DECIMAL},
-      INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition,jdbcType=VARCHAR},
-      INSTRUCTION_CONTACT_INF = #{instructionContactInf,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},
-      INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      INSTRUCTION_ESARRIVAL_TIME = #{instructionEsarrivalTime,jdbcType=TIMESTAMP}
-    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
-    update OMSSHIP_INSTRUCTIONS_CAPACITY
-    <set>
-      <if test="instructionsId != null">
-        INSTRUCTIONS_ID = #{instructionsId,jdbcType=DECIMAL},
-      </if>
-      <if test="capacityId != null">
-        CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionPlannedLoading != null">
-        INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionsShipPosition != null">
-        INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition,jdbcType=VARCHAR},
-      </if>
-      <if test="instructionContactInf != null">
-        INSTRUCTION_CONTACT_INF = #{instructionContactInf,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="instructionsCapacityStatus != null">
-        INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="instructionEsarrivalTime != null">
-        INSTRUCTION_ESARRIVAL_TIME = #{instructionEsarrivalTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,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 OMSSHIP_INSTRUCTIONS_CAPACITY
-    (INSTRUCTIONS_CAPACITY_ID,
-    INSTRUCTIONS_ID, CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
-    INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF,
-    INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
-    DELETED, INSTRUCTION_ESARRIVAL_TIME
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.instructionsCapacityId,jdbcType=DECIMAL},
-    #{item.instructionsId,jdbcType=DECIMAL}, #{item.capacityId,jdbcType=DECIMAL}, #{item.instructionPlannedLoading,jdbcType=DECIMAL},
-    #{item.instructionsShipPosition,jdbcType=VARCHAR}, #{item.instructionContactInf,jdbcType=VARCHAR},
-    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.instructionsCapacityStatus,jdbcType=VARCHAR},
-    #{item.deleted,jdbcType=DECIMAL}, #{item.instructionEsarrivalTime,jdbcType=TIMESTAMP}
-    from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update OMSSHIP_INSTRUCTIONS_CAPACITY
-    set
-    INSTRUCTIONS_CAPACITY_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsCapacityId,jdbcType=DECIMAL}
-    </foreach>
-    ,INSTRUCTIONS_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsId,jdbcType=DECIMAL}
-    </foreach>
-    ,CAPACITY_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
-    </foreach>
-    ,INSTRUCTION_PLANNED_LOADING=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionPlannedLoading,jdbcType=DECIMAL}
-    </foreach>
-    ,INSTRUCTIONS_SHIP_POSITION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsShipPosition,jdbcType=VARCHAR}
-    </foreach>
-    ,INSTRUCTION_CONTACT_INF=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionContactInf,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,INSTRUCTIONS_CAPACITY_STATUS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsCapacityStatus,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETED=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-    </foreach>
-    ,INSTRUCTION_ESARRIVAL_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
-      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionEsarrivalTime,jdbcType=TIMESTAMP}
-    </foreach>
-    where INSTRUCTIONS_CAPACITY_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.instructionsCapacityId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
-    where INSTRUCTIONS_CAPACITY_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectOrderId" resultType="java.util.LinkedHashMap">
-    SELECT
-    oic.INSTRUCTIONS_CAPACITY_ID "id",
-    oic.INSTRUCTIONS_CAPACITY_ID "value",
-    oic.INSTRUCTIONS_CAPACITY_ID "label"
-    FROM
-    OMSSHIP_INSTRUCTIONS_CAPACITY oic
-  </select>
-
-  <!--获得最大id-->
-  <select id="selectMaxId" resultType="DECIMAL">
-    SELECT MAX(INSTRUCTIONS_CAPACITY_ID)+1 FROM OMSSHIP_INSTRUCTIONS_CAPACITY
-  </select>
-  <sql id="orderByInsertTime">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
-  </sql>
-  <!--查询一条装船指令下的船只信息-->
-  <select id="selectCapacities" resultType="java.util.Map">
-    SELECT * FROM
-    (SELECT
-    oic.INSTRUCTIONS_ID as "instructionsId",
-    oic.INSERT_TIME as "insertTime",
-    oic.INSTRUCTIONS_CAPACITY_ID as "orderId",
-    rc.CAPACITY_NUMBER as "capacityName",
-    oic.INSTRUCTIONS_CAPACITY_STATUS as "isEmpty",
-    oic.INSTRUCTIONS_SHIP_POSITION as "nowLocation",
-    oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-    oic.INSTRUCTION_CONTACT_INF as "phoneNumber",
-    oic.INSTRUCTION_ESARRIVAL_TIME as "esArrivalTime"
-    FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
-    LEFT JOIN RMS_CAPACITY rc
-    ON oic.CAPACITY_ID = rc.CAPACITY_ID
-    WHERE oic.INSTRUCTIONS_ID = #{instructionsId}
-    AND oic.DELETED=0)
-    <where>
-      <if test="capacityName!= null">
-        and
-        <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-          "capacityName" in  #{item}
-        </foreach>
-      </if>
-      <if test="isEmpty!= null">
-        and
-        <foreach collection="isEmpty" item="item" open="(" separator="," close=")">
-          "isEmpty" in  #{item}
-        </foreach>
-      </if>
-      <if test="nowLocation!= null">
-        and
-        <foreach collection="nowLocation" item="item" open="(" separator="," close=")">
-          "nowLocation" in  #{item}
-        </foreach>
-      </if>
-      <if test="planWeight!= null">
-        and
-        <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-          "planWeight" in  #{item}
-        </foreach>
-      </if>
-      <if test="phoneNumber!= null">
-        and
-        <foreach collection="phoneNumber" item="item" open="(" separator="," close=")">
-          "phoneNumber" in  #{item}
-        </foreach>
-      </if>
-      <if test="esArrivalTime!= null">
-        and
-        <foreach collection="esArrivalTime" item="item" open="(" separator="," close=")">
-          "esArrivalTime" in  #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderByInsertTime"></include>
-  </select>
-<!--查询运力id-->
-  <select id="selectCapacityId" resultType="java.util.LinkedHashMap">
-    SELECT
-    rc.CAPACITY_ID "id",
-    rc.CAPACITY_ID "value",
-    rc.CAPACITY_NUMBER "label"
-    FROM RMS_CAPACITY rc
-    WHERE rc.CAPACITY_TYPE_ID = 3
-  </select>
-<!-- 查询指令运力 -->
-  <select id="selectInstructionsCapacity" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-    CAPACITY_ID "capacityId",
-    INSTRUCTION_PLANNED_LOADING "instructionPlannedLoading",
-    INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition",
-    INSTRUCTION_CONTACT_INF "instructionContactInf",
-    INSTRUCTIONS_CAPACITY_STATUS "instructionsCapacityStatus",
-    INSTRUCTION_ESARRIVAL_TIME "instructionEsarrivalTime"
-    FROM OMSSHIP_INSTRUCTIONS_CAPACITY
-    WHERE INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
-  </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/OmsshipShipmentInstructionsMapper.xml

@@ -1,640 +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.OmsshipShipmentInstructionsMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmsshipShipmentInstructions">
-        <id column="SHIPMENT_INSTRUCTIONS_ID" jdbcType="DECIMAL" property="shipmentInstructionsId"/>
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
-        <result column="RECIPIENT_CARRIER_ID" jdbcType="DECIMAL" property="recipientCarrierId"/>
-        <result column="PORT_CARRIER_ID" jdbcType="DECIMAL" property="portCarrierId"/>
-        <result column="INSTRUCTIONS_TOTAL_TONNAGE" jdbcType="DECIMAL" property="instructionsTotalTonnage"/>
-        <result column="INSTRUCTION_TIME" jdbcType="TIMESTAMP" property="instructionTime"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
-        <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="INSTRUCTION_ISSUE_STATUS" jdbcType="VARCHAR" property="instructionIssueStatus"/>
-    </resultMap>
-    <sql id="columns">
-        SHIPMENT_INSTRUCTIONS_ID, BATCH_ID, RECIPIENT_CARRIER_ID, PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
-    INSTRUCTION_TIME, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, INSTRUCTION_ISSUE_STATUS
-    </sql>
-    <sql id="columns_alias">
-        t.SHIPMENT_INSTRUCTIONS_ID, t.BATCH_ID, t.RECIPIENT_CARRIER_ID, t.PORT_CARRIER_ID,
-    t.INSTRUCTIONS_TOTAL_TONNAGE, t.INSTRUCTION_TIME, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.INSTRUCTION_ISSUE_STATUS
-    </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM OMSSHIP_SHIPMENT_INSTRUCTIONS t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="shipmentInstructionsId != null">
-                and SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="recipientCarrierId != null">
-                and RECIPIENT_CARRIER_ID = #{recipientCarrierId}
-            </if>
-            <if test="portCarrierId != null">
-                and PORT_CARRIER_ID = #{portCarrierId}
-            </if>
-            <if test="instructionsTotalTonnage != null">
-                and INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
-            </if>
-            <if test="instructionTime != null">
-                and TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = #{instructionTime}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="instructionIssueStatus != null and instructionIssueStatus != ''">
-                and INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="shipmentInstructionsId != null">
-                and SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="recipientCarrierId != null">
-                and RECIPIENT_CARRIER_ID = #{recipientCarrierId}
-            </if>
-            <if test="portCarrierId != null">
-                and PORT_CARRIER_ID = #{portCarrierId}
-            </if>
-            <if test="instructionsTotalTonnage != null">
-                and INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
-            </if>
-            <if test="instructionTime != null">
-                and TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = #{instructionTime}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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="instructionIssueStatus != null and instructionIssueStatus != ''">
-                and INSTRUCTION_ISSUE_STATUS LIKE '%${instructionIssueStatus}%'
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from OMSSHIP_SHIPMENT_INSTRUCTIONS
-        where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from OMSSHIP_SHIPMENT_INSTRUCTIONS
-        where 1!=1
-        <if test="batchId != null">
-            or BATCH_ID = #{batchId}
-        </if>
-        <if test="recipientCarrierId != null">
-            or RECIPIENT_CARRIER_ID = #{recipientCarrierId}
-        </if>
-        <if test="portCarrierId != null">
-            or PORT_CARRIER_ID = #{portCarrierId}
-        </if>
-        <if test="instructionsTotalTonnage != null">
-            or INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
-        </if>
-        <if test="instructionTime != null">
-            or TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = '#{instructionTime}'
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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="instructionIssueStatus != null and instructionIssueStatus != ''">
-            or INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
-        insert into OMSSHIP_SHIPMENT_INSTRUCTIONS (SHIPMENT_INSTRUCTIONS_ID, BATCH_ID,
-                                                   RECIPIENT_CARRIER_ID, PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
-                                                   INSTRUCTION_TIME, DELETE_NAME, DELETE_TIME,
-                                                   INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                                   UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
-                                                   INSTRUCTION_ISSUE_STATUS)
-        values (#{shipmentInstructionsId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
-                #{recipientCarrierId,jdbcType=DECIMAL}, #{portCarrierId,jdbcType=DECIMAL},
-                #{instructionsTotalTonnage,jdbcType=DECIMAL},
-                #{instructionTime,jdbcType=TIMESTAMP}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
-                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
-                #{instructionIssueStatus,jdbcType=VARCHAR})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
-        insert into OMSSHIP_SHIPMENT_INSTRUCTIONS
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="shipmentInstructionsId != null">
-                SHIPMENT_INSTRUCTIONS_ID,
-            </if>
-            <if test="batchId != null">
-                BATCH_ID,
-            </if>
-            <if test="recipientCarrierId != null">
-                RECIPIENT_CARRIER_ID,
-            </if>
-            <if test="portCarrierId != null">
-                PORT_CARRIER_ID,
-            </if>
-            <if test="instructionsTotalTonnage != null">
-                INSTRUCTIONS_TOTAL_TONNAGE,
-            </if>
-            <if test="instructionTime != null">
-                INSTRUCTION_TIME,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="instructionIssueStatus != null">
-                INSTRUCTION_ISSUE_STATUS,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="shipmentInstructionsId != null">
-                #{shipmentInstructionsId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="recipientCarrierId != null">
-                #{recipientCarrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="portCarrierId != null">
-                #{portCarrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="instructionsTotalTonnage != null">
-                #{instructionsTotalTonnage,jdbcType=DECIMAL},
-            </if>
-            <if test="instructionTime != null">
-                #{instructionTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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="instructionIssueStatus != null">
-                #{instructionIssueStatus,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
-        update OMSSHIP_SHIPMENT_INSTRUCTIONS
-        set BATCH_ID                   = #{batchId,jdbcType=DECIMAL},
-            RECIPIENT_CARRIER_ID       = #{recipientCarrierId,jdbcType=DECIMAL},
-            PORT_CARRIER_ID            = #{portCarrierId,jdbcType=DECIMAL},
-            INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage,jdbcType=DECIMAL},
-            INSTRUCTION_TIME           = #{instructionTime,jdbcType=TIMESTAMP},
-            DELETE_NAME                = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME                = #{deleteTime,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},
-            INSTRUCTION_ISSUE_STATUS   = #{instructionIssueStatus,jdbcType=VARCHAR}
-        where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
-        update OMSSHIP_SHIPMENT_INSTRUCTIONS
-        <set>
-            <if test="batchId != null">
-                BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="recipientCarrierId != null">
-                RECIPIENT_CARRIER_ID = #{recipientCarrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="portCarrierId != null">
-                PORT_CARRIER_ID = #{portCarrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="instructionsTotalTonnage != null">
-                INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage,jdbcType=DECIMAL},
-            </if>
-            <if test="instructionTime != null">
-                INSTRUCTION_TIME = #{instructionTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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="instructionIssueStatus != null">
-                INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,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 OMSSHIP_SHIPMENT_INSTRUCTIONS
-        (SHIPMENT_INSTRUCTIONS_ID,
-        BATCH_ID, RECIPIENT_CARRIER_ID,
-        PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
-        INSTRUCTION_TIME, DELETE_NAME,
-        DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED,
-        INSTRUCTION_ISSUE_STATUS)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.shipmentInstructionsId,jdbcType=DECIMAL},
-        #{item.batchId,jdbcType=DECIMAL}, #{item.recipientCarrierId,jdbcType=DECIMAL},
-        #{item.portCarrierId,jdbcType=DECIMAL}, #{item.instructionsTotalTonnage,jdbcType=DECIMAL},
-        #{item.instructionTime,jdbcType=TIMESTAMP}, #{item.deleteName,jdbcType=VARCHAR},
-        #{item.deleteTime,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.instructionIssueStatus,jdbcType=VARCHAR} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update OMSSHIP_SHIPMENT_INSTRUCTIONS
-        set
-        SHIPMENT_INSTRUCTIONS_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.shipmentInstructionsId,jdbcType=DECIMAL}
-        </foreach>
-        ,BATCH_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-        </foreach>
-        ,RECIPIENT_CARRIER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.recipientCarrierId,jdbcType=DECIMAL}
-        </foreach>
-        ,PORT_CARRIER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.portCarrierId,jdbcType=DECIMAL}
-        </foreach>
-        ,INSTRUCTIONS_TOTAL_TONNAGE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionsTotalTonnage,jdbcType=DECIMAL}
-        </foreach>
-        ,INSTRUCTION_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,INSTRUCTION_ISSUE_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID"
-                 close="end">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionIssueStatus,jdbcType=VARCHAR}
-        </foreach>
-        where SHIPMENT_INSTRUCTIONS_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.shipmentInstructionsId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from OMSSHIP_SHIPMENT_INSTRUCTIONS
-        where SHIPMENT_INSTRUCTIONS_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <select id="selectAll" resultType="java.util.Map">
-        select *
-        from(
-        select distinct
-        osi.SHIPMENT_INSTRUCTIONS_ID "instructionsId",
-        osi.INSERT_TIME "insertTime",
-        rpi.PIER_NAME "piername",
-        rpo.PORT_NAME "portname",
-        rpo.PORT_NAME "portname2",
-        rm.MATERIAL_NAME "materialName",
-        db.RESULT_FOREIGN_SHIP_NAME "foreignShipName",
-        rs.SHIPPER_NAME "shipperName",
-        rs.SHIPPER_CONTACT_NUMBER "shipperContactNumber",
-        osi.INSTRUCTION_TIME "instructionTime",
-        osi.INSTRUCTIONS_TOTAL_TONNAGE "instruct"
-        from OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        left join AMSSHIP_DELIVERY_ATTORNEY ada
-        on osi.BATCH_ID = ada.BATCH_ID
-        left join RMS_PIER rpi
-        on osi.RECIPIENT_CARRIER_ID=rpi.PIER_ID
-        left join RMS_PORT rpo
-        on osi.PORT_CARRIER_ID=rpo.PORT_ID
-        left join AMSSHIP_DELIVERY_NOTICE adn
-        on ada.BATCH_ID=adn.BATCH_ID
-        left join DIL_BATCH db
-        on osi.BATCH_ID = db.BATCH_ID
-        left join RMS_MATERIAL rm
-        on db.MATERIAL_ID = rm.MATERIAL_ID
-        left join RMS_SHIPPER rs
-        on adn.REQUESTER_GROUP_ID=rs.SHIPPER_ID
-        where osi.DELETED = 0
-        )
-        <where>
-            <if test="piername!= null">
-                and
-                <foreach collection="piername" item="item" open="(" separator="," close=")">
-                    "piername" in #{item}
-                </foreach>
-            </if>
-            <if test="portname!= null">
-                and
-                <foreach collection="portname" item="item" open="(" separator="," close=")">
-                    "portname" in #{item}
-                </foreach>
-            </if>
-            <if test="portname2!= null">
-                and
-                <foreach collection="portname2" item="item" open="(" separator="," close=")">
-                    "portname2" in #{item}
-                </foreach>
-            </if>
-            <if test="materialName!= null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="foreignShipName!= null">
-                and
-                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-                    "foreignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="shipperName!= null">
-                and
-                <foreach collection="shipperName" item="item" open="(" separator="," close=")">
-                    "shipperName" in #{item}
-                </foreach>
-            </if>
-            <if test="shipperContactNumber!= null">
-                and
-                <foreach collection="shipperContactNumber" item="item" open="(" separator="," close=")">
-                    "shipperContactNumber" in #{item}
-                </foreach>
-            </if>
-            <if test="instructionTime!= null">
-                and
-                <foreach collection="instructionTime" item="item" open="(" separator="," close=")">
-                    "instructionTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="instruct!= null">
-                and
-                <foreach collection="instruct" item="item" open="(" separator="," close=")">
-                    "instruct" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-    <!-- 自动生成id-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(SHIPMENT_INSTRUCTIONS_ID) + 1
-        FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
-    </select>
-
-    <select id="selectShipmentInstructions" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BATCH_ID                   "batchId",
-               RECIPIENT_CARRIER_ID       "recipientCarrierId",
-               PORT_CARRIER_ID            "portCarrierId",
-               INSTRUCTIONS_TOTAL_TONNAGE "instructionsTotalTonnage",
-               INSTRUCTION_TIME           "instructionTime"
-        FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
-        WHERE SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
-    </select>
-
-    <!--得到批次id-->
-    <select id="getBatchId" resultType="java.util.LinkedHashMap">
-        select BATCH_ID                                                                        "id",
-               BATCH_ID                                                                        "value",
-               CONCAT(CONCAT(RM.MATERIAL_NAME, '"'), CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"')) "label"
-        from DIL_BATCH DB
-                 left join RMS_MATERIAL RM
-                           on RM.MATERIAL_ID = DB.MATERIAL_ID
-    </select>
-
-    <!-- 得到港口和码头 -->
-    <select id="getPortAndPier" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ACTR.GROUP_ID AS "pierId",
-               ADN.PORT_ID   AS "portId"
-        FROM AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
-        ON ADN.BATCH_ID = ACTR.BATCH_ID
-        WHERE ADN.BATCH_ID = #{batchId}
-    </select>
-<!-- 获得港口名称模态框-->
-    <select id="getPortList" resultType="java.util.Map" parameterType="java.util.Map">
-       select  RP.PORT_ID "portId",
-               RP.PORT_NAME "portName"
-       from RMS_PORT RP
-    </select>
-
-</mapper>

target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.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.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="DECIMAL" property="capacityOwneris" />
-    <result column="CAPACITY_BLACKLIST" jdbcType="DECIMAL" 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 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 CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null">
-        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 CAPACITY_STATUS = #{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 CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null">
-        and CAPACITY_BLACKLIST = #{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.lang.Short">
-    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">
-        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">
-        or CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null">
-        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=DECIMAL}, #{capacityBlacklist,jdbcType=DECIMAL}, #{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=DECIMAL},
-      </if>
-      <if test="capacityBlacklist != null">
-        #{capacityBlacklist,jdbcType=DECIMAL},
-      </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=DECIMAL},
-      CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=DECIMAL},
-      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=DECIMAL},
-      </if>
-      <if test="capacityBlacklist != null">
-        CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=DECIMAL},
-      </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.lang.Short" 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=DECIMAL}, 
-      #{item.capacityBlacklist,jdbcType=DECIMAL}, #{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=DECIMAL}
-       </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=DECIMAL}
-       </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>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
- 
-  
-</mapper>

target/classes/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -1,76 +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.ShipDynamicsMapper">
-<!--   获取数据  -->
-    <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
-        select *
-        from (
-                 select db.BATCH_ID                      "batchId",
-                        db.result_foreign_ship_name      "shipName",
-                        rm.material_name                 "materialName",
-                        actr.result_date_of_loans        "tonnage",
-                        actr.RESULT_NUMBER_OF_LOANS      "dateOfLoans",
-                        rp.port_name                     "numberOfLoans",
-                        wgm.gm_tonnage                   "portName",
-                        rc.capacity_number               "capacity",
-                        tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
-                        tlsr.RESULT_OUT_PORT_TIME        "outPortTime",
-                        tsl.LOCATION_STATUS              "locationStatus",
-                        tsl.LOCATION_VALUE               "locationValue",
-                        tsl.LOCATION_ROUTE_TIME          "localtionRouteTime"
-                 from DIL_BATCH db
-                          join rms_material rm on db.material_id = rm.material_id
-                          left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id = actr.batch_id
-                          left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id = db.batch_id
-                          left join rms_port rp on rp.port_id = adn.port_id
-                          left join (select *
-                                     from WMSH_GRID_MATERIAL wgm
-                                     where wgm.GM_ID in
-                                           (SELECT wgm.GM_ID
-                                            FROM (
-                                                     SELECT wgm.GM_ID,
-                                                            wgm.BATCH_ID,
-                                                            wgm.INSERT_TIME,
-                                                            ROW_NUMBER() OVER (
-                                                                PARTITION BY wgm.BATCH_ID
-                                                                ORDER BY wgm.INSERT_TIME DESC
-                                                                ) AS rn
-                                                     FROM WMSH_GRID_MATERIAL wgm
-                                                 ) wgm
-                                            WHERE rn = 1)) wgm on wgm.batch_id = db.batch_id
-                          left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_id = tlsr.batch_id
-                          left join tmsship_total_result ttr on ttr.result_id = tlsr.TOTAL_RESULT_ID
-                          left join omsship_instructions_capacity oic on ttr.order_id = oic.instructions_capacity_id
-                          left join rms_capacity rc on oic.capacity_id = rc.capacity_id
-                          left join (select *
-                                     from tmsship_ship_location t
-                                     where t.location_id in
-                                           (SELECT t.location_id
-                                            FROM (
-                                                     SELECT t.location_id,
-                                                            t.total_result_id,
-                                                            t.location_route_time,
-                                                            ROW_NUMBER() OVER (
-                                                                PARTITION BY t.total_result_id
-                                                                ORDER BY t.location_route_time DESC
-                                                                ) AS rn
-                                                     FROM tmsship_ship_location t
-                                                 ) t
-                                            WHERE rn = 1)) tsl on tsl.total_result_id = ttr.result_id
-                 where ttr.ship_status = 0
-             )
-        where "locationValue" is not null
-    </select>
-    <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
-        select sd.GM_TONNAGE as "tonnage",
-               sd.RESULT_DATE_OF_LOANS as "dateOfLoans",
-               sd.RESULT_NUMBER_OF_LOANS as "numberOfLoans",
-               sd.PORT_NAME as "portName",
-               sd.CAPACITY_NUMBER as "capacity",
-               sd.RESULT_ACTUAL_INSTALLATIONS as "capacityNumber",
-               sd.RESULT_OUT_PORT_TIME as "outPortTime",
-               sd.LOCATION_VALUE as "locationValue",
-               sd.LOCATION_STATUS as "locationStatus"
-        from SHIP_DYNAMICS sd where sd.RESULT_FOREIGN_SHIP_NAME=#{shipName} and sd.MATERIAL_NAME=#{materialName} and sd.LOCATION_STATUS is not null
-    </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipBargeOperationMapper.xml

@@ -1,628 +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.TmsshipBargeOperationMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipBargeOperation">
-    <id column="BARGE_OPERATION_ID" jdbcType="DECIMAL" property="bargeOperationId" />
-    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
-    <result column="BARGE_SMALLSHIP_LOAD_WEIGHT" jdbcType="DECIMAL" property="bargeSmallshipLoadWeight" />
-    <result column="SMALL_CAPACITY_ID" jdbcType="DECIMAL" property="smallCapacityId" />
-    <result column="BARGE_REFUTE_DATE" jdbcType="TIMESTAMP" property="bargeRefuteDate" />
-    <result column="BARGE_REFUTE_LOCATION" jdbcType="VARCHAR" property="bargeRefuteLocation" />
-    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-    <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="BARGE_BACK_DATE" jdbcType="TIMESTAMP" property="bargeBackDate" />
-    <result column="BARGE_BACK_LOCATION" jdbcType="VARCHAR" property="bargeBackLocation" />
-  </resultMap>
-  <sql id="columns">
-    BARGE_OPERATION_ID, RESULT_TOTAL_ID, BARGE_SMALLSHIP_LOAD_WEIGHT, SMALL_CAPACITY_ID,
-    BARGE_REFUTE_DATE, BARGE_REFUTE_LOCATION, DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, BARGE_BACK_DATE,
-    BARGE_BACK_LOCATION
-  </sql>
-  <sql id="columns_alias">
-    t.BARGE_OPERATION_ID, t.RESULT_TOTAL_ID, t.BARGE_SMALLSHIP_LOAD_WEIGHT, t.SMALL_CAPACITY_ID,
-    t.BARGE_REFUTE_DATE, t.BARGE_REFUTE_LOCATION, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.BARGE_BACK_DATE, t.BARGE_BACK_LOCATION
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM TMSSHIP_BARGE_OPERATION
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSSHIP_BARGE_OPERATION t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="bargeOperationId != null">
-        and BARGE_OPERATION_ID = #{bargeOperationId}
-      </if>
-      <if test="resultTotalId != null">
-        and RESULT_TOTAL_ID = #{resultTotalId}
-      </if>
-      <if test="bargeSmallshipLoadWeight != null">
-        and BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
-      </if>
-      <if test="smallCapacityId != null">
-        and SMALL_CAPACITY_ID = #{smallCapacityId}
-      </if>
-      <if test="bargeRefuteDate != null">
-        and TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = #{bargeRefuteDate}
-      </if>
-      <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
-        and BARGE_REFUTE_LOCATION = #{bargeRefuteLocation}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME = #{deleteTime}
-      </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="bargeBackDate != null">
-        and TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = #{bargeBackDate}
-      </if>
-      <if test="bargeBackLocation != null and bargeBackLocation != ''">
-        and BARGE_BACK_LOCATION = #{bargeBackLocation}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="bargeOperationId != null">
-        and BARGE_OPERATION_ID = #{bargeOperationId}
-      </if>
-      <if test="resultTotalId != null">
-        and RESULT_TOTAL_ID = #{resultTotalId}
-      </if>
-      <if test="bargeSmallshipLoadWeight != null">
-        and BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
-      </if>
-      <if test="smallCapacityId != null">
-        and SMALL_CAPACITY_ID = #{smallCapacityId}
-      </if>
-      <if test="bargeRefuteDate != null">
-        and TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = #{bargeRefuteDate}
-      </if>
-      <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
-        and BARGE_REFUTE_LOCATION LIKE '%${bargeRefuteLocation}%'
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME LIKE '%${deleteName}%'
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME LIKE '%${deleteTime}%'
-      </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="bargeBackDate != null">
-        and TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = #{bargeBackDate}
-      </if>
-      <if test="bargeBackLocation != null and bargeBackLocation != ''">
-        and BARGE_BACK_LOCATION LIKE '%${bargeBackLocation}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from TMSSHIP_BARGE_OPERATION
-    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSSHIP_BARGE_OPERATION
-    where 1!=1
-    <if test="resultTotalId != null">
-      or RESULT_TOTAL_ID = #{resultTotalId}
-    </if>
-    <if test="bargeSmallshipLoadWeight != null">
-      or BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
-    </if>
-    <if test="smallCapacityId != null">
-      or SMALL_CAPACITY_ID = #{smallCapacityId}
-    </if>
-    <if test="bargeRefuteDate != null">
-      or TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = '#{bargeRefuteDate}'
-    </if>
-    <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
-      or BARGE_REFUTE_LOCATION = #{bargeRefuteLocation}
-    </if>
-    <if test="deleteName != null and deleteName != ''">
-      or DELETE_NAME = #{deleteName}
-    </if>
-    <if test="deleteTime != null and deleteTime != ''">
-      or DELETE_TIME = #{deleteTime}
-    </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="bargeBackDate != null">
-      or TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = '#{bargeBackDate}'
-    </if>
-    <if test="bargeBackLocation != null and bargeBackLocation != ''">
-      or BARGE_BACK_LOCATION = #{bargeBackLocation}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
-    insert into TMSSHIP_BARGE_OPERATION (BARGE_OPERATION_ID, RESULT_TOTAL_ID,
-      BARGE_SMALLSHIP_LOAD_WEIGHT, SMALL_CAPACITY_ID,
-      BARGE_REFUTE_DATE, BARGE_REFUTE_LOCATION,
-      DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-      INSERT_UPDATE_REMARK, DELETED, BARGE_BACK_DATE,
-      BARGE_BACK_LOCATION)
-    values (#{bargeOperationId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
-      #{bargeSmallshipLoadWeight,jdbcType=DECIMAL}, #{smallCapacityId,jdbcType=DECIMAL},
-      #{bargeRefuteDate,jdbcType=TIMESTAMP}, #{bargeRefuteLocation,jdbcType=VARCHAR},
-      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{bargeBackDate,jdbcType=TIMESTAMP},
-      #{bargeBackLocation,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
-    insert into TMSSHIP_BARGE_OPERATION
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="bargeOperationId != null">
-        BARGE_OPERATION_ID,
-      </if>
-      <if test="resultTotalId != null">
-        RESULT_TOTAL_ID,
-      </if>
-      <if test="bargeSmallshipLoadWeight != null">
-        BARGE_SMALLSHIP_LOAD_WEIGHT,
-      </if>
-      <if test="smallCapacityId != null">
-        SMALL_CAPACITY_ID,
-      </if>
-      <if test="bargeRefuteDate != null">
-        BARGE_REFUTE_DATE,
-      </if>
-      <if test="bargeRefuteLocation != null">
-        BARGE_REFUTE_LOCATION,
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </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="bargeBackDate != null">
-        BARGE_BACK_DATE,
-      </if>
-      <if test="bargeBackLocation != null">
-        BARGE_BACK_LOCATION,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="bargeOperationId != null">
-        #{bargeOperationId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultTotalId != null">
-        #{resultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="bargeSmallshipLoadWeight != null">
-        #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="smallCapacityId != null">
-        #{smallCapacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="bargeRefuteDate != null">
-        #{bargeRefuteDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="bargeRefuteLocation != null">
-        #{bargeRefuteLocation,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,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="bargeBackDate != null">
-        #{bargeBackDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="bargeBackLocation != null">
-        #{bargeBackLocation,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
-    update TMSSHIP_BARGE_OPERATION
-    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-      BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
-      SMALL_CAPACITY_ID = #{smallCapacityId,jdbcType=DECIMAL},
-      BARGE_REFUTE_DATE = #{bargeRefuteDate,jdbcType=TIMESTAMP},
-      BARGE_REFUTE_LOCATION = #{bargeRefuteLocation,jdbcType=VARCHAR},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,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},
-      BARGE_BACK_DATE = #{bargeBackDate,jdbcType=TIMESTAMP},
-      BARGE_BACK_LOCATION = #{bargeBackLocation,jdbcType=VARCHAR}
-    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
-    update TMSSHIP_BARGE_OPERATION
-    <set>
-      <if test="resultTotalId != null">
-        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="bargeSmallshipLoadWeight != null">
-        BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="smallCapacityId != null">
-        SMALL_CAPACITY_ID = #{smallCapacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="bargeRefuteDate != null">
-        BARGE_REFUTE_DATE = #{bargeRefuteDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="bargeRefuteLocation != null">
-        BARGE_REFUTE_LOCATION = #{bargeRefuteLocation,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,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="bargeBackDate != null">
-        BARGE_BACK_DATE = #{bargeBackDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="bargeBackLocation != null">
-        BARGE_BACK_LOCATION = #{bargeBackLocation,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where BARGE_OPERATION_ID = #{bargeOperationId,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 TMSSHIP_BARGE_OPERATION
-    (BARGE_OPERATION_ID,
-    RESULT_TOTAL_ID, BARGE_SMALLSHIP_LOAD_WEIGHT,
-    SMALL_CAPACITY_ID, BARGE_REFUTE_DATE,
-    BARGE_REFUTE_LOCATION, DELETE_NAME,
-    DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, DELETED,
-    BARGE_BACK_DATE, BARGE_BACK_LOCATION
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.bargeOperationId,jdbcType=DECIMAL},
-    #{item.resultTotalId,jdbcType=DECIMAL}, #{item.bargeSmallshipLoadWeight,jdbcType=DECIMAL},
-    #{item.smallCapacityId,jdbcType=DECIMAL}, #{item.bargeRefuteDate,jdbcType=TIMESTAMP},
-    #{item.bargeRefuteLocation,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
-    #{item.deleteTime,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.bargeBackDate,jdbcType=TIMESTAMP}, #{item.bargeBackLocation,jdbcType=VARCHAR}
-    from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update TMSSHIP_BARGE_OPERATION
-    set
-    BARGE_OPERATION_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeOperationId,jdbcType=DECIMAL}
-    </foreach>
-    ,RESULT_TOTAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
-    </foreach>
-    ,BARGE_SMALLSHIP_LOAD_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeSmallshipLoadWeight,jdbcType=DECIMAL}
-    </foreach>
-    ,SMALL_CAPACITY_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.smallCapacityId,jdbcType=DECIMAL}
-    </foreach>
-    ,BARGE_REFUTE_DATE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeRefuteDate,jdbcType=TIMESTAMP}
-    </foreach>
-    ,BARGE_REFUTE_LOCATION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeRefuteLocation,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETED=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-    </foreach>
-    ,BARGE_BACK_DATE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeBackDate,jdbcType=TIMESTAMP}
-    </foreach>
-    ,BARGE_BACK_LOCATION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
-      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeBackLocation,jdbcType=VARCHAR}
-    </foreach>
-    where BARGE_OPERATION_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.bargeOperationId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSSHIP_BARGE_OPERATION
-    where BARGE_OPERATION_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectMaxId" resultType="DECIMAL">
-    SELECT MAX(BARGE_OPERATION_ID)+1 FROM TMSSHIP_BARGE_OPERATION
-  </select>
-
-  <!--查询驳船作业列表-->
-  <sql id="orderByInsertTime">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
-  </sql>
-  <select id="selectBargeOperationList" resultType="java.util.Map">
-    select * from(
-    SELECT DISTINCT ttr.ORDER_ID as "orderId",
-    tbo.INSERT_TIME as "insertTime",
-    tbo.BARGE_OPERATION_ID as "bargeOperationId",
-    rm.MATERIAL_NAME as "materialName",
-    db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-    rcb.CAPACITY_NUMBER as "bigCapacityName",
-    tlsr.RESULT_ACTUAL_INSTALLATIONS as "bigCapacityWeight",
-    rcs.CAPACITY_NUMBER as "smallCapacityName",
-    tbo.BARGE_SMALLSHIP_LOAD_WEIGHT as "smallCapacityWeight",
-    tbo.BARGE_REFUTE_DATE as "bargeRefuteTime",
-    tbo.BARGE_REFUTE_LOCATION as "bargeRefuteLocation",
-    tbo.BARGE_BACK_DATE as "bargeBackTime",
-    tbo.BARGE_BACK_LOCATION as "bargeBackLocation"
-    FROM TMSSHIP_BARGE_OPERATION tbo
-    LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-    ON tbo.RESULT_TOTAL_ID = ttr.RESULT_ID
-    LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-    ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-    LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-    ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-    LEFT JOIN DIL_BATCH db
-    ON osi.BATCH_ID = db.BATCH_ID
-    LEFT JOIN RMS_MATERIAL rm
-    ON db.MATERIAL_ID = rm.MATERIAL_ID
-    LEFT JOIN RMS_CAPACITY rcb
-    ON oic.CAPACITY_ID = rcb.CAPACITY_ID
-    LEFT JOIN RMS_CAPACITY rcs
-    ON tbo.SMALL_CAPACITY_ID = rcs.CAPACITY_ID
-    LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-    ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-    where tbo.DELETED = 0)
-    <where>
-      <if test="materialName != null">
-        and
-        <foreach collection="materialName" item="item" open="(" separator="," close=")">
-          "materialName" in  #{item}
-        </foreach>
-      </if>
-      <if test="foreignShipName != null">
-        and
-        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-          "foreignShipName" in  #{item}
-        </foreach>
-      </if>
-      <if test="bigCapacityName != null">
-        and
-        <foreach collection="bigCapacityName" item="item" open="(" separator="," close=")">
-          "bigCapacityName" in  #{item}
-        </foreach>
-      </if>
-      <if test="bigCapacityWeight != null">
-        and
-        <foreach collection="bigCapacityWeight" item="item" open="(" separator="," close=")">
-          "bigCapacityWeight" in  #{item}
-        </foreach>
-      </if>
-      <if test="smallCapacityId != null">
-        and
-        <foreach collection="smallCapacityId" item="item" open="(" separator="," close=")">
-          "smallCapacityId" in  #{item}
-        </foreach>
-      </if>
-      <if test="smallCapacityWeight != null">
-        and
-        <foreach collection="smallCapacityWeight" item="item" open="(" separator="," close=")">
-          "smallCapacityWeight" in  #{item}
-        </foreach>
-      </if>
-      <if test="bargeRefuteTime != null">
-        and
-        <foreach collection="bargeRefuteTime" item="item" open="(" separator="," close=")">
-          "bargeRefuteTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-        </foreach>
-      </if>
-      <if test="bargeRefuteLocation != null">
-        and
-        <foreach collection="bargeRefuteLocation" item="item" open="(" separator="," close=")">
-          "bargeRefuteLocation" in  #{item}
-        </foreach>
-      </if>
-      <if test="bargeBackTime != null">
-        and
-        <foreach collection="bargeBackTime" item="item" open="(" separator="," close=")">
-          "bargeBackTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-        </foreach>
-      </if>
-      <if test="bargeBackLocation != null">
-        and
-        <foreach collection="bargeBackLocation" item="item" open="(" separator="," close=")">
-          "bargeBackLocation" in  #{item}
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderByInsertTime"></include>
-  </select>
-
-  <select id="selectBargeOperation" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-    SMALL_CAPACITY_ID "smallCapacityId",
-    BARGE_SMALLSHIP_LOAD_WEIGHT "bargeSmallshipLoadWeight",
-    BARGE_REFUTE_DATE "bargeRefuteDate",
-    BARGE_REFUTE_LOCATION "bargeRefuteLocation",
-    BARGE_BACK_DATE "bargeBackDate",
-    BARGE_BACK_LOCATION "bargeBackLocation"
-    FROM TMSSHIP_BARGE_OPERATION
-    WHERE BARGE_OPERATION_ID = #{bargeOperationId}
-  </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipEntryWharyResultMapper.xml

@@ -1,477 +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.TmsshipEntryWharyResultMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipEntryWharyResult">
-    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
-    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
-    <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber" />
-    <result column="WHARY_ID" jdbcType="DECIMAL" property="wharyId" />
-    <result column="RESULT_PORT_DECLARATION_TIME" jdbcType="TIMESTAMP" property="resultPortDeclarationTime" />
-    <result column="RESULT_PORT_DECLARATION_NAME" jdbcType="VARCHAR" property="resultPortDeclarationName" />
-    <result column="RESULT_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="resultArrivalTime" />
-    <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
-    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-    <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">
-    RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, WHARY_ID, RESULT_PORT_DECLARATION_TIME, 
-    RESULT_PORT_DECLARATION_NAME, RESULT_ARRIVAL_TIME, RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_NUMBER, t.WHARY_ID, t.RESULT_PORT_DECLARATION_TIME, 
-    t.RESULT_PORT_DECLARATION_NAME, t.RESULT_ARRIVAL_TIME, t.RESULT_MEMO, t.DELETE_NAME, 
-    t.DELETE_TIME, 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 TMSSHIP_ENTRY_WHARY_RESULT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSSHIP_ENTRY_WHARY_RESULT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        and RESULT_NUMBER = #{resultNumber}
-      </if>
-      <if test="wharyId != null">
-        and WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        and TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = #{resultPortDeclarationTime}
-      </if>
-      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
-        and RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName}
-      </if>
-      <if test="resultArrivalTime != null">
-        and TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = #{resultArrivalTime}
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        and RESULT_MEMO = #{resultMemo}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME = #{deleteTime}
-      </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="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        and RESULT_NUMBER LIKE '%${resultNumber}%'
-      </if>
-      <if test="wharyId != null">
-        and WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        and TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = #{resultPortDeclarationTime}
-      </if>
-      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
-        and RESULT_PORT_DECLARATION_NAME LIKE '%${resultPortDeclarationName}%'
-      </if>
-      <if test="resultArrivalTime != null">
-        and TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = #{resultArrivalTime}
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        and RESULT_MEMO LIKE '%${resultMemo}%'
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME LIKE '%${deleteName}%'
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME LIKE '%${deleteTime}%'
-      </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 TMSSHIP_ENTRY_WHARY_RESULT
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSSHIP_ENTRY_WHARY_RESULT
-    where 1!=1 
-      <if test="totalResultId != null">
-        or TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        or RESULT_NUMBER = #{resultNumber}
-      </if>
-      <if test="wharyId != null">
-        or WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        or TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = '#{resultPortDeclarationTime}'
-      </if>
-      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
-        or RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName}
-      </if>
-      <if test="resultArrivalTime != null">
-        or TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = '#{resultArrivalTime}'
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        or RESULT_MEMO = #{resultMemo}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        or DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        or DELETE_TIME = #{deleteTime}
-      </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.TmsshipEntryWharyResult">
-    insert into TMSSHIP_ENTRY_WHARY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, 
-      WHARY_ID, RESULT_PORT_DECLARATION_TIME, RESULT_PORT_DECLARATION_NAME, 
-      RESULT_ARRIVAL_TIME, RESULT_MEMO, DELETE_NAME, 
-      DELETE_TIME, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, 
-      #{wharyId,jdbcType=DECIMAL}, #{resultPortDeclarationTime,jdbcType=TIMESTAMP}, #{resultPortDeclarationName,jdbcType=VARCHAR}, 
-      #{resultArrivalTime,jdbcType=TIMESTAMP}, #{resultMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, 
-      #{deleteTime,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.TmsshipEntryWharyResult">
-    insert into TMSSHIP_ENTRY_WHARY_RESULT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="resultId != null">
-        RESULT_ID,
-      </if>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID,
-      </if>
-      <if test="resultNumber != null">
-        RESULT_NUMBER,
-      </if>
-      <if test="wharyId != null">
-        WHARY_ID,
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        RESULT_PORT_DECLARATION_TIME,
-      </if>
-      <if test="resultPortDeclarationName != null">
-        RESULT_PORT_DECLARATION_NAME,
-      </if>
-      <if test="resultArrivalTime != null">
-        RESULT_ARRIVAL_TIME,
-      </if>
-      <if test="resultMemo != null">
-        RESULT_MEMO,
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </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="resultId != null">
-        #{resultId,jdbcType=DECIMAL},
-      </if>
-      <if test="totalResultId != null">
-        #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultNumber != null">
-        #{resultNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="wharyId != null">
-        #{wharyId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultPortDeclarationName != null">
-        #{resultPortDeclarationName,jdbcType=VARCHAR},
-      </if>
-      <if test="resultArrivalTime != null">
-        #{resultArrivalTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultMemo != null">
-        #{resultMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,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.TmsshipEntryWharyResult">
-    update TMSSHIP_ENTRY_WHARY_RESULT
-    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-      WHARY_ID = #{wharyId,jdbcType=DECIMAL},
-      RESULT_PORT_DECLARATION_TIME = #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
-      RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName,jdbcType=VARCHAR},
-      RESULT_ARRIVAL_TIME = #{resultArrivalTime,jdbcType=TIMESTAMP},
-      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipEntryWharyResult">
-    update TMSSHIP_ENTRY_WHARY_RESULT
-    <set>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultNumber != null">
-        RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="wharyId != null">
-        WHARY_ID = #{wharyId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultPortDeclarationTime != null">
-        RESULT_PORT_DECLARATION_TIME = #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultPortDeclarationName != null">
-        RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName,jdbcType=VARCHAR},
-      </if>
-      <if test="resultArrivalTime != null">
-        RESULT_ARRIVAL_TIME = #{resultArrivalTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultMemo != null">
-        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where RESULT_ID = #{resultId,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 TMSSHIP_ENTRY_WHARY_RESULT 
-      (RESULT_ID, 
-      TOTAL_RESULT_ID, RESULT_NUMBER, 
-      WHARY_ID, RESULT_PORT_DECLARATION_TIME, 
-      RESULT_PORT_DECLARATION_NAME, RESULT_ARRIVAL_TIME, 
-      RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.resultId,jdbcType=DECIMAL}, 
-      #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR}, 
-      #{item.wharyId,jdbcType=DECIMAL}, #{item.resultPortDeclarationTime,jdbcType=TIMESTAMP}, 
-      #{item.resultPortDeclarationName,jdbcType=VARCHAR}, #{item.resultArrivalTime,jdbcType=TIMESTAMP}, 
-      #{item.resultMemo,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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 TMSSHIP_ENTRY_WHARY_RESULT
-     set
-       RESULT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-       </foreach>
-       ,TOTAL_RESULT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,WHARY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.wharyId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_PORT_DECLARATION_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPortDeclarationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RESULT_PORT_DECLARATION_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPortDeclarationName,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_ARRIVAL_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RESULT_MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where RESULT_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.resultId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSSHIP_ENTRY_WHARY_RESULT
-    where RESULT_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectMaxId" resultType="DECIMAL" >
-    SELECT MAX(RESULT_ID)+1 FROM TMSSHIP_ENTRY_WHARY_RESULT
-  </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipLoadShipResultMapper.xml

@@ -1,869 +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.TmsshipLoadShipResultMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipLoadShipResult">
-        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
-        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
-        <result column="LOCATION_START_PORT_ID" jdbcType="DECIMAL" property="locationStartPortId"/>
-        <result column="ARRIVAL_PORT_ID" jdbcType="DECIMAL" property="arrivalPortId"/>
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
-        <result column="RESULT_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultDeliveryDate"/>
-        <result column="RESULT_ACTUAL_INSTALLATIONS" jdbcType="DECIMAL" property="resultActualInstallations"/>
-        <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber"/>
-        <result column="RWAREHOUSE_MATERIAL_ID" jdbcType="DECIMAL" property="rwarehouseMaterialId"/>
-        <result column="RESULT_ARRIVAL_PORT_TIME" jdbcType="TIMESTAMP" property="resultArrivalPortTime"/>
-        <result column="RESULT_OUT_PORT_TIME" jdbcType="TIMESTAMP" property="resultOutPortTime"/>
-        <result column="RESULT_LOAD_SHIP_DATE" jdbcType="TIMESTAMP" property="resultLoadShipDate"/>
-        <result column="RESULT_ISCLEAR" jdbcType="VARCHAR" property="resultIsclear"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
-        <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">
-        RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID, ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
-    RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER, RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
-    RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETED
-    </sql>
-    <sql id="columns_alias">
-        t.RESULT_ID, t.TOTAL_RESULT_ID, t.LOCATION_START_PORT_ID, t.ARRIVAL_PORT_ID, t.BATCH_ID,
-    t.RESULT_DELIVERY_DATE, t.RESULT_ACTUAL_INSTALLATIONS, t.RESULT_NUMBER, t.RWAREHOUSE_MATERIAL_ID,
-    t.RESULT_ARRIVAL_PORT_TIME, t.RESULT_OUT_PORT_TIME, t.RESULT_LOAD_SHIP_DATE, t.RESULT_ISCLEAR,
-    t.DELETE_NAME, t.DELETE_TIME, 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 TMSSHIP_LOAD_SHIP_RESULT
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSSHIP_LOAD_SHIP_RESULT t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="locationStartPortId != null">
-                and LOCATION_START_PORT_ID = #{locationStartPortId}
-            </if>
-            <if test="arrivalPortId != null">
-                and ARRIVAL_PORT_ID = #{arrivalPortId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="resultDeliveryDate != null">
-                and TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = #{resultDeliveryDate}
-            </if>
-            <if test="resultActualInstallations != null">
-                and RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
-            </if>
-            <if test="resultNumber != null and resultNumber != ''">
-                and RESULT_NUMBER = #{resultNumber}
-            </if>
-            <if test="rwarehouseMaterialId != null">
-                and RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
-            </if>
-            <if test="resultArrivalPortTime != null">
-                and TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = #{resultArrivalPortTime}
-            </if>
-            <if test="resultOutPortTime != null">
-                and TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = #{resultOutPortTime}
-            </if>
-            <if test="resultLoadShipDate != null">
-                and TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = #{resultLoadShipDate}
-            </if>
-            <if test="resultIsclear != null and resultIsclear != ''">
-                and RESULT_ISCLEAR = #{resultIsclear}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="locationStartPortId != null">
-                and LOCATION_START_PORT_ID = #{locationStartPortId}
-            </if>
-            <if test="arrivalPortId != null">
-                and ARRIVAL_PORT_ID = #{arrivalPortId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="resultDeliveryDate != null">
-                and TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = #{resultDeliveryDate}
-            </if>
-            <if test="resultActualInstallations != null">
-                and RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
-            </if>
-            <if test="resultNumber != null and resultNumber != ''">
-                and RESULT_NUMBER LIKE '%${resultNumber}%'
-            </if>
-            <if test="rwarehouseMaterialId != null">
-                and RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
-            </if>
-            <if test="resultArrivalPortTime != null">
-                and TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = #{resultArrivalPortTime}
-            </if>
-            <if test="resultOutPortTime != null">
-                and TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = #{resultOutPortTime}
-            </if>
-            <if test="resultLoadShipDate != null">
-                and TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = #{resultLoadShipDate}
-            </if>
-            <if test="resultIsclear != null and resultIsclear != ''">
-                and RESULT_ISCLEAR LIKE '%${resultIsclear}%'
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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 TMSSHIP_LOAD_SHIP_RESULT
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from TMSSHIP_LOAD_SHIP_RESULT
-        where 1!=1
-        <if test="totalResultId != null">
-            or TOTAL_RESULT_ID = #{totalResultId}
-        </if>
-        <if test="locationStartPortId != null">
-            or LOCATION_START_PORT_ID = #{locationStartPortId}
-        </if>
-        <if test="arrivalPortId != null">
-            or ARRIVAL_PORT_ID = #{arrivalPortId}
-        </if>
-        <if test="batchId != null">
-            or BATCH_ID = #{batchId}
-        </if>
-        <if test="resultDeliveryDate != null">
-            or TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = '#{resultDeliveryDate}'
-        </if>
-        <if test="resultActualInstallations != null">
-            or RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
-        </if>
-        <if test="resultNumber != null and resultNumber != ''">
-            or RESULT_NUMBER = #{resultNumber}
-        </if>
-        <if test="rwarehouseMaterialId != null">
-            or RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
-        </if>
-        <if test="resultArrivalPortTime != null">
-            or TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = '#{resultArrivalPortTime}'
-        </if>
-        <if test="resultOutPortTime != null">
-            or TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = '#{resultOutPortTime}'
-        </if>
-        <if test="resultLoadShipDate != null">
-            or TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = '#{resultLoadShipDate}'
-        </if>
-        <if test="resultIsclear != null and resultIsclear != ''">
-            or RESULT_ISCLEAR = #{resultIsclear}
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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.TmsshipLoadShipResult">
-        insert into TMSSHIP_LOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
-                                              ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
-                                              RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
-                                              RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
-                                              RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
-                                              RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
-                                              INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                              UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
-        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
-                #{locationStartPortId,jdbcType=DECIMAL},
-                #{arrivalPortId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
-                #{resultDeliveryDate,jdbcType=TIMESTAMP},
-                #{resultActualInstallations,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR},
-                #{rwarehouseMaterialId,jdbcType=DECIMAL}, #{resultArrivalPortTime,jdbcType=TIMESTAMP},
-                #{resultOutPortTime,jdbcType=TIMESTAMP}, #{resultLoadShipDate,jdbcType=TIMESTAMP},
-                #{resultIsclear,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,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.TmsshipLoadShipResult">
-        insert into TMSSHIP_LOAD_SHIP_RESULT
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                RESULT_ID,
-            </if>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID,
-            </if>
-            <if test="locationStartPortId != null">
-                LOCATION_START_PORT_ID,
-            </if>
-            <if test="arrivalPortId != null">
-                ARRIVAL_PORT_ID,
-            </if>
-            <if test="batchId != null">
-                BATCH_ID,
-            </if>
-            <if test="resultDeliveryDate != null">
-                RESULT_DELIVERY_DATE,
-            </if>
-            <if test="resultActualInstallations != null">
-                RESULT_ACTUAL_INSTALLATIONS,
-            </if>
-            <if test="resultNumber != null">
-                RESULT_NUMBER,
-            </if>
-            <if test="rwarehouseMaterialId != null">
-                RWAREHOUSE_MATERIAL_ID,
-            </if>
-            <if test="resultArrivalPortTime != null">
-                RESULT_ARRIVAL_PORT_TIME,
-            </if>
-            <if test="resultOutPortTime != null">
-                RESULT_OUT_PORT_TIME,
-            </if>
-            <if test="resultLoadShipDate != null">
-                RESULT_LOAD_SHIP_DATE,
-            </if>
-            <if test="resultIsclear != null">
-                RESULT_ISCLEAR,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="resultId != null">
-                #{resultId,jdbcType=DECIMAL},
-            </if>
-            <if test="totalResultId != null">
-                #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="locationStartPortId != null">
-                #{locationStartPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="arrivalPortId != null">
-                #{arrivalPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultDeliveryDate != null">
-                #{resultDeliveryDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultActualInstallations != null">
-                #{resultActualInstallations,jdbcType=DECIMAL},
-            </if>
-            <if test="resultNumber != null">
-                #{resultNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="rwarehouseMaterialId != null">
-                #{rwarehouseMaterialId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultArrivalPortTime != null">
-                #{resultArrivalPortTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultOutPortTime != null">
-                #{resultOutPortTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultLoadShipDate != null">
-                #{resultLoadShipDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultIsclear != null">
-                #{resultIsclear,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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.TmsshipLoadShipResult">
-        update TMSSHIP_LOAD_SHIP_RESULT
-        set TOTAL_RESULT_ID             = #{totalResultId,jdbcType=DECIMAL},
-            LOCATION_START_PORT_ID      = #{locationStartPortId,jdbcType=DECIMAL},
-            ARRIVAL_PORT_ID             = #{arrivalPortId,jdbcType=DECIMAL},
-            BATCH_ID                    = #{batchId,jdbcType=DECIMAL},
-            RESULT_DELIVERY_DATE        = #{resultDeliveryDate,jdbcType=TIMESTAMP},
-            RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations,jdbcType=DECIMAL},
-            RESULT_NUMBER               = #{resultNumber,jdbcType=VARCHAR},
-            RWAREHOUSE_MATERIAL_ID      = #{rwarehouseMaterialId,jdbcType=DECIMAL},
-            RESULT_ARRIVAL_PORT_TIME    = #{resultArrivalPortTime,jdbcType=TIMESTAMP},
-            RESULT_OUT_PORT_TIME        = #{resultOutPortTime,jdbcType=TIMESTAMP},
-            RESULT_LOAD_SHIP_DATE       = #{resultLoadShipDate,jdbcType=TIMESTAMP},
-            RESULT_ISCLEAR              = #{resultIsclear,jdbcType=VARCHAR},
-            DELETE_NAME                 = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME                 = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
-        update TMSSHIP_LOAD_SHIP_RESULT
-        <set>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="locationStartPortId != null">
-                LOCATION_START_PORT_ID = #{locationStartPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="arrivalPortId != null">
-                ARRIVAL_PORT_ID = #{arrivalPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultDeliveryDate != null">
-                RESULT_DELIVERY_DATE = #{resultDeliveryDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultActualInstallations != null">
-                RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations,jdbcType=DECIMAL},
-            </if>
-            <if test="resultNumber != null">
-                RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="rwarehouseMaterialId != null">
-                RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultArrivalPortTime != null">
-                RESULT_ARRIVAL_PORT_TIME = #{resultArrivalPortTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultOutPortTime != null">
-                RESULT_OUT_PORT_TIME = #{resultOutPortTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultLoadShipDate != null">
-                RESULT_LOAD_SHIP_DATE = #{resultLoadShipDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultIsclear != null">
-                RESULT_ISCLEAR = #{resultIsclear,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where RESULT_ID = #{resultId,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 TMSSHIP_LOAD_SHIP_RESULT
-        (RESULT_ID,
-        TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
-        ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
-        RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
-        RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
-        RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
-        RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.resultId,jdbcType=DECIMAL},
-        #{item.totalResultId,jdbcType=DECIMAL}, #{item.locationStartPortId,jdbcType=DECIMAL},
-        #{item.arrivalPortId,jdbcType=DECIMAL}, #{item.batchId,jdbcType=DECIMAL},
-        #{item.resultDeliveryDate,jdbcType=TIMESTAMP},
-        #{item.resultActualInstallations,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR},
-        #{item.rwarehouseMaterialId,jdbcType=DECIMAL}, #{item.resultArrivalPortTime,jdbcType=TIMESTAMP},
-        #{item.resultOutPortTime,jdbcType=TIMESTAMP}, #{item.resultLoadShipDate,jdbcType=TIMESTAMP},
-        #{item.resultIsclear,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
-        #{item.deleteTime,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 TMSSHIP_LOAD_SHIP_RESULT
-        set
-        RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-        ,TOTAL_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-        </foreach>
-        ,LOCATION_START_PORT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.locationStartPortId,jdbcType=DECIMAL}
-        </foreach>
-        ,ARRIVAL_PORT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.arrivalPortId,jdbcType=DECIMAL}
-        </foreach>
-        ,BATCH_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_DELIVERY_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDeliveryDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_ACTUAL_INSTALLATIONS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultActualInstallations,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
-        </foreach>
-        ,RWAREHOUSE_MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.rwarehouseMaterialId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_ARRIVAL_PORT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalPortTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_OUT_PORT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutPortTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_LOAD_SHIP_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadShipDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_ISCLEAR=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsclear,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from TMSSHIP_LOAD_SHIP_RESULT
-        where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(RESULT_ID) + 1
-        FROM TMSSHIP_LOAD_SHIP_RESULT
-    </select>
-    <!--查询所有装船信息-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <select id="selectLoadShipList" resultType="java.util.Map">
-        SELECT * FROM (
-        SELECT DISTINCT ttr.ORDER_ID as "orderId",
-        tlsr.INSERT_TIME as "insertTime",
-        tlsr.RESULT_ID as "resultId",
-        rp.PORT_NAME as "noticePort",
-        adn.NOTICE_DELIVERY_TIME as "noticeTime",
-        rm.MATERIAL_NAME as "materialName",
-        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-        actr.RESULT_NUMBER_OF_LOANS as "amount",
-        rrmr.GM_TONNAGE as "portAmount",
-        rc.CAPACITY_NUMBER as "capacityName",
-        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-        tsl.LOCATION_VALUE as "nowLocation",
-        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-        tlsr.RESULT_ARRIVAL_PORT_TIME as "arriveTime",
-        tlsr.RESULT_OUT_PORT_TIME as "liveTime",
-        rps.PORT_NAME as "startPortName",
-        rpe.PORT_NAME as "arrivePortName",
-        tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
-        tlsr.RESULT_ISCLEAR as "isClear",
-        tlsr.INSERT_UPDATE_REMARK as "memo"
-        FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
-        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-        ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
-        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        LEFT JOIN DIL_BATCH db
-        ON tlsr.BATCH_ID = db.BATCH_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON db.MATERIAL_ID = rm.MATERIAL_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
-        ON ada.BATCH_ID = osi.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
-        ON ada.BATCH_ID = adn.BATCH_ID
-        LEFT JOIN RMS_PORT rp
-        ON rp.PORT_ID = adn.PORT_ID
-        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
-        ON adn.BATCH_ID = actr.BATCH_ID
-        LEFT JOIN WMSH_GRID_MATERIAL rrmr
-        ON tlsr.RWAREHOUSE_MATERIAL_ID = rrmr.GM_ID
-        LEFT JOIN TMSSHIP_SHIP_LOCATION tsl
-        ON ttr.RESULT_ID = tsl.TOTAL_RESULT_ID
-        LEFT JOIN RMS_PORT rps
-        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
-        LEFT JOIN RMS_PORT rpe
-        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
-        WHERE tlsr.DELETED = 0)
-        <where>
-            <if test="noticePort != null">
-                and
-                <foreach collection="noticePort" item="item" open="(" separator="," close=")">
-                    "noticePort" in #{item}
-                </foreach>
-            </if>
-            <if test="noticeTime != null">
-                and
-                <foreach collection="noticeTime" item="item" open="(" separator="," close=")">
-                    "noticeTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="foreignShipName != null">
-                and
-                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-                    "foreignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="amount != null">
-                and
-                <foreach collection="amount" item="item" open="(" separator="," close=")">
-                    "amount" in #{item}
-                </foreach>
-            </if>
-            <if test="portAmount != null">
-                and
-                <foreach collection="portAmount" item="item" open="(" separator="," close=")">
-                    "portAmount" in #{item}
-                </foreach>
-            </if>
-            <if test="capacityName != null">
-                and
-                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-                    "capacityName" in #{item}
-                </foreach>
-            </if>
-            <if test="planWeight != null">
-                and
-                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-                    "planWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="nowLocation != null">
-                and
-                <foreach collection="nowLocation" item="item" open="(" separator="," close=")">
-                    "nowLocation" in #{item}
-                </foreach>
-            </if>
-            <if test="realWeight != null">
-                and
-                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-                    "realWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="arriveTime != null">
-                and
-                <foreach collection="arriveTime" item="item" open="(" separator="," close=")">
-                    "arriveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="liveTime != null">
-                and
-                <foreach collection="liveTime" item="item" open="(" separator="," close=")">
-                    "liveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="startPortName != null">
-                and
-                <foreach collection="startPortName" item="item" open="(" separator="," close=")">
-                    "startPortName" in #{item}
-                </foreach>
-            </if>
-            <if test="arrivePortName != null">
-                and
-                <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
-                    "arrivePortName" in #{item}
-                </foreach>
-            </if>
-            <if test="loadTime != null">
-                and
-                <foreach collection="loadTime" item="item" open="(" separator="," close=")">
-                    "loadTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="isClear != null">
-                and
-                <foreach collection="isClear" item="item" open="(" separator="," close=")">
-                    "isClear" in #{item}
-                </foreach>
-            </if>
-            <if test="memo != null">
-                and
-                <foreach collection="memo" item="item" open="(" separator="," close=")">
-                    "memo" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-
-    <select id="selectAllWeight" resultType="DECIMAL" parameterType="DECIMAL">
-        select SUM(t_loadShip.RESULT_ACTUAL_INSTALLATIONS) "sumWeight"
-        from OMSSHIP_INSTRUCTIONS_CAPACITY oi_capacity
-                 left join TMSSHIP_TOTAL_RESULT t_total
-                           on oi_capacity.INSTRUCTIONS_CAPACITY_ID = t_total.ORDER_ID
-                 left join TMSSHIP_LOAD_SHIP_RESULT t_loadShip
-                           on t_total.RESULT_ID = t_loadShip.TOTAL_RESULT_ID
-        where oi_capacity.INSTRUCTIONS_ID = #{instructionsId}
-    </select>
-
-    <select id="selectLoadShip" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT LOCATION_START_PORT_ID      "locationStartPortId",
-               ARRIVAL_PORT_ID             "arrivalPortId",
-               BATCH_ID                    "batchId",
-               RESULT_DELIVERY_DATE        "resultDeliveryDate",
-               RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
-               RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
-               RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
-               RESULT_OUT_PORT_TIME        "resultOutPortTime",
-               RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
-               RESULT_ISCLEAR              "resultIsClear"
-        FROM TMSSHIP_LOAD_SHIP_RESULT
-        WHERE RESULT_ID = #{resultId}
-    </select>
-
-    <!-- 通过外轮船名和物资名称得到批次id -->
-    <select id="getBatchId" parameterType="java.util.Map" resultType="DECIMAL">
-        SELECT BATCH_ID
-        FROM DIL_BATCH db
-                 LEFT JOIN RMS_MATERIAL rm
-                           ON rm.MATERIAL_ID = db.MATERIAL_ID
-        WHERE rm.MATERIAL_NAME = #{materialName}
-          AND db.RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
-    </select>
-
-    <!-- 得到码头和港口 -->
-    <select id="getPortAndPier" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ADN.PORT_ID              AS "startPortId",
-               ADA.DOWN_SWIM_PORT_ID    AS "arrivePortId",
-               ACTR.GROUP_ID            AS "pierId",
-               ADN.NOTICE_DELIVERY_TIME AS "noticeDeliveryTime"
-        FROM AMSSHIP_DELIVERY_NOTICE ADN
-                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
-                           ON ADA.BATCH_ID = ADN.BATCH_ID
-                 LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-                           ON ACTR.BATCH_ID = ADN.BATCH_ID
-        WHERE ADA.BATCH_ID = #{batchId}
-    </select>
-
-<!-- 通过港口查询港存库实时库存id  -->
-    <select id="selectGmIdByPortId" parameterType="java.lang.Integer" resultType="java.math.BigDecimal">
-        select WGM.GM_ID "gmId"
-        from WMSH_GRID_MATERIAL WGM
-        WHERE WGM.PORT_ID=#{portId}
-    </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipOutWharyResultMapper.xml

@@ -1,450 +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.TmsshipOutWharyResultMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipOutWharyResult">
-    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
-    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
-    <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber" />
-    <result column="WHARY_ID" jdbcType="DECIMAL" property="wharyId" />
-    <result column="RESULT_OUT_WHARY_TIME" jdbcType="TIMESTAMP" property="resultOutWharyTime" />
-    <result column="RESULT_OUT_WHARY_NAME" jdbcType="VARCHAR" property="resultOutWharyName" />
-    <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
-    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-    <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">
-    RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, WHARY_ID, RESULT_OUT_WHARY_TIME, RESULT_OUT_WHARY_NAME, 
-    RESULT_MEMO, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_NUMBER, t.WHARY_ID, t.RESULT_OUT_WHARY_TIME, 
-    t.RESULT_OUT_WHARY_NAME, t.RESULT_MEMO, t.DELETE_NAME, t.DELETE_TIME, 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 TMSSHIP_OUT_WHARY_RESULT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSSHIP_OUT_WHARY_RESULT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        and RESULT_NUMBER = #{resultNumber}
-      </if>
-      <if test="wharyId != null">
-        and WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultOutWharyTime != null">
-        and TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = #{resultOutWharyTime}
-      </if>
-      <if test="resultOutWharyName != null and resultOutWharyName != ''">
-        and RESULT_OUT_WHARY_NAME = #{resultOutWharyName}
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        and RESULT_MEMO = #{resultMemo}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME = #{deleteTime}
-      </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="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        and RESULT_NUMBER LIKE '%${resultNumber}%'
-      </if>
-      <if test="wharyId != null">
-        and WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultOutWharyTime != null">
-        and TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = #{resultOutWharyTime}
-      </if>
-      <if test="resultOutWharyName != null and resultOutWharyName != ''">
-        and RESULT_OUT_WHARY_NAME LIKE '%${resultOutWharyName}%'
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        and RESULT_MEMO LIKE '%${resultMemo}%'
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME LIKE '%${deleteName}%'
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME LIKE '%${deleteTime}%'
-      </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 TMSSHIP_OUT_WHARY_RESULT
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSSHIP_OUT_WHARY_RESULT
-    where 1!=1 
-      <if test="totalResultId != null">
-        or TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="resultNumber != null and resultNumber != ''">
-        or RESULT_NUMBER = #{resultNumber}
-      </if>
-      <if test="wharyId != null">
-        or WHARY_ID = #{wharyId}
-      </if>
-      <if test="resultOutWharyTime != null">
-        or TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = '#{resultOutWharyTime}'
-      </if>
-      <if test="resultOutWharyName != null and resultOutWharyName != ''">
-        or RESULT_OUT_WHARY_NAME = #{resultOutWharyName}
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        or RESULT_MEMO = #{resultMemo}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        or DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        or DELETE_TIME = #{deleteTime}
-      </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.TmsshipOutWharyResult">
-    insert into TMSSHIP_OUT_WHARY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, 
-      WHARY_ID, RESULT_OUT_WHARY_TIME, RESULT_OUT_WHARY_NAME, 
-      RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, 
-      #{wharyId,jdbcType=DECIMAL}, #{resultOutWharyTime,jdbcType=TIMESTAMP}, #{resultOutWharyName,jdbcType=VARCHAR}, 
-      #{resultMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,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.TmsshipOutWharyResult">
-    insert into TMSSHIP_OUT_WHARY_RESULT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="resultId != null">
-        RESULT_ID,
-      </if>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID,
-      </if>
-      <if test="resultNumber != null">
-        RESULT_NUMBER,
-      </if>
-      <if test="wharyId != null">
-        WHARY_ID,
-      </if>
-      <if test="resultOutWharyTime != null">
-        RESULT_OUT_WHARY_TIME,
-      </if>
-      <if test="resultOutWharyName != null">
-        RESULT_OUT_WHARY_NAME,
-      </if>
-      <if test="resultMemo != null">
-        RESULT_MEMO,
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </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="resultId != null">
-        #{resultId,jdbcType=DECIMAL},
-      </if>
-      <if test="totalResultId != null">
-        #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultNumber != null">
-        #{resultNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="wharyId != null">
-        #{wharyId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultOutWharyTime != null">
-        #{resultOutWharyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultOutWharyName != null">
-        #{resultOutWharyName,jdbcType=VARCHAR},
-      </if>
-      <if test="resultMemo != null">
-        #{resultMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,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.TmsshipOutWharyResult">
-    update TMSSHIP_OUT_WHARY_RESULT
-    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-      WHARY_ID = #{wharyId,jdbcType=DECIMAL},
-      RESULT_OUT_WHARY_TIME = #{resultOutWharyTime,jdbcType=TIMESTAMP},
-      RESULT_OUT_WHARY_NAME = #{resultOutWharyName,jdbcType=VARCHAR},
-      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipOutWharyResult">
-    update TMSSHIP_OUT_WHARY_RESULT
-    <set>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultNumber != null">
-        RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="wharyId != null">
-        WHARY_ID = #{wharyId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultOutWharyTime != null">
-        RESULT_OUT_WHARY_TIME = #{resultOutWharyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="resultOutWharyName != null">
-        RESULT_OUT_WHARY_NAME = #{resultOutWharyName,jdbcType=VARCHAR},
-      </if>
-      <if test="resultMemo != null">
-        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where RESULT_ID = #{resultId,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 TMSSHIP_OUT_WHARY_RESULT 
-      (RESULT_ID, 
-      TOTAL_RESULT_ID, RESULT_NUMBER, 
-      WHARY_ID, RESULT_OUT_WHARY_TIME, 
-      RESULT_OUT_WHARY_NAME, RESULT_MEMO, 
-      DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.resultId,jdbcType=DECIMAL}, 
-      #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR}, 
-      #{item.wharyId,jdbcType=DECIMAL}, #{item.resultOutWharyTime,jdbcType=TIMESTAMP}, 
-      #{item.resultOutWharyName,jdbcType=VARCHAR}, #{item.resultMemo,jdbcType=VARCHAR}, 
-      #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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 TMSSHIP_OUT_WHARY_RESULT
-     set
-       RESULT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-       </foreach>
-       ,TOTAL_RESULT_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,WHARY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.wharyId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_OUT_WHARY_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutWharyTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RESULT_OUT_WHARY_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutWharyName,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where RESULT_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.resultId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSSHIP_OUT_WHARY_RESULT
-    where RESULT_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectMaxId" resultType="DECIMAL" >
-    SELECT MAX(RESULT_ID)+1 FROM TMSSHIP_OUT_WHARY_RESULT
-  </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipShipLocationMapper.xml

@@ -1,510 +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.TmsshipShipLocationMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipShipLocation">
-    <id column="LOCATION_ID" jdbcType="DECIMAL" property="locationId" />
-    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
-    <result column="LOCATION_VALUE" jdbcType="VARCHAR" property="locationValue" />
-    <result column="LOCATION_ROUTE_TIME" jdbcType="TIMESTAMP" property="locationRouteTime" />
-    <result column="LOCATION_MEMO" jdbcType="VARCHAR" property="locationMemo" />
-    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
-    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
-    <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="LOCATION_STATUS" jdbcType="VARCHAR" property="locationStatus" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-  </resultMap>
-  <sql id="columns">
-    LOCATION_ID, TOTAL_RESULT_ID, LOCATION_VALUE, LOCATION_ROUTE_TIME, LOCATION_MEMO,
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, LOCATION_STATUS, DELETED
-  </sql>
-  <sql id="columns_alias">
-    t.LOCATION_ID, t.TOTAL_RESULT_ID, t.LOCATION_VALUE, t.LOCATION_ROUTE_TIME, t.LOCATION_MEMO,
-    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.LOCATION_STATUS, t.DELETED
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM TMSSHIP_SHIP_LOCATION
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSSHIP_SHIP_LOCATION t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="locationId != null">
-        and LOCATION_ID = #{locationId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="locationValue != null and locationValue != ''">
-        and LOCATION_VALUE = #{locationValue}
-      </if>
-      <if test="locationRouteTime != null">
-        and TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = #{locationRouteTime}
-      </if>
-      <if test="locationMemo != null and locationMemo != ''">
-        and LOCATION_MEMO = #{locationMemo}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME = #{deleteTime}
-      </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="locationStatus != null and locationStatus != ''">
-        and LOCATION_STATUS = #{locationStatus}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="locationId != null">
-        and LOCATION_ID = #{locationId}
-      </if>
-      <if test="totalResultId != null">
-        and TOTAL_RESULT_ID = #{totalResultId}
-      </if>
-      <if test="locationValue != null and locationValue != ''">
-        and LOCATION_VALUE LIKE '%${locationValue}%'
-      </if>
-      <if test="locationRouteTime != null">
-        and TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = #{locationRouteTime}
-      </if>
-      <if test="locationMemo != null and locationMemo != ''">
-        and LOCATION_MEMO LIKE '%${locationMemo}%'
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        and DELETE_NAME LIKE '%${deleteName}%'
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        and DELETE_TIME LIKE '%${deleteTime}%'
-      </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="locationStatus != null and locationStatus != ''">
-        and LOCATION_STATUS LIKE '%${locationStatus}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from TMSSHIP_SHIP_LOCATION
-    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSSHIP_SHIP_LOCATION
-    where 1!=1
-    <if test="totalResultId != null">
-      or TOTAL_RESULT_ID = #{totalResultId}
-    </if>
-    <if test="locationValue != null and locationValue != ''">
-      or LOCATION_VALUE = #{locationValue}
-    </if>
-    <if test="locationRouteTime != null">
-      or TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = '#{locationRouteTime}'
-    </if>
-    <if test="locationMemo != null and locationMemo != ''">
-      or LOCATION_MEMO = #{locationMemo}
-    </if>
-    <if test="deleteName != null and deleteName != ''">
-      or DELETE_NAME = #{deleteName}
-    </if>
-    <if test="deleteTime != null and deleteTime != ''">
-      or DELETE_TIME = #{deleteTime}
-    </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="locationStatus != null and locationStatus != ''">
-      or LOCATION_STATUS = #{locationStatus}
-    </if>
-    <if test="deleted != null">
-      or DELETED = #{deleted}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
-    insert into TMSSHIP_SHIP_LOCATION (LOCATION_ID, TOTAL_RESULT_ID, LOCATION_VALUE,
-      LOCATION_ROUTE_TIME, LOCATION_MEMO, DELETE_NAME,
-      DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-      LOCATION_STATUS, DELETED)
-    values (#{locationId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{locationValue,jdbcType=VARCHAR},
-      #{locationRouteTime,jdbcType=TIMESTAMP}, #{locationMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR},
-      #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
-      #{locationStatus,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
-    insert into TMSSHIP_SHIP_LOCATION
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="locationId != null">
-        LOCATION_ID,
-      </if>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID,
-      </if>
-      <if test="locationValue != null">
-        LOCATION_VALUE,
-      </if>
-      <if test="locationRouteTime != null">
-        LOCATION_ROUTE_TIME,
-      </if>
-      <if test="locationMemo != null">
-        LOCATION_MEMO,
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </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="locationStatus != null">
-        LOCATION_STATUS,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="locationId != null">
-        #{locationId,jdbcType=DECIMAL},
-      </if>
-      <if test="totalResultId != null">
-        #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="locationValue != null">
-        #{locationValue,jdbcType=VARCHAR},
-      </if>
-      <if test="locationRouteTime != null">
-        #{locationRouteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="locationMemo != null">
-        #{locationMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,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="locationStatus != null">
-        #{locationStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
-    update TMSSHIP_SHIP_LOCATION
-    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      LOCATION_VALUE = #{locationValue,jdbcType=VARCHAR},
-      LOCATION_ROUTE_TIME = #{locationRouteTime,jdbcType=TIMESTAMP},
-      LOCATION_MEMO = #{locationMemo,jdbcType=VARCHAR},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,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},
-      LOCATION_STATUS = #{locationStatus,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
-    update TMSSHIP_SHIP_LOCATION
-    <set>
-      <if test="totalResultId != null">
-        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="locationValue != null">
-        LOCATION_VALUE = #{locationValue,jdbcType=VARCHAR},
-      </if>
-      <if test="locationRouteTime != null">
-        LOCATION_ROUTE_TIME = #{locationRouteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="locationMemo != null">
-        LOCATION_MEMO = #{locationMemo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteName != null">
-        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,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="locationStatus != null">
-        LOCATION_STATUS = #{locationStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where LOCATION_ID = #{locationId,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 TMSSHIP_SHIP_LOCATION
-    (LOCATION_ID,
-    TOTAL_RESULT_ID, LOCATION_VALUE,
-    LOCATION_ROUTE_TIME, LOCATION_MEMO,
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK,
-    LOCATION_STATUS, DELETED)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.locationId,jdbcType=DECIMAL},
-    #{item.totalResultId,jdbcType=DECIMAL}, #{item.locationValue,jdbcType=VARCHAR},
-    #{item.locationRouteTime,jdbcType=TIMESTAMP}, #{item.locationMemo,jdbcType=VARCHAR},
-    #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.locationStatus,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update TMSSHIP_SHIP_LOCATION
-    set
-    LOCATION_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationId,jdbcType=DECIMAL}
-    </foreach>
-    ,TOTAL_RESULT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-    </foreach>
-    ,LOCATION_VALUE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationValue,jdbcType=VARCHAR}
-    </foreach>
-    ,LOCATION_ROUTE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationRouteTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,LOCATION_MEMO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationMemo,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,LOCATION_STATUS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationStatus,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETED=
-    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
-      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-    </foreach>
-    where LOCATION_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.locationId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSSHIP_SHIP_LOCATION
-    where LOCATION_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectMaxId" resultType="DECIMAL">
-    SELECT MAX(LOCATION_ID)+1 FROM TMSSHIP_SHIP_LOCATION
-  </select>
-
-  <!--查询所有船舶位置信息-->
-  <sql id="orderByInsertTime">
-    <if test="orderField != null and orderField != ''">
-      order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
-  </sql>
-  <select id="selectShipLocationList" parameterType="map" resultType="java.util.Map">
-
-    SELECT DISTINCT
-                    ttr.ORDER_ID                     as "orderId",
-                    tsl.INSERT_TIME                  as "insertTime",
-                    tsl.LOCATION_ID                  as "locationId",
-                    rm.MATERIAL_NAME                 as "materialName",
-                    db.RESULT_FOREIGN_SHIP_NAME      as "foreignShipName",
-                    rc.CAPACITY_NUMBER               as "capacityName",
-                    rps.PORT_NAME                    as "startPortName",
-                    rpe.PORT_NAME                    as "arrivePortName",
-                    oic.INSTRUCTION_PLANNED_LOADING  as "planWeight",
-                    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-                    tsl.LOCATION_VALUE               as "shipLocation",
-                    tsl.LOCATION_STATUS              as "locationStatus",
-                    tsl.LOCATION_ROUTE_TIME          as "locationRouteTime",
-                    tsl.LOCATION_MEMO                as "locationMemo"
-    FROM TMSSHIP_SHIP_LOCATION tsl
-           LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-                     ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
-           LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-                     ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-           LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-                     ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-           LEFT JOIN DIL_BATCH db
-                     ON osi.BATCH_ID = db.BATCH_ID
-           LEFT JOIN RMS_MATERIAL rm
-                     ON db.MATERIAL_ID = rm.MATERIAL_ID
-           LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-                     ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-           LEFT JOIN RMS_PORT rps
-                     ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
-           LEFT JOIN RMS_PORT rpe
-                     ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
-           LEFT JOIN RMS_CAPACITY rc
-                     ON rc.CAPACITY_ID = oic.CAPACITY_ID
-    WHERE tsl.DELETED = 0 and to_char(tsl.LOCATION_ROUTE_TIME, 'yyyy-mm-dd') = #{dayTime}
-
-  </select>
-
-  <select id="selectShipLocation" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-    LOCATION_VALUE "locationValue",
-    LOCATION_ROUTE_TIME "locationRouteTime",
-    LOCATION_STATUS "locationStatus",
-    LOCATION_MEMO "locationMemo"
-    FROM TMSSHIP_SHIP_LOCATION
-    WHERE LOCATION_ID = #{locationId}
-  </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipTotalResultMapper.xml

@@ -1,582 +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.TmsshipTotalResultMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipTotalResult">
-        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
-        <result column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
-        <result column="RESULT_DURATION" jdbcType="DECIMAL" property="resultDuration" />
-        <result column="STANDARD_DATA_ID" jdbcType="DECIMAL" property="standardDataId" />
-        <result column="RESULT_OUTLIER" jdbcType="DECIMAL" property="resultOutlier" />
-        <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="SHIP_STATUS" jdbcType="DECIMAL" property="shipStatus" />
-    </resultMap>
-    <sql id="columns">
-        RESULT_ID, ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, SHIP_STATUS
-    </sql>
-    <sql id="columns_alias">
-        t.RESULT_ID, t.ORDER_ID, t.RESULT_DURATION, t.STANDARD_DATA_ID, t.RESULT_OUTLIER,
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
-    t.SHIP_STATUS
-    </sql>
-    <sql id="select">
-        SELECT <include refid="columns"/> FROM TMSSHIP_TOTAL_RESULT
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM TMSSHIP_TOTAL_RESULT t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="orderId != null">
-                and ORDER_ID = #{orderId}
-            </if>
-            <if test="resultDuration != null">
-                and RESULT_DURATION = #{resultDuration}
-            </if>
-            <if test="standardDataId != null">
-                and STANDARD_DATA_ID = #{standardDataId}
-            </if>
-            <if test="resultOutlier != null">
-                and RESULT_OUTLIER = #{resultOutlier}
-            </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="shipStatus != null">
-                and SHIP_STATUS = #{shipStatus}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="orderId != null">
-                and ORDER_ID = #{orderId}
-            </if>
-            <if test="resultDuration != null">
-                and RESULT_DURATION = #{resultDuration}
-            </if>
-            <if test="standardDataId != null">
-                and STANDARD_DATA_ID = #{standardDataId}
-            </if>
-            <if test="resultOutlier != null">
-                and RESULT_OUTLIER = #{resultOutlier}
-            </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="shipStatus != null">
-                and SHIP_STATUS = #{shipStatus}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete from TMSSHIP_TOTAL_RESULT
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from TMSSHIP_TOTAL_RESULT
-        where 1!=1
-        <if test="orderId != null">
-            or ORDER_ID = #{orderId}
-        </if>
-        <if test="resultDuration != null">
-            or RESULT_DURATION = #{resultDuration}
-        </if>
-        <if test="standardDataId != null">
-            or STANDARD_DATA_ID = #{standardDataId}
-        </if>
-        <if test="resultOutlier != null">
-            or RESULT_OUTLIER = #{resultOutlier}
-        </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="shipStatus != null">
-            or SHIP_STATUS = #{shipStatus}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
-        insert into TMSSHIP_TOTAL_RESULT (RESULT_ID, ORDER_ID, RESULT_DURATION,
-                                          STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
-                                          INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                          INSERT_UPDATE_REMARK, SHIP_STATUS)
-        values (#{resultId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{resultDuration,jdbcType=DECIMAL},
-                #{standardDataId,jdbcType=DECIMAL}, #{resultOutlier,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{shipStatus,jdbcType=DECIMAL})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
-        insert into TMSSHIP_TOTAL_RESULT
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                RESULT_ID,
-            </if>
-            <if test="orderId != null">
-                ORDER_ID,
-            </if>
-            <if test="resultDuration != null">
-                RESULT_DURATION,
-            </if>
-            <if test="standardDataId != null">
-                STANDARD_DATA_ID,
-            </if>
-            <if test="resultOutlier != null">
-                RESULT_OUTLIER,
-            </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="shipStatus != null">
-                SHIP_STATUS,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                #{resultId,jdbcType=DECIMAL},
-            </if>
-            <if test="orderId != null">
-                #{orderId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultDuration != null">
-                #{resultDuration,jdbcType=DECIMAL},
-            </if>
-            <if test="standardDataId != null">
-                #{standardDataId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultOutlier != null">
-                #{resultOutlier,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="shipStatus != null">
-                #{shipStatus,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
-        update TMSSHIP_TOTAL_RESULT
-        set ORDER_ID = #{orderId,jdbcType=DECIMAL},
-            RESULT_DURATION = #{resultDuration,jdbcType=DECIMAL},
-            STANDARD_DATA_ID = #{standardDataId,jdbcType=DECIMAL},
-            RESULT_OUTLIER = #{resultOutlier,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},
-            SHIP_STATUS = #{shipStatus,jdbcType=DECIMAL}
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
-        update TMSSHIP_TOTAL_RESULT
-        <set>
-            <if test="orderId != null">
-                ORDER_ID = #{orderId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultDuration != null">
-                RESULT_DURATION = #{resultDuration,jdbcType=DECIMAL},
-            </if>
-            <if test="standardDataId != null">
-                STANDARD_DATA_ID = #{standardDataId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultOutlier != null">
-                RESULT_OUTLIER = #{resultOutlier,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="shipStatus != null">
-                SHIP_STATUS = #{shipStatus,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where RESULT_ID = #{resultId,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 TMSSHIP_TOTAL_RESULT
-        (RESULT_ID,
-        ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID,
-        RESULT_OUTLIER, INSERT_USERNAME,
-        INSERT_TIME, UPDATE_USERNAME,
-        UPDATE_TIME, INSERT_UPDATE_REMARK,
-        SHIP_STATUS)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.resultId,jdbcType=DECIMAL},
-        #{item.orderId,jdbcType=DECIMAL}, #{item.resultDuration,jdbcType=DECIMAL}, #{item.standardDataId,jdbcType=DECIMAL},
-        #{item.resultOutlier,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
-        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.shipStatus,jdbcType=DECIMAL} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update TMSSHIP_TOTAL_RESULT
-        set
-        RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-        ,ORDER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_DURATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDuration,jdbcType=DECIMAL}
-        </foreach>
-        ,STANDARD_DATA_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.standardDataId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_OUTLIER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutlier,jdbcType=DECIMAL}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,SHIP_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.shipStatus,jdbcType=DECIMAL}
-        </foreach>
-        where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from TMSSHIP_TOTAL_RESULT
-        where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(RESULT_ID) + 1
-        FROM TMSSHIP_TOTAL_RESULT
-    </select>
-
-    <select id="selectResultTotalId" resultType="DECIMAL">
-        SELECT RESULT_ID
-        FROM TMSSHIP_TOTAL_RESULT
-        WHERE ORDER_ID = #{orderId}
-    </select>
-
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <select id="selectOrderList" resultType="java.util.Map">
-        select * from (
-        SELECT DISTINCT ttr.ORDER_ID as "orderId",
-        ttr.INSERT_TIME as "insertTime",
-        rm.MATERIAL_NAME as "materialName",
-        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-        rc.CAPACITY_NUMBER as "capacityName",
-        rsh.SHIPPER_ABBREVIATION as "shipperAbbreviation",
-        rsu.CARRIER_NAME as "supplierAbbreviation",
-        pier.PIER_NAME as "groupName",
-        tlsr.RESULT_LOAD_SHIP_DATE as "resultLoadShipDate",
-        rps.PORT_NAME as "startPortName",
-        rpe.PORT_NAME as "arrivePortName",
-        tlsr.RESULT_ARRIVAL_PORT_TIME as "arriveTime",
-        tlsr.RESULT_OUT_PORT_TIME as "liveTime",
-        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-        tlsr.INSERT_UPDATE_REMARK as "resultMemo"
-        FROM TMSSHIP_TOTAL_RESULT ttr
-        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
-        LEFT JOIN DIL_BATCH db
-        ON osi.BATCH_ID = db.BATCH_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON db.MATERIAL_ID = rm.MATERIAL_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
-        on osi.BATCH_ID = ada.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
-        on adn.BATCH_ID = ada.BATCH_ID
-        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
-        ON actr.BATCH_ID = adn.BATCH_ID
-        LEFT JOIN RMS_SHIPPER rsh
-        ON adn.REQUESTER_GROUP_ID = rsh.SHIPPER_ID
-        LEFT JOIN RMS_CARRIER rsu
-        ON adn.CARRIER_ID = rsu.CARRIER_ID
-        LEFT JOIN RMS_PIER pier
-        ON pier.PIER_ID = actr.GROUP_ID
-        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-        LEFT JOIN RMS_PORT rps
-        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
-        LEFT JOIN RMS_PORT rpe
-        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        )
-        <where>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="foreignShipName != null">
-                and
-                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-                    "foreignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="capacityName != null">
-                and
-                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-                    "capacityName" in #{item}
-                </foreach>
-            </if>
-            <if test="shipperAbbreviation != null">
-                and
-                <foreach collection="shipperAbbreviation" item="item" open="(" separator="," close=")">
-                    "shipperAbbreviation" in #{item}
-                </foreach>
-            </if>
-            <if test="supplierAbbreviation != null">
-                and
-                <foreach collection="supplierAbbreviation" item="item" open="(" separator="," close=")">
-                    "supplierAbbreviation" in #{item}
-                </foreach>
-            </if>
-            <if test="groupName != null">
-                and
-                <foreach collection="groupName" item="item" open="(" separator="," close=")">
-                    "groupName" in #{item}
-                </foreach>
-            </if>
-            <if test="resultLoadShipDate != null">
-                and
-                <foreach collection="resultLoadShipDate" item="item" open="(" separator="," close=")">
-                    "resultLoadShipDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="startPortName != null">
-                and
-                <foreach collection="startPortName" item="item" open="(" separator="," close=")">
-                    "startPortName" in #{item}
-                </foreach>
-            </if>
-            <if test="arrivePortName != null">
-                and
-                <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
-                    "arrivePortName" in #{item}
-                </foreach>
-            </if>
-            <if test="arriveTime != null">
-                and
-                <foreach collection="arriveTime" item="item" open="(" separator="," close=")">
-                    "arriveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="liveTime != null">
-                and
-                <foreach collection="liveTime" item="item" open="(" separator="," close=")">
-                    "liveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="planWeight != null">
-                and
-                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-                    "planWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="realWeight != null">
-                and
-                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-                    "realWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="resultMemo != null">
-                and
-                <foreach collection="resultMemo" item="item" open="(" separator="," close=")">
-                    "resultMemo" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-
-
-    <select id="getCapacity" resultType="java.util.Map">
-        SELECT * FROM(
-        SELECT db.RESULT_FOREIGN_SHIP_NAME as "resultForeignShipName",
-        rm.MATERIAL_NAME as "materialName",
-        rc.CAPACITY_NUMBER as "capacityNumber",
-        oic.INSTRUCTIONS_CAPACITY_ID as "orderId",
-        db.BATCH_ID as "batchId",
-        ada.DOWN_SWIM_PORT_ID as "downSwimPortId",
-        ada.PORT_ID as "portId",
-        rp.PORT_NAME as "portName1",
-        rp.PORT_NAME as "portName2"
-        FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-        LEFT JOIN DIL_BATCH db
-        ON db.BATCH_ID = osi.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
-        ON ada.BATCH_ID=db.BATCH_ID
-        LEFT JOIN RMS_PORT rp
-        ON ada.PORT_ID=rp.PORT_ID
-        LEFT JOIN RMS_PORT rp
-        ON ada.DOWN_SWIM_PORT_ID=rp.PORT_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON rm.MATERIAL_ID = db.MATERIAL_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        )
-        <where>
-            <if test="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="," close=")">
-                    "resultForeignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="portName1 != null">
-                and
-                <foreach collection="portName1" item="item" open="(" separator="," close=")">
-                    "portName1" in #{item}
-                </foreach>
-            </if>
-            <if test="portName2 != null">
-                and
-                <foreach collection="portName2" item="item" open="(" separator="," close=")">
-                    "portName2" in #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipUnloadShipResultMapper.xml

@@ -1,562 +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.TmsshipUnloadShipResultMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipUnloadShipResult">
-        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
-        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
-        <result column="RESULT_ARRIVAL_DATE" jdbcType="TIMESTAMP" property="resultArrivalDate"/>
-        <result column="RESULT_START_TIME" jdbcType="TIMESTAMP" property="resultStartTime"/>
-        <result column="RESULT_END_TIME" jdbcType="TIMESTAMP" property="resultEndTime"/>
-        <result column="RESULT_STATUS" jdbcType="VARCHAR" property="resultStatus"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
-        <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">
-        RESULT_ID, TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE, RESULT_START_TIME, RESULT_END_TIME,
-    RESULT_STATUS, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-    </sql>
-    <sql id="columns_alias">
-        t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_ARRIVAL_DATE, t.RESULT_START_TIME, t.RESULT_END_TIME,
-    t.RESULT_STATUS, t.DELETE_NAME, t.DELETE_TIME, 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 TMSSHIP_UNLOAD_SHIP_RESULT
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSSHIP_UNLOAD_SHIP_RESULT t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="resultArrivalDate != null">
-                and TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = #{resultArrivalDate}
-            </if>
-            <if test="resultStartTime != null">
-                and TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = #{resultStartTime}
-            </if>
-            <if test="resultEndTime != null">
-                and TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = #{resultEndTime}
-            </if>
-            <if test="resultStatus != null and resultStatus != ''">
-                and RESULT_STATUS = #{resultStatus}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="resultArrivalDate != null">
-                and TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = #{resultArrivalDate}
-            </if>
-            <if test="resultStartTime != null">
-                and TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = #{resultStartTime}
-            </if>
-            <if test="resultEndTime != null">
-                and TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = #{resultEndTime}
-            </if>
-            <if test="resultStatus != null and resultStatus != ''">
-                and RESULT_STATUS LIKE '%${resultStatus}%'
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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 TMSSHIP_UNLOAD_SHIP_RESULT
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from TMSSHIP_UNLOAD_SHIP_RESULT
-        where 1!=1
-        <if test="totalResultId != null">
-            or TOTAL_RESULT_ID = #{totalResultId}
-        </if>
-        <if test="resultArrivalDate != null">
-            or TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = '#{resultArrivalDate}'
-        </if>
-        <if test="resultStartTime != null">
-            or TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = '#{resultStartTime}'
-        </if>
-        <if test="resultEndTime != null">
-            or TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = '#{resultEndTime}'
-        </if>
-        <if test="resultStatus != null and resultStatus != ''">
-            or RESULT_STATUS = #{resultStatus}
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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.TmsshipUnloadShipResult">
-        insert into TMSSHIP_UNLOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE,
-                                                RESULT_START_TIME, RESULT_END_TIME, RESULT_STATUS,
-                                                DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-                                                INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                                INSERT_UPDATE_REMARK, DELETED)
-        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
-                #{resultArrivalDate,jdbcType=TIMESTAMP},
-                #{resultStartTime,jdbcType=TIMESTAMP}, #{resultEndTime,jdbcType=TIMESTAMP},
-                #{resultStatus,jdbcType=VARCHAR},
-                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,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.TmsshipUnloadShipResult">
-        insert into TMSSHIP_UNLOAD_SHIP_RESULT
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                RESULT_ID,
-            </if>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID,
-            </if>
-            <if test="resultArrivalDate != null">
-                RESULT_ARRIVAL_DATE,
-            </if>
-            <if test="resultStartTime != null">
-                RESULT_START_TIME,
-            </if>
-            <if test="resultEndTime != null">
-                RESULT_END_TIME,
-            </if>
-            <if test="resultStatus != null">
-                RESULT_STATUS,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="resultId != null">
-                #{resultId,jdbcType=DECIMAL},
-            </if>
-            <if test="totalResultId != null">
-                #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultArrivalDate != null">
-                #{resultArrivalDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultStartTime != null">
-                #{resultStartTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultEndTime != null">
-                #{resultEndTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultStatus != null">
-                #{resultStatus,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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.TmsshipUnloadShipResult">
-        update TMSSHIP_UNLOAD_SHIP_RESULT
-        set TOTAL_RESULT_ID      = #{totalResultId,jdbcType=DECIMAL},
-            RESULT_ARRIVAL_DATE  = #{resultArrivalDate,jdbcType=TIMESTAMP},
-            RESULT_START_TIME    = #{resultStartTime,jdbcType=TIMESTAMP},
-            RESULT_END_TIME      = #{resultEndTime,jdbcType=TIMESTAMP},
-            RESULT_STATUS        = #{resultStatus,jdbcType=VARCHAR},
-            DELETE_NAME          = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME          = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipUnloadShipResult">
-        update TMSSHIP_UNLOAD_SHIP_RESULT
-        <set>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultArrivalDate != null">
-                RESULT_ARRIVAL_DATE = #{resultArrivalDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultStartTime != null">
-                RESULT_START_TIME = #{resultStartTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultEndTime != null">
-                RESULT_END_TIME = #{resultEndTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultStatus != null">
-                RESULT_STATUS = #{resultStatus,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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 RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where RESULT_ID = #{resultId,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 TMSSHIP_UNLOAD_SHIP_RESULT
-        (RESULT_ID,
-        TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE,
-        RESULT_START_TIME, RESULT_END_TIME,
-        RESULT_STATUS, DELETE_NAME, DELETE_TIME,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.resultId,jdbcType=DECIMAL},
-        #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultArrivalDate,jdbcType=TIMESTAMP},
-        #{item.resultStartTime,jdbcType=TIMESTAMP}, #{item.resultEndTime,jdbcType=TIMESTAMP},
-        #{item.resultStatus,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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 TMSSHIP_UNLOAD_SHIP_RESULT
-        set
-        RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-        ,TOTAL_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_ARRIVAL_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_START_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStartTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_END_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEndTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStatus,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from TMSSHIP_UNLOAD_SHIP_RESULT
-        where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(RESULT_ID) + 1
-        FROM TMSSHIP_UNLOAD_SHIP_RESULT
-    </select>
-
-    <!--查询所有卸船作业-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <select id="selectUnloadShipList" resultType="java.util.Map">
-        select * from (
-        SELECT DISTINCT
-        db.BATCH_ID as "batchId",
-        tlsr.ARRIVAL_PORT_ID as "portId",
-        ttr.ORDER_ID as "orderId",
-        tusr.RESULT_ID as "resultId",
-        tusr.INSERT_TIME as "insertTime",
-        rm.MATERIAL_NAME as "materialName",
-        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-        rc.CAPACITY_NUMBER as "capacityName",
-        tusr.RESULT_ARRIVAL_DATE as "arrivalTime",
-        tusr.RESULT_START_TIME as "unloadStartTime",
-        tusr.RESULT_END_TIME as "unloadEndTime",
-        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-        tusr.RESULT_STATUS as "unloadStatus"
-        FROM TMSSHIP_UNLOAD_SHIP_RESULT tusr
-        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-        ON tusr.TOTAL_RESULT_ID = ttr.RESULT_ID
-        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-        LEFT JOIN DIL_BATCH db
-        ON osi.BATCH_ID = db.BATCH_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON db.MATERIAL_ID = rm.MATERIAL_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-        ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
-        WHERE tusr.DELETED = 0)
-        <where>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="foreignShipName != null">
-                and
-                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-                    "foreignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="capacityName != null">
-                and
-                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-                    "capacityName" in #{item}
-                </foreach>
-            </if>
-            <if test="arrivalTime != null">
-                and
-                <foreach collection="arrivalTime" item="item" open="(" separator="," close=")">
-                    "arrivalTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="unloadStartTime != null">
-                and
-                <foreach collection="unloadStartTime" item="item" open="(" separator="," close=")">
-                    "unloadStartTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="unloadEndTime != null">
-                and
-                <foreach collection="unloadEndTime" item="item" open="(" separator="," close=")">
-                    "unloadEndTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="realWeight != null">
-                and
-                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-                    "realWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="unloadStatus != null">
-                and
-                <foreach collection="unloadStatus" item="item" open="(" separator="," close=")">
-                    "unloadStatus" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-
-    <select id="selectUnloadShip" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RESULT_ARRIVAL_DATE "resultArrivalDate",
-               RESULT_START_TIME   "resultStartTime",
-               RESULT_END_TIME     "resultEndTime",
-               RESULT_STATUS       "resultStatus"
-        FROM TMSSHIP_UNLOAD_SHIP_RESULT
-        WHERE RESULT_ID = #{resultId}
-    </select>
-</mapper>

target/classes/com/steerinfo/dil/mapper/TmsshipWaterQualityResultMapper.xml

@@ -1,773 +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.TmsshipWaterQualityResultMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
-        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
-        <result column="RESULT_PLANNED_DATE" jdbcType="TIMESTAMP" property="resultPlannedDate"/>
-        <result column="RESULT_CARGO_RIGHTS_DATE" jdbcType="TIMESTAMP" property="resultCargoRightsDate"/>
-        <result column="RESULT_SHIPMENT_RATIO" jdbcType="DECIMAL" property="resultShipmentRatio"/>
-        <result column="RESULT_EMPTY_HEAVY_WATER_METER" jdbcType="DECIMAL" property="resultEmptyHeavyWaterMeter"/>
-        <result column="RESULT_MOISTURE_CONTENT" jdbcType="DECIMAL" property="resultMoistureContent"/>
-        <result column="RESULT_WATER_TONNAGE" jdbcType="DECIMAL" property="resultWaterTonnage"/>
-        <result column="RESULT_INSPECTION_FEES" jdbcType="DECIMAL" property="resultInspectionFees"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
-        <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="RESULT_ES_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultEsDeliveryDate"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
-    </resultMap>
-    <sql id="columns">
-        RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE, RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
-    RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT, RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
-    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED
-    </sql>
-    <sql id="columns_alias">
-        t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_PLANNED_DATE, t.RESULT_CARGO_RIGHTS_DATE,
-    t.RESULT_SHIPMENT_RATIO, t.RESULT_EMPTY_HEAVY_WATER_METER, t.RESULT_MOISTURE_CONTENT,
-    t.RESULT_WATER_TONNAGE, t.RESULT_INSPECTION_FEES, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.RESULT_ES_DELIVERY_DATE,
-    t.DELETED
-    </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM TMSSHIP_WATER_QUALITY_RESULT
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSSHIP_WATER_QUALITY_RESULT t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="resultPlannedDate != null">
-                and TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = #{resultPlannedDate}
-            </if>
-            <if test="resultCargoRightsDate != null">
-                and TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = #{resultCargoRightsDate}
-            </if>
-            <if test="resultShipmentRatio != null">
-                and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
-            </if>
-            <if test="resultMoistureContent != null">
-                and RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
-            </if>
-            <if test="resultWaterTonnage != null">
-                and RESULT_WATER_TONNAGE = #{resultWaterTonnage}
-            </if>
-            <if test="resultInspectionFees != null">
-                and RESULT_INSPECTION_FEES = #{resultInspectionFees}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME = #{deleteName}
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME = #{deleteTime}
-            </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="resultEsDeliveryDate != null">
-                and TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = #{resultEsDeliveryDate}
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="resultId != null">
-                and RESULT_ID = #{resultId}
-            </if>
-            <if test="totalResultId != null">
-                and TOTAL_RESULT_ID = #{totalResultId}
-            </if>
-            <if test="resultPlannedDate != null">
-                and TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = #{resultPlannedDate}
-            </if>
-            <if test="resultCargoRightsDate != null">
-                and TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = #{resultCargoRightsDate}
-            </if>
-            <if test="resultShipmentRatio != null">
-                and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
-            </if>
-            <if test="resultMoistureContent != null">
-                and RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
-            </if>
-            <if test="resultWaterTonnage != null">
-                and RESULT_WATER_TONNAGE = #{resultWaterTonnage}
-            </if>
-            <if test="resultInspectionFees != null">
-                and RESULT_INSPECTION_FEES = #{resultInspectionFees}
-            </if>
-            <if test="deleteName != null and deleteName != ''">
-                and DELETE_NAME LIKE '%${deleteName}%'
-            </if>
-            <if test="deleteTime != null and deleteTime != ''">
-                and DELETE_TIME LIKE '%${deleteTime}%'
-            </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="resultEsDeliveryDate != null">
-                and TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = #{resultEsDeliveryDate}
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from TMSSHIP_WATER_QUALITY_RESULT
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from TMSSHIP_WATER_QUALITY_RESULT
-        where 1!=1
-        <if test="totalResultId != null">
-            or TOTAL_RESULT_ID = #{totalResultId}
-        </if>
-        <if test="resultPlannedDate != null">
-            or TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = '#{resultPlannedDate}'
-        </if>
-        <if test="resultCargoRightsDate != null">
-            or TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = '#{resultCargoRightsDate}'
-        </if>
-        <if test="resultShipmentRatio != null">
-            or RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
-        </if>
-        <if test="resultEmptyHeavyWaterMeter != null">
-            or RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
-        </if>
-        <if test="resultMoistureContent != null">
-            or RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
-        </if>
-        <if test="resultWaterTonnage != null">
-            or RESULT_WATER_TONNAGE = #{resultWaterTonnage}
-        </if>
-        <if test="resultInspectionFees != null">
-            or RESULT_INSPECTION_FEES = #{resultInspectionFees}
-        </if>
-        <if test="deleteName != null and deleteName != ''">
-            or DELETE_NAME = #{deleteName}
-        </if>
-        <if test="deleteTime != null and deleteTime != ''">
-            or DELETE_TIME = #{deleteTime}
-        </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="resultEsDeliveryDate != null">
-            or TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = '#{resultEsDeliveryDate}'
-        </if>
-        <if test="deleted != null">
-            or DELETED = #{deleted}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        insert into TMSSHIP_WATER_QUALITY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
-                                                  RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
-                                                  RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT,
-                                                  RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
-                                                  DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                                  INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE,
-                                                  DELETED)
-        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
-                #{resultPlannedDate,jdbcType=TIMESTAMP},
-                #{resultCargoRightsDate,jdbcType=TIMESTAMP}, #{resultShipmentRatio,jdbcType=DECIMAL},
-                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{resultMoistureContent,jdbcType=DECIMAL},
-                #{resultWaterTonnage,jdbcType=DECIMAL}, #{resultInspectionFees,jdbcType=DECIMAL},
-                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-                #{deleted,jdbcType=DECIMAL})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        insert into TMSSHIP_WATER_QUALITY_RESULT
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                RESULT_ID,
-            </if>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID,
-            </if>
-            <if test="resultPlannedDate != null">
-                RESULT_PLANNED_DATE,
-            </if>
-            <if test="resultCargoRightsDate != null">
-                RESULT_CARGO_RIGHTS_DATE,
-            </if>
-            <if test="resultShipmentRatio != null">
-                RESULT_SHIPMENT_RATIO,
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                RESULT_EMPTY_HEAVY_WATER_METER,
-            </if>
-            <if test="resultMoistureContent != null">
-                RESULT_MOISTURE_CONTENT,
-            </if>
-            <if test="resultWaterTonnage != null">
-                RESULT_WATER_TONNAGE,
-            </if>
-            <if test="resultInspectionFees != null">
-                RESULT_INSPECTION_FEES,
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </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="resultEsDeliveryDate != null">
-                RESULT_ES_DELIVERY_DATE,
-            </if>
-            <if test="deleted != null">
-                DELETED,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="resultId != null">
-                #{resultId,jdbcType=DECIMAL},
-            </if>
-            <if test="totalResultId != null">
-                #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultPlannedDate != null">
-                #{resultPlannedDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultCargoRightsDate != null">
-                #{resultCargoRightsDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultShipmentRatio != null">
-                #{resultShipmentRatio,jdbcType=DECIMAL},
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
-            </if>
-            <if test="resultMoistureContent != null">
-                #{resultMoistureContent,jdbcType=DECIMAL},
-            </if>
-            <if test="resultWaterTonnage != null">
-                #{resultWaterTonnage,jdbcType=DECIMAL},
-            </if>
-            <if test="resultInspectionFees != null">
-                #{resultInspectionFees,jdbcType=DECIMAL},
-            </if>
-            <if test="deleteName != null">
-                #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,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="resultEsDeliveryDate != null">
-                #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleted != null">
-                #{deleted,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        update TMSSHIP_WATER_QUALITY_RESULT
-        set TOTAL_RESULT_ID                = #{totalResultId,jdbcType=DECIMAL},
-            RESULT_PLANNED_DATE            = #{resultPlannedDate,jdbcType=TIMESTAMP},
-            RESULT_CARGO_RIGHTS_DATE       = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
-            RESULT_SHIPMENT_RATIO          = #{resultShipmentRatio,jdbcType=DECIMAL},
-            RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
-            RESULT_MOISTURE_CONTENT        = #{resultMoistureContent,jdbcType=DECIMAL},
-            RESULT_WATER_TONNAGE           = #{resultWaterTonnage,jdbcType=DECIMAL},
-            RESULT_INSPECTION_FEES         = #{resultInspectionFees,jdbcType=DECIMAL},
-            DELETE_NAME                    = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME                    = #{deleteTime,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},
-            RESULT_ES_DELIVERY_DATE        = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-            DELETED                        = #{deleted,jdbcType=DECIMAL}
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        update TMSSHIP_WATER_QUALITY_RESULT
-        <set>
-            <if test="totalResultId != null">
-                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
-            </if>
-            <if test="resultPlannedDate != null">
-                RESULT_PLANNED_DATE = #{resultPlannedDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultCargoRightsDate != null">
-                RESULT_CARGO_RIGHTS_DATE = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="resultShipmentRatio != null">
-                RESULT_SHIPMENT_RATIO = #{resultShipmentRatio,jdbcType=DECIMAL},
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
-            </if>
-            <if test="resultMoistureContent != null">
-                RESULT_MOISTURE_CONTENT = #{resultMoistureContent,jdbcType=DECIMAL},
-            </if>
-            <if test="resultWaterTonnage != null">
-                RESULT_WATER_TONNAGE = #{resultWaterTonnage,jdbcType=DECIMAL},
-            </if>
-            <if test="resultInspectionFees != null">
-                RESULT_INSPECTION_FEES = #{resultInspectionFees,jdbcType=DECIMAL},
-            </if>
-            <if test="deleteName != null">
-                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,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="resultEsDeliveryDate != null">
-                RESULT_ES_DELIVERY_DATE = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleted != null">
-                DELETED = #{deleted,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where RESULT_ID = #{resultId,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 TMSSHIP_WATER_QUALITY_RESULT
-        (RESULT_ID,
-        TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
-        RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
-        RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT,
-        RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
-        DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-        INSERT_TIME, UPDATE_USERNAME,
-        UPDATE_TIME, INSERT_UPDATE_REMARK,
-        RESULT_ES_DELIVERY_DATE, DELETED
-        )
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.resultId,jdbcType=DECIMAL},
-        #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultPlannedDate,jdbcType=TIMESTAMP},
-        #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}, #{item.resultShipmentRatio,jdbcType=DECIMAL},
-        #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{item.resultMoistureContent,jdbcType=DECIMAL},
-        #{item.resultWaterTonnage,jdbcType=DECIMAL}, #{item.resultInspectionFees,jdbcType=DECIMAL},
-        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR},
-        #{item.insertUsername,jdbcType=VARCHAR},
-        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL}
-        from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update TMSSHIP_WATER_QUALITY_RESULT
-        set
-        RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-        ,TOTAL_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_PLANNED_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPlannedDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_CARGO_RIGHTS_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,RESULT_SHIPMENT_RATIO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultShipmentRatio,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_EMPTY_HEAVY_WATER_METER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_MOISTURE_CONTENT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMoistureContent,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_WATER_TONNAGE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultWaterTonnage,jdbcType=DECIMAL}
-        </foreach>
-        ,RESULT_INSPECTION_FEES=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultInspectionFees,jdbcType=DECIMAL}
-        </foreach>
-        ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,RESULT_ES_DELIVERY_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}
-        </foreach>
-        ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.resultId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from TMSSHIP_WATER_QUALITY_RESULT
-        where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(RESULT_ID) + 1
-        FROM TMSSHIP_WATER_QUALITY_RESULT
-    </select>
-
-    <!--查询所有水分质检作业-->
-    <sql id="orderByInsertTime">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-    <select id="selectWaterQualityList" resultType="java.util.Map">
-        SELECT * FROM (
-        SELECT DISTINCT ttr.ORDER_ID as "orderId",
-        twqr.INSERT_TIME as "insertTime",
-        twqr.RESULT_ID as "resultId",
-        rm.MATERIAL_NAME as "materialName",
-        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-        rpo.PORT_NAME as "loadPort",
-        twqr.RESULT_PLANNED_DATE as "planDate",
-        twqr.RESULT_ES_DELIVERY_DATE as "expectNoticeDate",
-        twqr.RESULT_CARGO_RIGHTS_DATE as "cargoDate",
-        adn.PURCHASE_CONTRACT_MOISTURE as "purchaseContractMoisture",
-        tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
-        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-        rc.CAPACITY_NUMBER as "capacityName",
-        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
-        twqr.RESULT_EMPTY_HEAVY_WATER_METER as "resultEmptyHeavyWaterMeter",
-        twqr.RESULT_MOISTURE_CONTENT as "moistureContent",
-        twqr.RESULT_WATER_TONNAGE as "waterWeight",
-        twqr.RESULT_INSPECTION_FEES as "testFee",
-        twqr.RESULT_SHIPMENT_RATIO as "loadRatio"
-        FROM TMSSHIP_WATER_QUALITY_RESULT twqr
-        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
-        ON twqr.TOTAL_RESULT_ID = ttr.RESULT_ID
-        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-        LEFT JOIN DIL_BATCH db
-        ON osi.BATCH_ID = db.BATCH_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON db.MATERIAL_ID = rm.MATERIAL_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
-        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
-        LEFT JOIN RMS_PORT rpo
-        ON tlsr.ARRIVAL_PORT_ID = rpo.PORT_ID
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
-        ON adn.BATCH_ID = db.BATCH_ID
-        WHERE twqr.DELETED = 0)
-        <where>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="foreignShipName != null">
-                and
-                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
-                    "foreignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="loadPort != null">
-                and
-                <foreach collection="loadPort" item="item" open="(" separator="," close=")">
-                    "loadPort" in #{item}
-                </foreach>
-            </if>
-            <if test="planDate != null">
-                and
-                <foreach collection="planDate" item="item" open="(" separator="," close=")">
-                    "planDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="expectNoticeDate != null">
-                and
-                <foreach collection="expectNoticeDate" item="item" open="(" separator="," close=")">
-                    "expectNoticeDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="cargoDate != null">
-                and
-                <foreach collection="cargoDate" item="item" open="(" separator="," close=")">
-                    "cargoDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="purchaseContractMoisture != null">
-                and
-                <foreach collection="purchaseContractMoisture" item="item" open="(" separator="," close=")">
-                    "purchaseContractMoisture" in #{item}
-                </foreach>
-            </if>
-            <if test="loadTime != null">
-                and
-                <foreach collection="loadTime" item="item" open="(" separator="," close=")">
-                    "loadTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="planWeight != null">
-                and
-                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
-                    "planWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="capacityName != null">
-                and
-                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
-                    "capacityName" in #{item}
-                </foreach>
-            </if>
-            <if test="realWeight != null">
-                and
-                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
-                    "realWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                and
-                <foreach collection="resultEmptyHeavyWaterMeter" item="item" open="(" separator="," close=")">
-                    "resultEmptyHeavyWaterMeter" in #{item}
-                </foreach>
-            </if>
-            <if test="moistureContent != null">
-                and
-                <foreach collection="moistureContent" item="item" open="(" separator="," close=")">
-                    "moistureContent" in #{item}
-                </foreach>
-            </if>
-            <if test="waterWeight != null">
-                and
-                <foreach collection="waterWeight" item="item" open="(" separator="," close=")">
-                    "waterWeight" in #{item}
-                </foreach>
-            </if>
-            <if test="testFee != null">
-                and
-                <foreach collection="testFee" item="item" open="(" separator="," close=")">
-                    "testFee" in #{item}
-                </foreach>
-            </if>
-            <if test="loadRatio != null">
-                and
-                <foreach collection="loadRatio" item="item" open="(" separator="," close=")">
-                    "loadRatio" in #{item}
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderByInsertTime"></include>
-    </select>
-
-    <select id="selectWaterQuality" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RESULT_PLANNED_DATE            "resultPlannedDate",
-               RESULT_CARGO_RIGHTS_DATE       "resultCargoRightsDate",
-               RESULT_EMPTY_HEAVY_WATER_METER "resultEmptyHeavyWaterMeter",
-               RESULT_WATER_TONNAGE           "resultWaterTonnage",
-               RESULT_INSPECTION_FEES         "resultInspectionFees",
-               RESULT_ES_DELIVERY_DATE        "resultEsDeliveryDate"
-        FROM TMSSHIP_WATER_QUALITY_RESULT
-        WHERE RESULT_ID = #{resultId}
-    </select>
-
-    <select id="selectRealWeight" parameterType="DECIMAL" resultType="DECIMAL">
-        SELECT RESULT_ACTUAL_INSTALLATIONS
-        FROM TMSSHIP_LOAD_SHIP_RESULT
-        WHERE TOTAL_RESULT_ID = #{totalResultId}
-    </select>
-
-    <select id="selectInstructionsId" parameterType="DECIMAL" resultType="DECIMAL">
-        SELECT INSTRUCTIONS_ID
-        FROM OMSSHIP_INSTRUCTIONS_CAPACITY
-        WHERE INSTRUCTIONS_CAPACITY_ID = #{orderId}
-    </select>
-
-    <!-- 得到放货日期 -->
-    <select id="getDeliveryDate" parameterType="DECIMAL" resultType="java.util.Date">
-        SELECT ACTR.RESULT_DATE_OF_LOANS AS "resultEsDeliveryDate"
-        FROM OMSSHIP_INSTRUCTIONS_CAPACITY OIC
-                 LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS OSI
-                           ON OSI.SHIPMENT_INSTRUCTIONS_ID = OIC.INSTRUCTIONS_ID
-                 LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-                           ON ACTR.BATCH_ID = OSI.BATCH_ID
-        WHERE OIC.INSTRUCTIONS_CAPACITY_ID = #{orderId}
-    </select>
-
-    <select id="getPurchaseContractMoisture" parameterType="DECIMAL" resultType="java.lang.String">
-        SELECT
-            ADN.PURCHASE_CONTRACT_MOISTURE AS "purchaseContractMoisture"
-            FROM DIL_BATCH DB
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
-          ON DB.BATCH_ID=ADN.BATCH_ID
-       WHERE DB.BATCH_ID=#{batchId}
-    </select>
-
-    <select id="getResultActualInstallations" parameterType="DECIMAL" resultType="DECIMAL">
-        SELECT
-            TLSR.RESULT_ACTUAL_INSTALLATIONS AS "resultActualInstallations"
-        FROM DIL_BATCH DB
-        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT TLSR
-        ON DB.BATCH_ID=TLSR.BATCH_ID
-        WHERE DB.BATCH_ID=#{batchId}
-    </select>
-</mapper>