model problem

maoyangou
1 parent be773884
Showing 52 changed files with 1291 additions and 774 deletions
.idea/artifacts/patent_war_exploded.xml
.idea/workspace.xml
doc/.DS_Store
doc/patent.mwb
doc/patent.mwb.bak
doc/sql/ddl.sql
patent.iml
pom.xml
src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java
src/main/java/com/canrd/patent/dal/model/Casement.java
src/main/java/com/canrd/patent/dal/model/CasementExample.java
src/main/java/com/canrd/patent/dal/model/Order.java
src/main/java/com/canrd/patent/dal/model/OrderExample.java
src/main/java/com/canrd/patent/service/CaseHandlingService.java
src/main/java/com/canrd/patent/service/CasementService.java
src/main/java/com/canrd/patent/service/OrderService.java
src/main/java/com/canrd/patent/web/OrderPageController.java
src/main/resources/mapper/CasementMapper.xml
src/main/resources/mapper/OrderMapper.xml
src/main/webapp/case_manage.jsp
@@ -18,6 +18,7 @@
           <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.2.3.RELEASE" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.3.0" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.2.2" />
           <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" />
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" />
+    <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-detail.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-manage.jsp" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CasementService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CasementService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/sql/ddl.sql" afterPath="$PROJECT_DIR$/doc/sql/ddl.sql" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay_result.jsp" afterPath="$PROJECT_DIR$/target/patent/pay_result.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+    </list>
     <ignored path="patent.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -23,105 +75,101 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="3.0097086">
-              <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
+      <file leaf-file-name="Casement.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="error.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
+      <file leaf-file-name="CasementDataController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-3.75">
-              <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
+      <file leaf-file-name="CasementPageController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-16.25">
-              <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Assert.java" pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
+      <file leaf-file-name="CaseHandlingService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
+              <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="OrderService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
+      <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1787#1788#0" expanded="true" />
-                <element signature="e#1849#1850#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="-0.0">
+              <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
+      <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-15.625">
-              <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="notice.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
+      <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-16.875">
-              <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="OrderDataController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
+      <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
+              <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="OrderMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
+              <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
               <folding />
             </state>
           </provider>
@@ -151,10 +199,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceEnum.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
@@ -182,7 +226,6 @@
         <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentPageController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
@@ -199,9 +242,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
         <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
       </list>
     </option>
   </component>
@@ -312,6 +360,9 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -330,11 +381,120 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="mbg" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="doc" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="canrd-patent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="doc" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sql" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -821,57 +981,58 @@
       <workItem from="1469026864774" duration="4528000" />
       <workItem from="1469112269396" duration="6881000" />
       <workItem from="1469242140776" duration="1637000" />
-      <workItem from="1469243959439" duration="3683000" />
+      <workItem from="1469243959439" duration="8023000" />
+      <workItem from="1469259852751" duration="117000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="81538000" />
+    <option name="totallyTimeSpent" value="85995000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
-    <editor active="false" />
+    <frame x="1280" y="23" width="1920" height="1057" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.6507772" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46943006" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32435232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5316062" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31619936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10915868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.10915868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15601704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13951011" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32435232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46735752" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36580312" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24313408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -917,41 +1078,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="7.9166665">
-          <caret line="197" column="60" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1010,7 +1136,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.22900763">
           <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1050,14 +1175,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1079,27 +1196,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1135,14 +1231,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1155,7 +1243,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1163,7 +1250,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1171,15 +1257,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.2162921">
           <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8623595">
-          <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1187,9 +1264,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />
-          <folding>
-            <marker date="1469245798000" expanded="true" signature="-1:-1" placeholder="update order..." />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1197,23 +1272,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.111111">
           <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="41" column="26" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="51" column="46" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="46" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1221,7 +1279,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1229,7 +1286,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1237,7 +1293,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-16.25">
           <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1245,7 +1300,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-4.9562936">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1253,7 +1307,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.75">
           <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1261,22 +1314,75 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-16.875">
           <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2.jar!/META-INF/c.tld">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.625">
-          <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="108" column="16" selection-start-line="108" selection-start-column="16" selection-end-line="108" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
+          <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#325#326#0" expanded="true" />
+            <element signature="e#375#376#0" expanded="true" />
+            <element signature="e#415#416#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="162" column="21" selection-start-line="162" selection-start-column="21" selection-end-line="162" selection-end-column="21" />
+          <folding>
+            <element signature="e#10630#10631#0" expanded="true" />
+            <element signature="e#10690#10691#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
           <folding />
         </state>
       </provider>
@@ -1284,27 +1390,80 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
+          <caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1787#1788#0" expanded="true" />
-            <element signature="e#1849#1850#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-19.75">
+          <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+          <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="3.0097086">
-          <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -5,20 +5,34 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=&#39;TRADITIONAL,ALLOW_INVALID_DATES&#39;;
 ALTER SCHEMA `patent`  DEFAULT COLLATE utf8mb4_general_ci ;
 CREATE TABLE IF NOT EXISTS `patent`.`casement` (
-  `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT 'æ¡ˆä»¶ç®¡ç†è¡¨',
   `name` VARCHAR(32) NULL DEFAULT NULL,
   `caseSn` VARCHAR(32) NOT NULL,
   `case_type` VARCHAR(32) NOT NULL COMMENT 'å‘æ˜Žç±»åž‹ï¼šINVE' /* comment truncated */ /*TION_TYPE
 å®žç”¨æ–°åž‹ï¼šPRACTICAL_NEW
 å¤–è§‚è®¾è®¡ï¼šAPPEARENCE_DESIGN
 å‘æ˜Ž+æ–°åž‹ï¼šINVENTION_NEW*/,
+  `case_type_title` VARCHAR(32) NOT NULL,
   `service_type` VARCHAR(32) NOT NULL COMMENT 'æ ‡å‡†æœåŠ¡ï¼šSTANDE' /* comment truncated */ /*D_SERVICE
 æ‹…ä¿æŽˆæƒï¼šAUTHORITY_GUARANTEE*/,
+  `service_type_title` VARCHAR(32) NOT NULL,
   `paid_type` VARCHAR(32) NOT NULL COMMENT 'ç¼´çº³ï' /* comment truncated */ /*šPAID
 ä¸ç¼´çº³ï¼šNO_PAID*/,
+  `paid_type_title` VARCHAR(32) NOT NULL,
   `reduce_type` VARCHAR(32) NULL DEFAULT NULL,
+  `reduce_type_title` VARCHAR(32) NULL DEFAULT NULL,
   `expense` BIGINT(20) NOT NULL,
-  `formula` VARCHAR(128) NULL DEFAULT NULL COMMENT 'è®¡ç®—å…¬å¼',
+  `order_status` VARCHAR(32) NOT NULL COMMENT 'SUBMITED(å·²æ' /* comment truncated */ /*äº¤)
+PENDING(æ£åœ¨æ”¯ä»˜)
+PAID_SUCCESS(æ”¯ä»˜æˆåŠŸ)
+PAID_FAILURE(æ”¯ä»˜å¤±è´¥)*/,
+  `order_status_title` VARCHAR(32) NULL DEFAULT NULL,
+  `case_status` VARCHAR(32) NOT NULL COMMENT 'INIT(åˆå' /* comment truncated */ /*‹åŒ–)
+COMPLETED(å®Œæˆ)*/,
+  `case_status_title` VARCHAR(32) NULL DEFAULT NULL,
+  `member_id` VARCHAR(32) NOT NULL COMMENT 'ç™»é™†ID',
+  `create_date` DATETIME NOT NULL,
+  `update_date` DATETIME NOT NULL,
   PRIMARY KEY (`id`))
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4;
@@ -29,6 +43,25 @@ COLLATE = utf8mb4_general_ci ;
 ALTER TABLE `patent`.`mybatis_test` 
 COLLATE = utf8mb4_general_ci ;
+CREATE TABLE IF NOT EXISTS `patent`.`orders` (
+  `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+  `case_id` BIGINT(20) NOT NULL,
+  `quantity` BIGINT(20) NOT NULL,
+  `expense` BIGINT(20) NOT NULL,
+  `pay_type` VARCHAR(32) NOT NULL DEFAULT 'æ”¯ä»˜å®' COMMENT 'æ”¯ä»˜è¡¨',
+  `order_status` VARCHAR(32) NOT NULL COMMENT 'SUBMITED(å·²æ' /* comment truncated */ /*äº¤)
+PENDING(æ£åœ¨æ”¯ä»˜)
+PAID_SUCCESS(æ”¯ä»˜æˆåŠŸ)
+PAID_FAILURE(æ”¯ä»˜å¤±è´¥)*/,
+  `order_status_title` VARCHAR(32) NOT NULL,
+  `isCanceled` TINYINT(1) NOT NULL,
+  `member_id` VARCHAR(32) NOT NULL,
+  `create_date` DATETIME NOT NULL,
+  `update_date` DATETIME NOT NULL,
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4;
+
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
@@ -41,6 +41,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" />
@@ -103,6 +103,11 @@
 			<version>4.2.3.RELEASE</version>
 		</dependency>
 		<dependency>
+			<groupId>jstl</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
 			<version>3.3.0</version>
+package com.canrd.patent.dal.dto;
+
+import com.canrd.patent.dal.model.Casement;
+import com.canrd.patent.dal.model.Order;
+
+import java.util.List;
+
+/**
+ * Created by ouyangmao on 16/7/23.
+ */
+public class OrderListOutputDto extends Order{
+    Casement casement;
+
+    public Casement getCasement() {
+        return casement;
+    }
+
+    public void setCasement(Casement casement) {
+        this.casement = casement;
+    }
+}
@@ -37,6 +37,14 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column casement.case_type_title
+     *
+     * @mbggenerated
+     */
+    private String caseTypeTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column casement.service_type
      *
      * @mbggenerated
@@ -45,6 +53,14 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column casement.service_type_title
+     *
+     * @mbggenerated
+     */
+    private String serviceTypeTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column casement.paid_type
      *
      * @mbggenerated
@@ -53,6 +69,14 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column casement.paid_type_title
+     *
+     * @mbggenerated
+     */
+    private String paidTypeTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column casement.reduce_type
      *
      * @mbggenerated
@@ -61,6 +85,14 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column casement.reduce_type_title
+     *
+     * @mbggenerated
+     */
+    private String reduceTypeTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column casement.expense
      *
      * @mbggenerated
@@ -205,6 +237,30 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column casement.case_type_title
+     *
+     * @return the value of casement.case_type_title
+     *
+     * @mbggenerated
+     */
+    public String getCaseTypeTitle() {
+        return caseTypeTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column casement.case_type_title
+     *
+     * @param caseTypeTitle the value for casement.case_type_title
+     *
+     * @mbggenerated
+     */
+    public void setCaseTypeTitle(String caseTypeTitle) {
+        this.caseTypeTitle = caseTypeTitle == null ? null : caseTypeTitle.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column casement.service_type
      *
      * @return the value of casement.service_type
@@ -229,6 +285,30 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column casement.service_type_title
+     *
+     * @return the value of casement.service_type_title
+     *
+     * @mbggenerated
+     */
+    public String getServiceTypeTitle() {
+        return serviceTypeTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column casement.service_type_title
+     *
+     * @param serviceTypeTitle the value for casement.service_type_title
+     *
+     * @mbggenerated
+     */
+    public void setServiceTypeTitle(String serviceTypeTitle) {
+        this.serviceTypeTitle = serviceTypeTitle == null ? null : serviceTypeTitle.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column casement.paid_type
      *
      * @return the value of casement.paid_type
@@ -253,6 +333,30 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column casement.paid_type_title
+     *
+     * @return the value of casement.paid_type_title
+     *
+     * @mbggenerated
+     */
+    public String getPaidTypeTitle() {
+        return paidTypeTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column casement.paid_type_title
+     *
+     * @param paidTypeTitle the value for casement.paid_type_title
+     *
+     * @mbggenerated
+     */
+    public void setPaidTypeTitle(String paidTypeTitle) {
+        this.paidTypeTitle = paidTypeTitle == null ? null : paidTypeTitle.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column casement.reduce_type
      *
      * @return the value of casement.reduce_type
@@ -277,6 +381,30 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column casement.reduce_type_title
+     *
+     * @return the value of casement.reduce_type_title
+     *
+     * @mbggenerated
+     */
+    public String getReduceTypeTitle() {
+        return reduceTypeTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column casement.reduce_type_title
+     *
+     * @param reduceTypeTitle the value for casement.reduce_type_title
+     *
+     * @mbggenerated
+     */
+    public void setReduceTypeTitle(String reduceTypeTitle) {
+        this.reduceTypeTitle = reduceTypeTitle == null ? null : reduceTypeTitle.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column casement.expense
      *
      * @return the value of casement.expense
@@ -465,6 +465,76 @@ public class CasementExample {
             return (Criteria) this;
         }
+        public Criteria andCaseTypeTitleIsNull() {
+            addCriterion("case_type_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleIsNotNull() {
+            addCriterion("case_type_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleEqualTo(String value) {
+            addCriterion("case_type_title =", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleNotEqualTo(String value) {
+            addCriterion("case_type_title <>", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleGreaterThan(String value) {
+            addCriterion("case_type_title >", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("case_type_title >=", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleLessThan(String value) {
+            addCriterion("case_type_title <", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleLessThanOrEqualTo(String value) {
+            addCriterion("case_type_title <=", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleLike(String value) {
+            addCriterion("case_type_title like", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleNotLike(String value) {
+            addCriterion("case_type_title not like", value, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleIn(List<String> values) {
+            addCriterion("case_type_title in", values, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleNotIn(List<String> values) {
+            addCriterion("case_type_title not in", values, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleBetween(String value1, String value2) {
+            addCriterion("case_type_title between", value1, value2, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCaseTypeTitleNotBetween(String value1, String value2) {
+            addCriterion("case_type_title not between", value1, value2, "caseTypeTitle");
+            return (Criteria) this;
+        }
+
         public Criteria andServiceTypeIsNull() {
             addCriterion("service_type is null");
             return (Criteria) this;
@@ -535,6 +605,76 @@ public class CasementExample {
             return (Criteria) this;
         }
+        public Criteria andServiceTypeTitleIsNull() {
+            addCriterion("service_type_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleIsNotNull() {
+            addCriterion("service_type_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleEqualTo(String value) {
+            addCriterion("service_type_title =", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleNotEqualTo(String value) {
+            addCriterion("service_type_title <>", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleGreaterThan(String value) {
+            addCriterion("service_type_title >", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("service_type_title >=", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleLessThan(String value) {
+            addCriterion("service_type_title <", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleLessThanOrEqualTo(String value) {
+            addCriterion("service_type_title <=", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleLike(String value) {
+            addCriterion("service_type_title like", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleNotLike(String value) {
+            addCriterion("service_type_title not like", value, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleIn(List<String> values) {
+            addCriterion("service_type_title in", values, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleNotIn(List<String> values) {
+            addCriterion("service_type_title not in", values, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleBetween(String value1, String value2) {
+            addCriterion("service_type_title between", value1, value2, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceTypeTitleNotBetween(String value1, String value2) {
+            addCriterion("service_type_title not between", value1, value2, "serviceTypeTitle");
+            return (Criteria) this;
+        }
+
         public Criteria andPaidTypeIsNull() {
             addCriterion("paid_type is null");
             return (Criteria) this;
@@ -605,6 +745,76 @@ public class CasementExample {
             return (Criteria) this;
         }
+        public Criteria andPaidTypeTitleIsNull() {
+            addCriterion("paid_type_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleIsNotNull() {
+            addCriterion("paid_type_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleEqualTo(String value) {
+            addCriterion("paid_type_title =", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleNotEqualTo(String value) {
+            addCriterion("paid_type_title <>", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleGreaterThan(String value) {
+            addCriterion("paid_type_title >", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("paid_type_title >=", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleLessThan(String value) {
+            addCriterion("paid_type_title <", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleLessThanOrEqualTo(String value) {
+            addCriterion("paid_type_title <=", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleLike(String value) {
+            addCriterion("paid_type_title like", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleNotLike(String value) {
+            addCriterion("paid_type_title not like", value, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleIn(List<String> values) {
+            addCriterion("paid_type_title in", values, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleNotIn(List<String> values) {
+            addCriterion("paid_type_title not in", values, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleBetween(String value1, String value2) {
+            addCriterion("paid_type_title between", value1, value2, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaidTypeTitleNotBetween(String value1, String value2) {
+            addCriterion("paid_type_title not between", value1, value2, "paidTypeTitle");
+            return (Criteria) this;
+        }
+
         public Criteria andReduceTypeIsNull() {
             addCriterion("reduce_type is null");
             return (Criteria) this;
@@ -675,6 +885,76 @@ public class CasementExample {
             return (Criteria) this;
         }
+        public Criteria andReduceTypeTitleIsNull() {
+            addCriterion("reduce_type_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleIsNotNull() {
+            addCriterion("reduce_type_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleEqualTo(String value) {
+            addCriterion("reduce_type_title =", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleNotEqualTo(String value) {
+            addCriterion("reduce_type_title <>", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleGreaterThan(String value) {
+            addCriterion("reduce_type_title >", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("reduce_type_title >=", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleLessThan(String value) {
+            addCriterion("reduce_type_title <", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleLessThanOrEqualTo(String value) {
+            addCriterion("reduce_type_title <=", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleLike(String value) {
+            addCriterion("reduce_type_title like", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleNotLike(String value) {
+            addCriterion("reduce_type_title not like", value, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleIn(List<String> values) {
+            addCriterion("reduce_type_title in", values, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleNotIn(List<String> values) {
+            addCriterion("reduce_type_title not in", values, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleBetween(String value1, String value2) {
+            addCriterion("reduce_type_title between", value1, value2, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andReduceTypeTitleNotBetween(String value1, String value2) {
+            addCriterion("reduce_type_title not between", value1, value2, "reduceTypeTitle");
+            return (Criteria) this;
+        }
+
         public Criteria andExpenseIsNull() {
             addCriterion("expense is null");
             return (Criteria) this;
@@ -53,6 +53,14 @@ public class Order {
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column orders.isCanceled
+     *
+     * @mbggenerated
+     */
+    private Boolean iscanceled;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column orders.member_id
      *
      * @mbggenerated
@@ -221,6 +229,30 @@ public class Order {
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column orders.isCanceled
+     *
+     * @return the value of orders.isCanceled
+     *
+     * @mbggenerated
+     */
+    public Boolean getIscanceled() {
+        return iscanceled;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column orders.isCanceled
+     *
+     * @param iscanceled the value for orders.isCanceled
+     *
+     * @mbggenerated
+     */
+    public void setIscanceled(Boolean iscanceled) {
+        this.iscanceled = iscanceled;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column orders.member_id
      *
      * @return the value of orders.member_id
@@ -575,6 +575,66 @@ public class OrderExample {
             return (Criteria) this;
         }
+        public Criteria andIscanceledIsNull() {
+            addCriterion("isCanceled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledIsNotNull() {
+            addCriterion("isCanceled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledEqualTo(Boolean value) {
+            addCriterion("isCanceled =", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledNotEqualTo(Boolean value) {
+            addCriterion("isCanceled <>", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledGreaterThan(Boolean value) {
+            addCriterion("isCanceled >", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("isCanceled >=", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledLessThan(Boolean value) {
+            addCriterion("isCanceled <", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledLessThanOrEqualTo(Boolean value) {
+            addCriterion("isCanceled <=", value, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledIn(List<Boolean> values) {
+            addCriterion("isCanceled in", values, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledNotIn(List<Boolean> values) {
+            addCriterion("isCanceled not in", values, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledBetween(Boolean value1, Boolean value2) {
+            addCriterion("isCanceled between", value1, value2, "iscanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIscanceledNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("isCanceled not between", value1, value2, "iscanceled");
+            return (Criteria) this;
+        }
+
         public Criteria andMemberIdIsNull() {
             addCriterion("member_id is null");
             return (Criteria) this;
@@ -40,10 +40,14 @@ public class CaseHandlingService {
         if(StringUtils.isEmpty(preCasement)) {
             Casement casement = new Casement();
             casement.setCaseType(caseTypeEnum.name());
+            casement.setCaseTypeTitle(caseTypeEnum.getTitle());
             casement.setCasesn(generatorCaseSn());
             casement.setServiceType(serviceTypeEnum.name());
+            casement.setServiceTypeTitle(serviceTypeEnum.getTitle());
             casement.setPaidType(paidTypeEnum.name());
+            casement.setPaidTypeTitle(paidTypeEnum.getTitle());
             casement.setReduceType(reduceTypeEnum != null ? reduceTypeEnum.name() : null);
+            casement.setReduceTypeTitle(reduceTypeEnum != null ? reduceTypeEnum.getTitle() : null);
             casement.setExpense(expense);
             casement.setOrderStatus(OrderStatusEnum.SUBMITED.name());
             casement.setCaseStatus(CaseStatusEnum.INIT.name());
@@ -158,4 +158,13 @@ public class CasementService {
         reduceType.setDescription(reduceTypeEnum.getDescription());
         return reduceType;
     }
+
+    /***
+     * 根据id查询casement
+     * @param id
+     * @return
+     */
+    public Casement findById(Long id){
+        return casementMapper.selectByPrimaryKey(id);
+    }
 }
@@ -37,6 +37,7 @@ public class OrderService {
         order.setExpense(expense);
         order.setPayType("支付宝");
         order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
+        order.setIscanceled(false);
         order.setMemberId(memberId);
         order.setCreateDate(new Date());
         order.setUpdateDate(new Date());
@@ -77,6 +78,7 @@ public class OrderService {
         OrderExample orderExample = new OrderExample();
         OrderExample.Criteria criteria = orderExample.createCriteria();
         criteria.andMemberIdEqualTo(memberId);
+        criteria.andIscanceledEqualTo(false);
         return orderMapper.selectByExample(orderExample);
     }
 }
 package com.canrd.patent.web;
+import com.canrd.patent.dal.dto.OrderListOutputDto;
 import com.canrd.patent.dal.enums.OrderStatusEnum;
+import com.canrd.patent.dal.model.Casement;
 import com.canrd.patent.dal.model.Order;
+import com.canrd.patent.service.CasementService;
 import com.canrd.patent.service.OrderService;
+import com.google.common.collect.Lists;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +24,8 @@ import java.util.List;
 public class OrderPageController {
     @Resource
     private OrderService orderService;
+    @Resource
+    private CasementService casementService;
     /***
      * 保存订单并跳转到支付宝进行支付
      * @return
@@ -27,17 +33,17 @@ public class OrderPageController {
     @RequestMapping(value="/save_order")
     public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
         //判断是否已经存在同样的订单，如果存在，则提醒用户并且数量+1即可
-        orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
+        Order order = orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
         //跳转到支付宝
         //暂时直接跳转到支付成功的页面
-        response.sendRedirect("http://localhost:8081/notity_result?orderId=xxxxorderIdxxxx&paymentResult=xxxxSUCCESStxxxx&totalAmount=10000000");
+        response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+expense);
     }
     @RequestMapping(value="/notify_result")
     public ModelAndView notifyResult(String orderId,String paymentResult,Long totalAmount){
         System.out.println("orderId:"+orderId+",paymentResult:"+paymentResult+",totalAmount:"+totalAmount);
-        if("success".equals(paymentResult)){
+        if("success".toUpperCase().equals(paymentResult)){
             //更新支付成功
             orderService.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.PAID_SUCCESS.name());
         }else{
@@ -74,10 +80,17 @@ public class OrderPageController {
      */
     @RequestMapping(value="/query_order_list")
     public ModelAndView queryOrderList(){
-        List<Order> order = orderService.findByOrderList(IndexController.MEMBER_ID);
+        List<OrderListOutputDto> orderListOutputDtoList = Lists.newArrayList();
+        List<Order> orderList = orderService.findByOrderList(IndexController.MEMBER_ID);
+        for(Order order:orderList){
+            OrderListOutputDto orderListOutputDto = new OrderListOutputDto();
+            Casement casement = casementService.findById(order.getCaseId());
+            orderListOutputDto.setCasement(casement);
+            orderListOutputDtoList.add(orderListOutputDto);
+        }
         ModelAndView modelAndView = new ModelAndView();
-        modelAndView.addObject("order",order);
-        modelAndView.setViewName("/order_detail");
+        modelAndView.addObject("orderListOutputDtoList",orderListOutputDtoList);
+        modelAndView.setViewName("/case_manage");
         return modelAndView;
     }
 }
@@ -10,9 +10,13 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
     <result column="case_type" jdbcType="VARCHAR" property="caseType" />
+    <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
     <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
     <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
+    <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
     <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
+    <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
     <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
@@ -91,8 +95,9 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status, 
-    case_status, member_id, create_date, update_date
+    id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type, 
+    paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status, 
+    member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
     <!--
@@ -149,15 +154,17 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into casement (name, caseSn, case_type, 
-      service_type, paid_type, reduce_type, 
-      expense, order_status, case_status, 
-      member_id, create_date, update_date
-      )
+      case_type_title, service_type, service_type_title, 
+      paid_type, paid_type_title, reduce_type, 
+      reduce_type_title, expense, order_status, 
+      case_status, member_id, create_date, 
+      update_date)
     values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
-      #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR}, 
+      #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
+      #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, 
+      #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -178,15 +185,27 @@
       <if test="caseType != null">
         case_type,
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title,
+      </if>
       <if test="serviceType != null">
         service_type,
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title,
+      </if>
       <if test="paidType != null">
         paid_type,
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title,
+      </if>
       <if test="reduceType != null">
         reduce_type,
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title,
+      </if>
       <if test="expense != null">
         expense,
       </if>
@@ -216,15 +235,27 @@
       <if test="caseType != null">
         #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         #{expense,jdbcType=BIGINT},
       </if>
@@ -274,15 +305,27 @@
       <if test="record.caseType != null">
         case_type = #{record.caseType,jdbcType=VARCHAR},
       </if>
+      <if test="record.caseTypeTitle != null">
+        case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.serviceType != null">
         service_type = #{record.serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.serviceTypeTitle != null">
+        service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.paidType != null">
         paid_type = #{record.paidType,jdbcType=VARCHAR},
       </if>
+      <if test="record.paidTypeTitle != null">
+        paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.reduceType != null">
         reduce_type = #{record.reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.reduceTypeTitle != null">
+        reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.expense != null">
         expense = #{record.expense,jdbcType=BIGINT},
       </if>
@@ -316,9 +359,13 @@
       name = #{record.name,jdbcType=VARCHAR},
       caseSn = #{record.casesn,jdbcType=VARCHAR},
       case_type = #{record.caseType,jdbcType=VARCHAR},
+      case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{record.serviceType,jdbcType=VARCHAR},
+      service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{record.paidType,jdbcType=VARCHAR},
+      paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{record.reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{record.expense,jdbcType=BIGINT},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
       case_status = #{record.caseStatus,jdbcType=VARCHAR},
@@ -345,15 +392,27 @@
       <if test="caseType != null">
         case_type = #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         service_type = #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         paid_type = #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         reduce_type = #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         expense = #{expense,jdbcType=BIGINT},
       </if>
@@ -384,9 +443,13 @@
     set name = #{name,jdbcType=VARCHAR},
       caseSn = #{casesn,jdbcType=VARCHAR},
       case_type = #{caseType,jdbcType=VARCHAR},
+      case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{serviceType,jdbcType=VARCHAR},
+      service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{paidType,jdbcType=VARCHAR},
+      paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{expense,jdbcType=BIGINT},
       order_status = #{orderStatus,jdbcType=VARCHAR},
       case_status = #{caseStatus,jdbcType=VARCHAR},
@@ -12,6 +12,7 @@
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="pay_type" jdbcType="VARCHAR" property="payType" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
+    <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
     <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
@@ -87,7 +88,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
+    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
+    update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -144,11 +146,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, member_id, 
-      create_date, update_date)
+      pay_type, order_status, isCanceled, 
+      member_id, create_date, update_date
+      )
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
+      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
     <!--
@@ -175,6 +179,9 @@
       <if test="orderStatus != null">
         order_status,
       </if>
+      <if test="iscanceled != null">
+        isCanceled,
+      </if>
       <if test="memberId != null">
         member_id,
       </if>
@@ -201,6 +208,9 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
       </if>
@@ -247,6 +257,9 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.iscanceled != null">
+        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
       </if>
@@ -273,6 +286,7 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{record.iscanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -302,6 +316,9 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        isCanceled = #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
       </if>
@@ -325,6 +342,7 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{iscanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html lang="en">
 <head>
@@ -85,52 +86,63 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr>
-                            <td class="td-width-210">
-                                <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
-                                <div><span>暂无名称</span></div>
-                            </td>
-                            <td class="td-width-120">
-                                GG1603754CA
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>标准服务</span>
-                                </div>
-                                <div>
-                                    <span>官费暂不缴纳</span>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">取消案件</a>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <span>3800</span>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>未支付</span>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">未支付</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:">订单详情</a>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr class="case-list-item-bottom-tr">
-                            <td colspan="6">
-                                <span>合同号：<span>466686664696562</span></span>
-                                <span>立案时间：<span>2016-05-13 22:40:53</span></span>
-                                <span class="color-ff6642 delete-btn">删除</span>
-                            </td>
-                        </tr>
+                        <c:forEach items="${orderListOutputDtoList}" var="order">
+                            <tr>
+                                <td class="td-width-210">
+                                    <div class="case-type"><span>案件类型：</span><span>${order.casement.caseTypeTile}</span></div>
+                                    <div><span>
+                                        <c:choose>
+                                            <c:when test="${order.casement.name!=null}">
+                                                ${order.casement.name}
+                                            </c:when>
+                                            <c:otherwise>
+                                                暂无名称
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </span></div>
+                                </td>
+                                <td class="td-width-120">
+                                        ${order.casement.caseSn}
+                                </td>
+                                <td class="td-width-120">
+                                    <div>
+                                        <span>${order.casement.serviceTypeTile}</span>
+                                    </div>
+                                    <div>
+                                        <span>${order.casement.paidTypeTile}</span>
+                                    </div>
+                                </td>
+                                <td class="td-width-120">
+                                    <div>
+                                        <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
+                                    </div>
+                                    <div>
+                                        <a href="javascript:" class="color-ff6642">取消案件</a>
+                                    </div>
+                                </td>
+                                <td class="td-width-120">
+                                    <span>${order.expense}</span>
+                                </td>
+                                <td class="td-width-120">
+                                    <div>
+                                        <span>未支付</span>
+                                    </div>
+                                    <div>
+                                        <a href="javascript:" class="color-ff6642">未支付</a>
+                                    </div>
+                                    <div>
+                                        <a href="javascript:">订单详情</a>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr class="case-list-item-bottom-tr">
+                                <td colspan="6">
+                                    <span>合同号：<span>466686664696562</span></span>
+                                    <span>立案时间：<span>2016-05-13 22:40:53</span></span>
+                                    <span class="color-ff6642 delete-btn">删除</span>
+                                </td>
+                            </tr>
+                        </c:forEach>
                         <tr>
                             <td class="td-width-210">
                                 <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
@@ -29,6 +29,7 @@
        <p>支付金额: ${totalAmount}</p>
        <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
        <p><a href="/case_detail.jsp">案件详情</a></p>
+       <p><a href="/query_order_list">案件管理</a></p>
     </div>
 </div>
@@ -10,9 +10,13 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
     <result column="case_type" jdbcType="VARCHAR" property="caseType" />
+    <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
     <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
     <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
+    <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
     <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
+    <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
     <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
@@ -91,8 +95,9 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status, 
-    case_status, member_id, create_date, update_date
+    id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type, 
+    paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status, 
+    member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
     <!--
@@ -149,15 +154,17 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into casement (name, caseSn, case_type, 
-      service_type, paid_type, reduce_type, 
-      expense, order_status, case_status, 
-      member_id, create_date, update_date
-      )
+      case_type_title, service_type, service_type_title, 
+      paid_type, paid_type_title, reduce_type, 
+      reduce_type_title, expense, order_status, 
+      case_status, member_id, create_date, 
+      update_date)
     values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
-      #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR}, 
+      #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
+      #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, 
+      #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -178,15 +185,27 @@
       <if test="caseType != null">
         case_type,
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title,
+      </if>
       <if test="serviceType != null">
         service_type,
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title,
+      </if>
       <if test="paidType != null">
         paid_type,
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title,
+      </if>
       <if test="reduceType != null">
         reduce_type,
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title,
+      </if>
       <if test="expense != null">
         expense,
       </if>
@@ -216,15 +235,27 @@
       <if test="caseType != null">
         #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         #{expense,jdbcType=BIGINT},
       </if>
@@ -274,15 +305,27 @@
       <if test="record.caseType != null">
         case_type = #{record.caseType,jdbcType=VARCHAR},
       </if>
+      <if test="record.caseTypeTitle != null">
+        case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.serviceType != null">
         service_type = #{record.serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.serviceTypeTitle != null">
+        service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.paidType != null">
         paid_type = #{record.paidType,jdbcType=VARCHAR},
       </if>
+      <if test="record.paidTypeTitle != null">
+        paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.reduceType != null">
         reduce_type = #{record.reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.reduceTypeTitle != null">
+        reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.expense != null">
         expense = #{record.expense,jdbcType=BIGINT},
       </if>
@@ -316,9 +359,13 @@
       name = #{record.name,jdbcType=VARCHAR},
       caseSn = #{record.casesn,jdbcType=VARCHAR},
       case_type = #{record.caseType,jdbcType=VARCHAR},
+      case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{record.serviceType,jdbcType=VARCHAR},
+      service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{record.paidType,jdbcType=VARCHAR},
+      paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{record.reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{record.expense,jdbcType=BIGINT},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
       case_status = #{record.caseStatus,jdbcType=VARCHAR},
@@ -345,15 +392,27 @@
       <if test="caseType != null">
         case_type = #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         service_type = #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         paid_type = #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         reduce_type = #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         expense = #{expense,jdbcType=BIGINT},
       </if>
@@ -384,9 +443,13 @@
     set name = #{name,jdbcType=VARCHAR},
       caseSn = #{casesn,jdbcType=VARCHAR},
       case_type = #{caseType,jdbcType=VARCHAR},
+      case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{serviceType,jdbcType=VARCHAR},
+      service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{paidType,jdbcType=VARCHAR},
+      paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{expense,jdbcType=BIGINT},
       order_status = #{orderStatus,jdbcType=VARCHAR},
       case_status = #{caseStatus,jdbcType=VARCHAR},
@@ -12,6 +12,7 @@
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="pay_type" jdbcType="VARCHAR" property="payType" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
+    <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
     <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
@@ -87,7 +88,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
+    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
+    update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -144,11 +146,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, member_id, 
-      create_date, update_date)
+      pay_type, order_status, isCanceled, 
+      member_id, create_date, update_date
+      )
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
+      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
     <!--
@@ -175,6 +179,9 @@
       <if test="orderStatus != null">
         order_status,
       </if>
+      <if test="iscanceled != null">
+        isCanceled,
+      </if>
       <if test="memberId != null">
         member_id,
       </if>
@@ -201,6 +208,9 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
       </if>
@@ -247,6 +257,9 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.iscanceled != null">
+        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
       </if>
@@ -273,6 +286,7 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{record.iscanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -302,6 +316,9 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        isCanceled = #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
       </if>
@@ -325,6 +342,7 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{iscanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
@@ -10,9 +10,13 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
     <result column="case_type" jdbcType="VARCHAR" property="caseType" />
+    <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
     <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
     <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
+    <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
     <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
+    <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
     <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
@@ -91,8 +95,9 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status, 
-    case_status, member_id, create_date, update_date
+    id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type, 
+    paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status, 
+    member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
     <!--
@@ -149,15 +154,17 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into casement (name, caseSn, case_type, 
-      service_type, paid_type, reduce_type, 
-      expense, order_status, case_status, 
-      member_id, create_date, update_date
-      )
+      case_type_title, service_type, service_type_title, 
+      paid_type, paid_type_title, reduce_type, 
+      reduce_type_title, expense, order_status, 
+      case_status, member_id, create_date, 
+      update_date)
     values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
-      #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR}, 
+      #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, 
+      #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, 
+      #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -178,15 +185,27 @@
       <if test="caseType != null">
         case_type,
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title,
+      </if>
       <if test="serviceType != null">
         service_type,
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title,
+      </if>
       <if test="paidType != null">
         paid_type,
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title,
+      </if>
       <if test="reduceType != null">
         reduce_type,
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title,
+      </if>
       <if test="expense != null">
         expense,
       </if>
@@ -216,15 +235,27 @@
       <if test="caseType != null">
         #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         #{expense,jdbcType=BIGINT},
       </if>
@@ -274,15 +305,27 @@
       <if test="record.caseType != null">
         case_type = #{record.caseType,jdbcType=VARCHAR},
       </if>
+      <if test="record.caseTypeTitle != null">
+        case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.serviceType != null">
         service_type = #{record.serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.serviceTypeTitle != null">
+        service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.paidType != null">
         paid_type = #{record.paidType,jdbcType=VARCHAR},
       </if>
+      <if test="record.paidTypeTitle != null">
+        paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.reduceType != null">
         reduce_type = #{record.reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="record.reduceTypeTitle != null">
+        reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="record.expense != null">
         expense = #{record.expense,jdbcType=BIGINT},
       </if>
@@ -316,9 +359,13 @@
       name = #{record.name,jdbcType=VARCHAR},
       caseSn = #{record.casesn,jdbcType=VARCHAR},
       case_type = #{record.caseType,jdbcType=VARCHAR},
+      case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{record.serviceType,jdbcType=VARCHAR},
+      service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{record.paidType,jdbcType=VARCHAR},
+      paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{record.reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{record.expense,jdbcType=BIGINT},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
       case_status = #{record.caseStatus,jdbcType=VARCHAR},
@@ -345,15 +392,27 @@
       <if test="caseType != null">
         case_type = #{caseType,jdbcType=VARCHAR},
       </if>
+      <if test="caseTypeTitle != null">
+        case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="serviceType != null">
         service_type = #{serviceType,jdbcType=VARCHAR},
       </if>
+      <if test="serviceTypeTitle != null">
+        service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="paidType != null">
         paid_type = #{paidType,jdbcType=VARCHAR},
       </if>
+      <if test="paidTypeTitle != null">
+        paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="reduceType != null">
         reduce_type = #{reduceType,jdbcType=VARCHAR},
       </if>
+      <if test="reduceTypeTitle != null">
+        reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
+      </if>
       <if test="expense != null">
         expense = #{expense,jdbcType=BIGINT},
       </if>
@@ -384,9 +443,13 @@
     set name = #{name,jdbcType=VARCHAR},
       caseSn = #{casesn,jdbcType=VARCHAR},
       case_type = #{caseType,jdbcType=VARCHAR},
+      case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
       service_type = #{serviceType,jdbcType=VARCHAR},
+      service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
       paid_type = #{paidType,jdbcType=VARCHAR},
+      paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
       reduce_type = #{reduceType,jdbcType=VARCHAR},
+      reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
       expense = #{expense,jdbcType=BIGINT},
       order_status = #{orderStatus,jdbcType=VARCHAR},
       case_status = #{caseStatus,jdbcType=VARCHAR},
@@ -12,6 +12,7 @@
     <result column="expense" jdbcType="BIGINT" property="expense" />
     <result column="pay_type" jdbcType="VARCHAR" property="payType" />
     <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
+    <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
     <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
@@ -87,7 +88,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
+    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
+    update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -144,11 +146,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, member_id, 
-      create_date, update_date)
+      pay_type, order_status, isCanceled, 
+      member_id, create_date, update_date
+      )
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
+      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
     <!--
@@ -175,6 +179,9 @@
       <if test="orderStatus != null">
         order_status,
       </if>
+      <if test="iscanceled != null">
+        isCanceled,
+      </if>
       <if test="memberId != null">
         member_id,
       </if>
@@ -201,6 +208,9 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
       </if>
@@ -247,6 +257,9 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.iscanceled != null">
+        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
       </if>
@@ -273,6 +286,7 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{record.iscanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -302,6 +316,9 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
+      <if test="iscanceled != null">
+        isCanceled = #{iscanceled,jdbcType=BIT},
+      </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
       </if>
@@ -325,6 +342,7 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
+      isCanceled = #{iscanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>科路得</title>
-    <link rel="stylesheet" type="text/css" href="/css/case-detail.css">
-</head>
-
-<body>
-<jsp:include page="/include/header.jsp" flush="true"/>
-
-<div class="case-manage-wrap">
-    <div class="content">
-        <div class="location-wrap">
-            <span>个人中心</span>
-            <i class="row-right"></i>
-            <i class="row-right"></i>
-            <span class="current">案件管理</span>
-        </div>
-        <div class="main-wrap">
-            <div class="side-nav">
-                <!-- user-side-bar.html -->
-                <div class="user-side-bar">
-                    <div class="user-info">
-                        <div class="head-ico"></div>
-                        <p class="user-phone">18354206939</p>
-
-                        <div class="edit-btn">编辑</div>
-                    </div>
-                    <ul>
-                        <li data-nav-type="my-cases">我的案件</li>
-                        <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>
-                        <li>案件管理</li>
-                    </ul>
-                </div>
-            </div>
-            <div class="case-detail-wrap">
-                <div class="case-status-wrap">
-                    <div class="case-section-wrap">
-                        <span class="register-section  current-status-ico ">立案阶段</span>
-                        <span class="write-section normal-status-ico ">撰写阶段</span>
-                        <span class="law-section normal-status-ico">法律状态</span>
-                    </div>
-                    <div class="register-section-status section-status">
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>下单</span></div>
-                        </div>
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>确认立案</span></div>
-                        </div>
-                        <div class="status-item arrive notice">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc">
-                                <span>付款</span>
-
-                                <p class="non-pay"><span class="help-ico"></span><span>未付款</span></p>
-                            </div>
-                        </div>
-                        <div class="status-item">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                            </div>
-                            <div class="status-desc"><span>确认立案信息</span></div>
-                        </div>
-                    </div>
-                    <div class="write-section-status hidden section-status">
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>分配资深代理人</span></div>
-                        </div>
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>确认技术交底书</span></div>
-                        </div>
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>技术查新</span></div>
-                        </div>
-                        <div class="status-item arrive go-over">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>资深代理人撰写</span></div>
-                        </div>
-                        <div class="status-item arrive">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                                <div class="half-status-desc right"></div>
-                            </div>
-                            <div class="status-desc"><span>确认申请文书</span></div>
-                        </div>
-                        <div class="status-item">
-                            <div class="dot"></div>
-                            <div>
-                                <div class="half-status-desc left"></div>
-                            </div>
-                            <div class="status-desc"><span>递交国知局</span></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="case-detail-type-wrap">
-                    <div class="detail-type-title-wrap">
-                        <span class="current-selected" id="server-name">服务名称</span>
-                        <span id="write-info">著录信息</span>
-                        <span id="user-files">我的文件</span>
-                        <span id="canrd-files">Canrd 文件</span>
-                        <span id="org-files">主管部门文件</span>
-                    </div>
-                    <div class="detail-type-content">
-                        <div class="server-name-content">
-                            <p class="notice">注：请尽快完善您的案件信息，否则会影响您的专利申请进展。</p>
-
-                            <div class="content-item">
-                                <h3>基本信息</h3>
-
-                                <div>
-                                    <p>案件编号:<span class="case-num">GG1603754CA</span></p>
-
-                                    <p>立案时间:<span class="created-time">2016-05-13 22:40:53</span></p>
-                                </div>
-                            </div>
-                            <div class="content-item">
-                                <h3>客户要求</h3>
-
-                                <form class="content-form">
-                                    <div>
-                                            <span class="width-100">
-                                                <label for=""><strong class="must-ico">*</strong>专利名称:</label>
-                                            </span>
-                                        <input type="text" placeholder="请输入专利名称">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for="">专利类型:</label>
-                                            </span>
-                                        <input type="text" value="专利类型" hidden>
-                                        <span class="btn-label">发明类型</span>
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for=""><strong class="must-ico">*</strong>技术领域:</label>
-                                            </span>
-                                        <input type="text" placeholder="选择技术领域">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for=""><strong class="must-ico">*</strong>第一申请人:</label>
-                                            </span>
-                                        <input type="text">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for="">其他申请人:</label>
-                                            </span>
-                                        <input type="text">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for=""><strong class="must-ico">*</strong>第一发明人:</label>
-                                            </span>
-                                        <input type="text">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for="">其他发明人:</label>
-                                            </span>
-                                        <input type="text">
-                                    </div>
-                                    <div>
-                                            <span class="width-100">
-                                                <label for=""><strong class="must-ico">*</strong>技术联系人:</label>
-                                            </span>
-                                        <input type="text">
-                                    </div>
-                                    <div class="marginLeft-200">
-                                        <div class="present-req">
-                                            <span><input type="checkbox" name=""
-                                                         class="checkbox"><label>申请递交实质审查请求</label></span>
-                                            <span><input type="checkbox" name=""><label>费用减缓</label> <a
-                                                    href="javascript:" class="help-ico"></a></span>
-                                            <span><input type="checkbox" name=""><label>提前公开</label> <a
-                                                    href="javascript:" class="help-ico"></a></span>
-                                        </div>
-                                    </div>
-                                    <p class="spec-state">特殊申明：申请日之前6个月内，以下列形式公开的情况<a href="javascript:"
-                                                                                      class="declare-notice">不丧失新颖性</a>
-                                        <a href="javascript:" class="help-ico"></a>
-                                    </p>
-
-                                    <div class="marginLeft-200">
-                                        <div>
-                                                <span>
-                                                    <input type="checkbox" name="">
-                                                    <label>在中国政府主办或者承认的国际展览会上第一次展出的发明创造。</label>
-                                                </span>
-                                        </div>
-                                        <div>
-                                                <span>
-                                                    <input type="checkbox" name="">
-                                                    <label>他人未经申请人同意而泄露其内容的情况是指发生非法滥用权力和剽窃他人发明创造的行为。</label>
-                                                </span>
-                                        </div>
-                                    </div>
-                                    <div>
-                                        <span class="submit-btn">提交</span>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<jsp:include page="/include/footer.jsp" flush="true"/>
-<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
-</body>
-
-</html>
 \ No newline at end of file
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>科路得</title>
-    <link rel="stylesheet" type="text/css" href="/css/case-manage.css">
-</head>
-
-<body>
-<jsp:include page="/include/header.jsp" flush="true"/>
-
-<div class="case-manage-wrap">
-    <div class="content">
-        <div class="location-wrap">
-            <span>个人中心</span>
-            <i class="row-right"></i>
-            <i class="row-right"></i>
-            <span class="current">案件管理</span>
-        </div>
-        <div class="main-wrap">
-            <div class="side-nav">
-                <!-- user-side-bar.html -->
-                <div class="user-side-bar">
-                    <div class="user-info">
-                        <div class="head-ico"></div>
-                        <p class="user-phone">18354206939</p>
-
-                        <div class="edit-btn">编辑</div>
-                    </div>
-                    <ul>
-                        <li data-nav-type="my-cases">我的案件</li>
-                        <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>
-                        <li>案件管理</li>
-                    </ul>
-                </div>
-            </div>
-            <div class="my-case">
-                <div class="case-statistics">
-                    <p>
-                        <span>全部案件(<a herf="javascript:void(0)" class="case-number all-case">6</a>)</span>
-                        <span>专利(<a herf="javascript:void(0)" class="case-number patent-case">6</a>)</span></p>
-                </div>
-                <div class="case-query">
-                    <form>
-                        <div class="search-box">
-                                <span>
-                                    <input type="text" name="search-box" placeholder="请输入案件编号/名称">
-                                </span>
-
-                            <div class="query-icon search-ico"></div>
-                        </div>
-                        <div class="start-time">
-                                <span>
-                                    <input type="text" name="start-time" placeholder="起止时间：">
-                                </span>
-
-                            <div class="query-icon calendar-ico"></div>
-                        </div>
-                        <div class="end-time">
-                                <span>
-                                    <input type="text" name="end-time" placeholder="至：">
-                                </span>
-
-                            <div class="query-icon calendar-ico"></div>
-                        </div>
-                        <div class="deal-status">
-                            <select>
-                                <option value="已下单">已下单</option>
-                                <option value="未支付">未支付</option>
-                                <option value="完成">完成</option>
-                            </select>
-                        </div>
-                    </form>
-                </div>
-                <div class="case-list">
-                    <table>
-                        <thead>
-                        <tr class="table-head">
-                            <th>服务名称</th>
-                            <th>案件编号</th>
-                            <th>服务信息</th>
-                            <th>业务操作</th>
-                            <th>费用(元)</th>
-                            <th>交易状态</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                            <td class="td-width-210">
-                                <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
-                                <div><span>暂无名称</span></div>
-                            </td>
-                            <td class="td-width-120">
-                                GG1603754CA
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>标准服务</span>
-                                </div>
-                                <div>
-                                    <span>官费暂不缴纳</span>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">取消案件</a>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <span>3800</span>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>未支付</span>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">未支付</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:">订单详情</a>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr class="case-list-item-bottom-tr">
-                            <td colspan="6">
-                                <span>合同号：<span>466686664696562</span></span>
-                                <span>立案时间：<span>2016-05-13 22:40:53</span></span>
-                                <span class="color-ff6642 delete-btn">删除</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="td-width-210">
-                                <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
-                                <div><span>暂无名称</span></div>
-                            </td>
-                            <td class="td-width-120">
-                                GG1603754CA
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>标准服务</span>
-                                </div>
-                                <div>
-                                    <span>官费暂不缴纳</span>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">取消案件</a>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <span>3800</span>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>未支付</span>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">未支付</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:">订单详情</a>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr class="case-list-item-bottom-tr">
-                            <td colspan="6">
-                                <span>合同号：<span>466686664696562</span></span>
-                                <span>立案时间：<span>2016-05-13 22:40:53</span></span>
-                                <span class="color-ff6642 delete-btn">删除</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="td-width-210">
-                                <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
-                                <div><span>暂无名称</span></div>
-                            </td>
-                            <td class="td-width-120">
-                                GG1603754CA
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>标准服务</span>
-                                </div>
-                                <div>
-                                    <span>官费暂不缴纳</span>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">取消案件</a>
-                                </div>
-                            </td>
-                            <td class="td-width-120">
-                                <span>3800</span>
-                            </td>
-                            <td class="td-width-120">
-                                <div>
-                                    <span>未支付</span>
-                                </div>
-                                <div>
-                                    <a href="javascript:" class="color-ff6642">未支付</a>
-                                </div>
-                                <div>
-                                    <a href="javascript:">订单详情</a>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr class="case-list-item-bottom-tr">
-                            <td colspan="6">
-                                <span>合同号：<span>466686664696562</span></span>
-                                <span>立案时间：<span>2016-05-13 22:40:53</span></span>
-                                <span class="color-ff6642 delete-btn">删除</span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<jsp:include page="/include/footer.jsp" flush="true"/>
-<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
-</body>
-</html>
@@ -28,7 +28,8 @@
        <p>支付结果: ${paymentResult}</p>
        <p>支付金额: ${totalAmount}</p>
        <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
-       <p><a href="/notice.jsp">案件详情</a></p>
+       <p><a href="/case_detail.jsp">案件详情</a></p>
+       <p><a href="/query_order_list">案件管理</a></p>
     </div>
 </div>