整体运转流程

maoyangou
1 parent 01a7d9c3
Showing 49 changed files with 1150 additions and 1385 deletions
.idea/workspace.xml
doc/patent.mwb
doc/patent.mwb.bak
src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java
src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java
src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.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/OrderService.java
src/main/java/com/canrd/patent/web/CasementPageController.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
src/main/webapp/pay.jsp
target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class
target/classes/com/canrd/patent/dal/model/Casement.class
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
       <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/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.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" />
@@ -17,8 +15,8 @@
       <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/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.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" />
@@ -32,26 +30,24 @@
       <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/dto/CaseOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.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/web/CasementPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.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/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.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$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="patent.iws" />
@@ -79,48 +75,58 @@
         <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="0.0">
-              <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
+              <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="OrderListOutputDto.java" pinned="false" current-in-tab="false">
+        <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="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-              <folding />
+              <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
+              <folding>
+                <element signature="e#415#416#0" expanded="true" />
+                <element signature="e#465#466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="CaseOutputDto.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.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 />
+              <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
           <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" />
+            <state vertical-scroll-proportion="1.2269231">
+              <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>
       </file>
-      <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">
+      <file leaf-file-name="OrderOutputDto.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.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 />
+              <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+              <folding>
+                <element signature="e#257#258#0" expanded="true" />
+                <element signature="e#293#294#0" expanded="true" />
+                <element signature="e#358#359#0" expanded="true" />
+                <element signature="e#408#409#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,48 +134,28 @@
       <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="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
+            <state vertical-scroll-proportion="-31.041666">
+              <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
+      <file leaf-file-name="case_detail.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
+            <state vertical-scroll-proportion="80.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="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="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="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="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="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+      <file leaf-file-name="ReduceTypeEnum.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
+              <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -199,6 +185,7 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <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" />
@@ -214,12 +201,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
@@ -231,25 +216,26 @@
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/pay-result.jsp" />
         <option value="$PROJECT_DIR$/src/main/webapp/error.jsp" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
         <option value="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
         <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
         <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/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/dal/model/Casement.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
         <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
       </list>
     </option>
   </component>
@@ -332,10 +318,9 @@
     <order />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1280" />
     <option name="y" value="23" />
-    <option name="width" value="1920" />
-    <option name="height" value="1057" />
+    <option name="width" value="1280" />
+    <option name="height" value="732" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -361,7 +346,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -394,14 +378,6 @@
               <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>
@@ -417,84 +393,13 @@
               <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="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -981,42 +886,42 @@
       <workItem from="1469026864774" duration="4528000" />
       <workItem from="1469112269396" duration="6881000" />
       <workItem from="1469242140776" duration="1637000" />
-      <workItem from="1469243959439" duration="8023000" />
-      <workItem from="1469259852751" duration="117000" />
+      <workItem from="1469243959439" duration="3683000" />
+      <workItem from="1469260205882" duration="7362000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="85995000" />
+    <option name="totallyTimeSpent" value="88900000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1280" y="23" width="1920" height="1057" extended-state="0" />
-    <editor active="true" />
+    <frame x="0" y="23" width="1280" height="732" extended-state="6" />
+    <editor active="false" />
     <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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.375" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" 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="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="true" weight="0.5125" 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.44974095" 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="false" 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="true" weight="0.11793215" 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.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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24151857" 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="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>
@@ -1062,16 +967,9 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="23" />
+      <option name="time" value="32" />
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
-        <watch expression="ReduceTypeEnum.valueOf(reduceType)" language="JAVA" custom="" />
-        <watch expression="TextUtils.isNotEmpty(reduceType)" language="JAVA" custom="" />
-        <watch expression="caseTypeEnum.name()+serviceTypeEnum.name()+paidTypeEnum.name()+reduceTypeEnum.name()" language="JAVA" custom="" />
-        <watch expression="CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name()" language="JAVA" custom="" />
-      </configuration>
-    </watches-manager>
+    <watches-manager />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -1125,17 +1023,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
       <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>
@@ -1153,13 +1045,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.61496353">
-          <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-12.5">
@@ -1196,10 +1081,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
+    <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="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
+          <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>
@@ -1231,6 +1123,14 @@
         </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">
@@ -1243,6 +1143,7 @@
       <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>
@@ -1250,6 +1151,7 @@
       <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>
@@ -1257,6 +1159,7 @@
       <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>
@@ -1279,6 +1182,7 @@
       <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>
@@ -1286,34 +1190,23 @@
       <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
-      <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>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.75">
+        <state vertical-scroll-proportion="0.0">
           <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>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.875">
+        <state vertical-scroll-proportion="0.0">
           <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1321,149 +1214,211 @@
       <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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
+    <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="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+          <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>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.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" />
+          <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="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2.jar!/META-INF/c.tld">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <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">
-          <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
+    <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="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>
+          <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/java/com/canrd/patent/service/CasementService.java">
+    <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="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>
+          <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-16.083334">
+          <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
+          <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="-6.27451">
+          <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
+          <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="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
+          <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
     <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="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+        <state vertical-scroll-proportion="-6.148148">
+          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#2300#2301#0" expanded="true" />
+            <element signature="e#2362#2363#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
+    <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="-19.75">
-          <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
+        <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>
+            <element signature="e#2712#2713#0" expanded="true" />
+            <element signature="e#2737#2738#0" expanded="true" />
+            <element signature="e#2989#2990#0" expanded="true" />
+            <element signature="e#3017#3018#0" expanded="true" />
+            <element signature="e#3270#3271#0" expanded="true" />
+            <element signature="e#3297#3298#0" expanded="true" />
+            <element signature="e#3561#3562#0" expanded="true" />
+            <element signature="e#3622#3623#0" expanded="true" />
+            <element signature="e#3883#3884#0" expanded="true" />
+            <element signature="e#3912#3913#0" expanded="true" />
+            <element signature="e#4188#4189#0" expanded="true" />
+            <element signature="e#4255#4256#0" expanded="true" />
+            <element signature="e#4522#4523#0" expanded="true" />
+            <element signature="e#4553#4554#0" expanded="true" />
+            <element signature="e#4839#4840#0" expanded="true" />
+            <element signature="e#4912#4913#0" expanded="true" />
+            <element signature="e#5188#5189#0" expanded="true" />
+            <element signature="e#5222#5223#0" expanded="true" />
+            <element signature="e#5872#5873#0" expanded="true" />
+            <element signature="e#5903#5904#0" expanded="true" />
+            <element signature="e#6189#6190#0" expanded="true" />
+            <element signature="e#6262#6263#0" expanded="true" />
+            <element signature="e#6535#6536#0" expanded="true" />
+            <element signature="e#6568#6569#0" expanded="true" />
+            <element signature="e#6864#6865#0" expanded="true" />
+            <element signature="e#6943#6944#0" expanded="true" />
+            <element signature="e#7203#7204#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7510#7511#0" expanded="true" />
+            <element signature="e#7548#7549#0" expanded="true" />
+            <element signature="e#7821#7822#0" expanded="true" />
+            <element signature="e#7854#7855#0" expanded="true" />
+            <element signature="e#8150#8151#0" expanded="true" />
+            <element signature="e#8229#8230#0" expanded="true" />
+            <element signature="e#9157#9158#0" expanded="true" />
+            <element signature="e#9190#9191#0" expanded="true" />
+            <element signature="e#9484#9485#0" expanded="true" />
+            <element signature="e#9528#9529#0" expanded="true" />
+          </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/enums/ReduceTypeEnum.java">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
+          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.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 />
+          <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.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 />
+          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+          <folding>
+            <element signature="e#257#258#0" expanded="true" />
+            <element signature="e#293#294#0" expanded="true" />
+            <element signature="e#358#359#0" expanded="true" />
+            <element signature="e#408#409#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
+    <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="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
+        <state vertical-scroll-proportion="-31.041666">
+          <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="80.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="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
+    <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="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-          <folding />
+          <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
+          <folding>
+            <element signature="e#415#416#0" expanded="true" />
+            <element signature="e#465#466#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
+    <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="0.0">
-          <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
+          <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
       <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 vertical-scroll-proportion="1.2269231">
+          <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
           <folding />
         </state>
       </provider>
 package com.canrd.patent.dal.dto;
+import com.canrd.patent.dal.model.Casement;
+
 import java.util.Date;
 /**
  * Created by ouyangmao on 16/7/20.
  */
-public class CaseOutputDto {
-    private Long id;
-    private String name;
-    private String caseSn;
+public class CaseOutputDto extends Casement{
     private String contractNum;
-    private String caseType;
-    private Long expense;
-    private String createDate;
-
-    public Long getId() {
-        return id;
-    }
+    private String caseTypeTitle;
+    private String serviceTypeTitle;
+    private String paidTypeTitle;
+    private String reduceTypeTitle;
+    private String caseStatusTitle;
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
+    public String getContractNum() {
+        return contractNum;
     }
-    public void setName(String name) {
-        this.name = name;
+    public void setContractNum(String contractNum) {
+        this.contractNum = contractNum;
     }
-    public String getCaseSn() {
-        return caseSn;
+    public String getCaseTypeTitle() {
+        return caseTypeTitle;
     }
-    public void setCaseSn(String caseSn) {
-        this.caseSn = caseSn;
+    public void setCaseTypeTitle(String caseTypeTitle) {
+        this.caseTypeTitle = caseTypeTitle;
     }
-    public String getContractNum() {
-        return contractNum;
+    public String getServiceTypeTitle() {
+        return serviceTypeTitle;
     }
-    public void setContractNum(String contractNum) {
-        this.contractNum = contractNum;
+    public void setServiceTypeTitle(String serviceTypeTitle) {
+        this.serviceTypeTitle = serviceTypeTitle;
     }
-    public String getCaseType() {
-        return caseType;
+    public String getPaidTypeTitle() {
+        return paidTypeTitle;
     }
-    public void setCaseType(String caseType) {
-        this.caseType = caseType;
+    public void setPaidTypeTitle(String paidTypeTitle) {
+        this.paidTypeTitle = paidTypeTitle;
     }
-    public Long getExpense() {
-        return expense;
+    public String getReduceTypeTitle() {
+        return reduceTypeTitle;
     }
-    public void setExpense(Long expense) {
-        this.expense = expense;
+    public void setReduceTypeTitle(String reduceTypeTitle) {
+        this.reduceTypeTitle = reduceTypeTitle;
     }
-    public String getCreateDate() {
-        return createDate;
+    public String getCaseStatusTitle() {
+        return caseStatusTitle;
     }
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
+    public void setCaseStatusTitle(String caseStatusTitle) {
+        this.caseStatusTitle = caseStatusTitle;
     }
 }
@@ -9,13 +9,13 @@ import java.util.List;
  * Created by ouyangmao on 16/7/23.
  */
 public class OrderListOutputDto extends Order{
-    Casement casement;
+    CaseOutputDto caseOutputDto;
-    public Casement getCasement() {
-        return casement;
+    public CaseOutputDto getCaseOutputDto() {
+        return caseOutputDto;
     }
-    public void setCasement(Casement casement) {
-        this.casement = casement;
+    public void setCaseOutputDto(CaseOutputDto caseOutputDto) {
+        this.caseOutputDto = caseOutputDto;
     }
 }
+package com.canrd.patent.dal.dto;
+
+import com.canrd.patent.dal.model.Casement;
+
+/**
+ * Created by ouyangmao on 16/7/24.
+ */
+public class OrderOutputDto extends Casement{
+
+    private CaseOutputDto caseOutputDto;
+
+    public CaseOutputDto getCaseOutputDto() {
+        return caseOutputDto;
+    }
+
+    public void setCaseOutputDto(CaseOutputDto caseOutputDto) {
+        this.caseOutputDto = caseOutputDto;
+    }
+}
@@ -21,11 +21,11 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column casement.caseSn
+     * This field corresponds to the database column casement.case_sn
      *
      * @mbggenerated
      */
-    private String casesn;
+    private String caseSn;
     /**
      * This field was generated by MyBatis Generator.
@@ -37,14 +37,6 @@ 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
@@ -53,14 +45,6 @@ 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
@@ -69,14 +53,6 @@ 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
@@ -85,14 +61,6 @@ 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
@@ -101,14 +69,6 @@ public class Casement {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column casement.order_status
-     *
-     * @mbggenerated
-     */
-    private String orderStatus;
-
-    /**
-     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column casement.case_status
      *
      * @mbggenerated
@@ -189,26 +149,26 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column casement.caseSn
+     * This method returns the value of the database column casement.case_sn
      *
-     * @return the value of casement.caseSn
+     * @return the value of casement.case_sn
      *
      * @mbggenerated
      */
-    public String getCasesn() {
-        return casesn;
+    public String getCaseSn() {
+        return caseSn;
     }
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column casement.caseSn
+     * This method sets the value of the database column casement.case_sn
      *
-     * @param casesn the value for casement.caseSn
+     * @param caseSn the value for casement.case_sn
      *
      * @mbggenerated
      */
-    public void setCasesn(String casesn) {
-        this.casesn = casesn == null ? null : casesn.trim();
+    public void setCaseSn(String caseSn) {
+        this.caseSn = caseSn == null ? null : caseSn.trim();
     }
     /**
@@ -237,30 +197,6 @@ 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
@@ -285,30 +221,6 @@ 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
@@ -333,30 +245,6 @@ 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
@@ -381,30 +269,6 @@ 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
@@ -429,30 +293,6 @@ public class Casement {
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column casement.order_status
-     *
-     * @return the value of casement.order_status
-     *
-     * @mbggenerated
-     */
-    public String getOrderStatus() {
-        return orderStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column casement.order_status
-     *
-     * @param orderStatus the value for casement.order_status
-     *
-     * @mbggenerated
-     */
-    public void setOrderStatus(String orderStatus) {
-        this.orderStatus = orderStatus == null ? null : orderStatus.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column casement.case_status
      *
      * @return the value of casement.case_status
@@ -325,73 +325,73 @@ public class CasementExample {
             return (Criteria) this;
         }
-        public Criteria andCasesnIsNull() {
-            addCriterion("caseSn is null");
+        public Criteria andCaseSnIsNull() {
+            addCriterion("case_sn is null");
             return (Criteria) this;
         }
-        public Criteria andCasesnIsNotNull() {
-            addCriterion("caseSn is not null");
+        public Criteria andCaseSnIsNotNull() {
+            addCriterion("case_sn is not null");
             return (Criteria) this;
         }
-        public Criteria andCasesnEqualTo(String value) {
-            addCriterion("caseSn =", value, "casesn");
+        public Criteria andCaseSnEqualTo(String value) {
+            addCriterion("case_sn =", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnNotEqualTo(String value) {
-            addCriterion("caseSn <>", value, "casesn");
+        public Criteria andCaseSnNotEqualTo(String value) {
+            addCriterion("case_sn <>", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnGreaterThan(String value) {
-            addCriterion("caseSn >", value, "casesn");
+        public Criteria andCaseSnGreaterThan(String value) {
+            addCriterion("case_sn >", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnGreaterThanOrEqualTo(String value) {
-            addCriterion("caseSn >=", value, "casesn");
+        public Criteria andCaseSnGreaterThanOrEqualTo(String value) {
+            addCriterion("case_sn >=", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnLessThan(String value) {
-            addCriterion("caseSn <", value, "casesn");
+        public Criteria andCaseSnLessThan(String value) {
+            addCriterion("case_sn <", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnLessThanOrEqualTo(String value) {
-            addCriterion("caseSn <=", value, "casesn");
+        public Criteria andCaseSnLessThanOrEqualTo(String value) {
+            addCriterion("case_sn <=", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnLike(String value) {
-            addCriterion("caseSn like", value, "casesn");
+        public Criteria andCaseSnLike(String value) {
+            addCriterion("case_sn like", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnNotLike(String value) {
-            addCriterion("caseSn not like", value, "casesn");
+        public Criteria andCaseSnNotLike(String value) {
+            addCriterion("case_sn not like", value, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnIn(List<String> values) {
-            addCriterion("caseSn in", values, "casesn");
+        public Criteria andCaseSnIn(List<String> values) {
+            addCriterion("case_sn in", values, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnNotIn(List<String> values) {
-            addCriterion("caseSn not in", values, "casesn");
+        public Criteria andCaseSnNotIn(List<String> values) {
+            addCriterion("case_sn not in", values, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnBetween(String value1, String value2) {
-            addCriterion("caseSn between", value1, value2, "casesn");
+        public Criteria andCaseSnBetween(String value1, String value2) {
+            addCriterion("case_sn between", value1, value2, "caseSn");
             return (Criteria) this;
         }
-        public Criteria andCasesnNotBetween(String value1, String value2) {
-            addCriterion("caseSn not between", value1, value2, "casesn");
+        public Criteria andCaseSnNotBetween(String value1, String value2) {
+            addCriterion("case_sn not between", value1, value2, "caseSn");
             return (Criteria) this;
         }
@@ -465,76 +465,6 @@ 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;
@@ -605,76 +535,6 @@ 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;
@@ -745,76 +605,6 @@ 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;
@@ -885,76 +675,6 @@ 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;
@@ -1015,76 +735,6 @@ public class CasementExample {
             return (Criteria) this;
         }
-        public Criteria andOrderStatusIsNull() {
-            addCriterion("order_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusIsNotNull() {
-            addCriterion("order_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusEqualTo(String value) {
-            addCriterion("order_status =", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusNotEqualTo(String value) {
-            addCriterion("order_status <>", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusGreaterThan(String value) {
-            addCriterion("order_status >", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("order_status >=", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusLessThan(String value) {
-            addCriterion("order_status <", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusLessThanOrEqualTo(String value) {
-            addCriterion("order_status <=", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusLike(String value) {
-            addCriterion("order_status like", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusNotLike(String value) {
-            addCriterion("order_status not like", value, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusIn(List<String> values) {
-            addCriterion("order_status in", values, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusNotIn(List<String> values) {
-            addCriterion("order_status not in", values, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusBetween(String value1, String value2) {
-            addCriterion("order_status between", value1, value2, "orderStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderStatusNotBetween(String value1, String value2) {
-            addCriterion("order_status not between", value1, value2, "orderStatus");
-            return (Criteria) this;
-        }
-
         public Criteria andCaseStatusIsNull() {
             addCriterion("case_status is null");
             return (Criteria) this;
@@ -53,11 +53,43 @@ public class Order {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column orders.isCanceled
+     * This field corresponds to the database column orders.address
      *
      * @mbggenerated
      */
-    private Boolean iscanceled;
+    private String address;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column orders.phone
+     *
+     * @mbggenerated
+     */
+    private String phone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column orders.in_name
+     *
+     * @mbggenerated
+     */
+    private String inName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column orders.invoice
+     *
+     * @mbggenerated
+     */
+    private String invoice;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column orders.is_canceled
+     *
+     * @mbggenerated
+     */
+    private Boolean isCanceled;
     /**
      * This field was generated by MyBatis Generator.
@@ -229,26 +261,122 @@ public class Order {
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column orders.isCanceled
+     * This method returns the value of the database column orders.address
+     *
+     * @return the value of orders.address
+     *
+     * @mbggenerated
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column orders.address
+     *
+     * @param address the value for orders.address
+     *
+     * @mbggenerated
+     */
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column orders.phone
+     *
+     * @return the value of orders.phone
+     *
+     * @mbggenerated
+     */
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column orders.phone
+     *
+     * @param phone the value for orders.phone
+     *
+     * @mbggenerated
+     */
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column orders.in_name
+     *
+     * @return the value of orders.in_name
+     *
+     * @mbggenerated
+     */
+    public String getInName() {
+        return inName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column orders.in_name
+     *
+     * @param inName the value for orders.in_name
+     *
+     * @mbggenerated
+     */
+    public void setInName(String inName) {
+        this.inName = inName == null ? null : inName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column orders.invoice
+     *
+     * @return the value of orders.invoice
+     *
+     * @mbggenerated
+     */
+    public String getInvoice() {
+        return invoice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column orders.invoice
+     *
+     * @param invoice the value for orders.invoice
+     *
+     * @mbggenerated
+     */
+    public void setInvoice(String invoice) {
+        this.invoice = invoice == null ? null : invoice.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column orders.is_canceled
      *
-     * @return the value of orders.isCanceled
+     * @return the value of orders.is_canceled
      *
      * @mbggenerated
      */
-    public Boolean getIscanceled() {
-        return iscanceled;
+    public Boolean getIsCanceled() {
+        return isCanceled;
     }
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column orders.isCanceled
+     * This method sets the value of the database column orders.is_canceled
      *
-     * @param iscanceled the value for orders.isCanceled
+     * @param isCanceled the value for orders.is_canceled
      *
      * @mbggenerated
      */
-    public void setIscanceled(Boolean iscanceled) {
-        this.iscanceled = iscanceled;
+    public void setIsCanceled(Boolean isCanceled) {
+        this.isCanceled = isCanceled;
     }
     /**
@@ -575,63 +575,343 @@ public class OrderExample {
             return (Criteria) this;
         }
-        public Criteria andIscanceledIsNull() {
-            addCriterion("isCanceled is null");
+        public Criteria andAddressIsNull() {
+            addCriterion("address is null");
             return (Criteria) this;
         }
-        public Criteria andIscanceledIsNotNull() {
-            addCriterion("isCanceled is not null");
+        public Criteria andAddressIsNotNull() {
+            addCriterion("address is not null");
             return (Criteria) this;
         }
-        public Criteria andIscanceledEqualTo(Boolean value) {
-            addCriterion("isCanceled =", value, "iscanceled");
+        public Criteria andAddressEqualTo(String value) {
+            addCriterion("address =", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledNotEqualTo(Boolean value) {
-            addCriterion("isCanceled <>", value, "iscanceled");
+        public Criteria andAddressNotEqualTo(String value) {
+            addCriterion("address <>", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledGreaterThan(Boolean value) {
-            addCriterion("isCanceled >", value, "iscanceled");
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("address >", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("isCanceled >=", value, "iscanceled");
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("address >=", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledLessThan(Boolean value) {
-            addCriterion("isCanceled <", value, "iscanceled");
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("address <", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledLessThanOrEqualTo(Boolean value) {
-            addCriterion("isCanceled <=", value, "iscanceled");
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("address <=", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledIn(List<Boolean> values) {
-            addCriterion("isCanceled in", values, "iscanceled");
+        public Criteria andAddressLike(String value) {
+            addCriterion("address like", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledNotIn(List<Boolean> values) {
-            addCriterion("isCanceled not in", values, "iscanceled");
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("address not like", value, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledBetween(Boolean value1, Boolean value2) {
-            addCriterion("isCanceled between", value1, value2, "iscanceled");
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("address in", values, "address");
             return (Criteria) this;
         }
-        public Criteria andIscanceledNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("isCanceled not between", value1, value2, "iscanceled");
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("address not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("address between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("address not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNull() {
+            addCriterion("phone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNotNull() {
+            addCriterion("phone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneEqualTo(String value) {
+            addCriterion("phone =", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotEqualTo(String value) {
+            addCriterion("phone <>", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThan(String value) {
+            addCriterion("phone >", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("phone >=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThan(String value) {
+            addCriterion("phone <", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThanOrEqualTo(String value) {
+            addCriterion("phone <=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLike(String value) {
+            addCriterion("phone like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotLike(String value) {
+            addCriterion("phone not like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIn(List<String> values) {
+            addCriterion("phone in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> values) {
+            addCriterion("phone not in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneBetween(String value1, String value2) {
+            addCriterion("phone between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotBetween(String value1, String value2) {
+            addCriterion("phone not between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameIsNull() {
+            addCriterion("in_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameIsNotNull() {
+            addCriterion("in_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameEqualTo(String value) {
+            addCriterion("in_name =", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameNotEqualTo(String value) {
+            addCriterion("in_name <>", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameGreaterThan(String value) {
+            addCriterion("in_name >", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameGreaterThanOrEqualTo(String value) {
+            addCriterion("in_name >=", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameLessThan(String value) {
+            addCriterion("in_name <", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameLessThanOrEqualTo(String value) {
+            addCriterion("in_name <=", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameLike(String value) {
+            addCriterion("in_name like", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameNotLike(String value) {
+            addCriterion("in_name not like", value, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameIn(List<String> values) {
+            addCriterion("in_name in", values, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameNotIn(List<String> values) {
+            addCriterion("in_name not in", values, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameBetween(String value1, String value2) {
+            addCriterion("in_name between", value1, value2, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInNameNotBetween(String value1, String value2) {
+            addCriterion("in_name not between", value1, value2, "inName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceIsNull() {
+            addCriterion("invoice is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceIsNotNull() {
+            addCriterion("invoice is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceEqualTo(String value) {
+            addCriterion("invoice =", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceNotEqualTo(String value) {
+            addCriterion("invoice <>", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceGreaterThan(String value) {
+            addCriterion("invoice >", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceGreaterThanOrEqualTo(String value) {
+            addCriterion("invoice >=", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceLessThan(String value) {
+            addCriterion("invoice <", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceLessThanOrEqualTo(String value) {
+            addCriterion("invoice <=", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceLike(String value) {
+            addCriterion("invoice like", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceNotLike(String value) {
+            addCriterion("invoice not like", value, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceIn(List<String> values) {
+            addCriterion("invoice in", values, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceNotIn(List<String> values) {
+            addCriterion("invoice not in", values, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceBetween(String value1, String value2) {
+            addCriterion("invoice between", value1, value2, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andInvoiceNotBetween(String value1, String value2) {
+            addCriterion("invoice not between", value1, value2, "invoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledIsNull() {
+            addCriterion("is_canceled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledIsNotNull() {
+            addCriterion("is_canceled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledEqualTo(Boolean value) {
+            addCriterion("is_canceled =", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledNotEqualTo(Boolean value) {
+            addCriterion("is_canceled <>", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledGreaterThan(Boolean value) {
+            addCriterion("is_canceled >", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_canceled >=", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledLessThan(Boolean value) {
+            addCriterion("is_canceled <", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_canceled <=", value, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledIn(List<Boolean> values) {
+            addCriterion("is_canceled in", values, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledNotIn(List<Boolean> values) {
+            addCriterion("is_canceled not in", values, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_canceled between", value1, value2, "isCanceled");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCanceledNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_canceled not between", value1, value2, "isCanceled");
             return (Criteria) this;
         }
@@ -40,16 +40,11 @@ public class CaseHandlingService {
         if(StringUtils.isEmpty(preCasement)) {
             Casement casement = new Casement();
             casement.setCaseType(caseTypeEnum.name());
-            casement.setCaseTypeTitle(caseTypeEnum.getTitle());
-            casement.setCasesn(generatorCaseSn());
+            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());
             casement.setMemberId(memberId);
             casement.setCreateDate(new Date());
@@ -110,10 +105,10 @@ public class CaseHandlingService {
             caseOutputDto.setId(casement.getId());
             caseOutputDto.setName(casement.getName());
             caseOutputDto.setCaseType(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
-            caseOutputDto.setCaseSn(casement.getCasesn());
-            caseOutputDto.setContractNum(casement.getCasesn());
+            caseOutputDto.setCaseSn(casement.getCaseSn());
+            caseOutputDto.setContractNum(casement.getCaseSn());
             caseOutputDto.setExpense(casement.getExpense()/100);
-            caseOutputDto.setCreateDate(DateUtils.format(casement.getCreateDate()));
+            caseOutputDto.setCreateDate(casement.getCreateDate());
             caseOutputDtoList.add(caseOutputDto);
         }
         return caseOutputDtoList;
@@ -126,10 +121,10 @@ public class CaseHandlingService {
     @Transactional(isolation= Isolation.SERIALIZABLE,propagation = Propagation.REQUIRED,noRollbackFor = RuntimeException.class)
     private String generatorCaseSn(){
         CasementExample casementExample = new CasementExample();
-        casementExample.setOrderByClause("caseSn desc limit 1");
+        casementExample.setOrderByClause("case_sn desc limit 1");
         List<Casement> casementList = casementMapper.selectByExample(casementExample);
         if(!CollectionUtils.isEmpty(casementList)){
-            String caseSn = casementList.get(0).getCasesn();
+            String caseSn = casementList.get(0).getCaseSn();
             int sn = Integer.parseInt(caseSn.substring(2, caseSn.length()));
             return caseSn.substring(0,2)+(sn+1);
         }else {
@@ -19,25 +19,42 @@ public class OrderService {
     OrderMapper orderMapper;
     /***
-     * 保存订单
-     * @param caseId
-     * @param quantity
-     * @param expense
+     * 更新订单
+     * @param orderId
      * @param adress
      * @param phone
      * @param inName
      * @param invoice
+     * @return
+     */
+    public Order updateOrder(Long orderId,String adress,String phone,String inName,String invoice){
+        Order order = findByOrderId(orderId);
+        order.setAddress(adress);
+        order.setPhone(phone);
+        order.setInName(inName);
+        order.setInvoice(invoice);
+        order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
+        order.setUpdateDate(new Date());
+        orderMapper.updateByPrimaryKey(order);
+        return order;
+    }
+
+    /***
+     * 保存订单
+     * @param caseId
+     * @param quantity
+     * @param expense
      * @param memberId
      * @return
      */
-    public Order save(Long caseId,Long quantity,Long expense,String adress,String phone,String inName,String invoice,String memberId){
+    public Order saveOrder(Long caseId, Long quantity, Long expense, String memberId){
         Order order = new Order();
         order.setCaseId(caseId);
         order.setQuantity(quantity);
         order.setExpense(expense);
         order.setPayType("支付宝");
-        order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
-        order.setIscanceled(false);
+        order.setOrderStatus(OrderStatusEnum.SUBMITED.name());
+        order.setIsCanceled(false);
         order.setMemberId(memberId);
         order.setCreateDate(new Date());
         order.setUpdateDate(new Date());
@@ -78,7 +95,7 @@ public class OrderService {
         OrderExample orderExample = new OrderExample();
         OrderExample.Criteria criteria = orderExample.createCriteria();
         criteria.andMemberIdEqualTo(memberId);
-        criteria.andIscanceledEqualTo(false);
+        criteria.andIsCanceledEqualTo(false);
         return orderMapper.selectByExample(orderExample);
     }
 }
@@ -3,13 +3,12 @@ package com.canrd.patent.web;
 import com.canrd.patent.common.utils.DateUtils;
 import com.canrd.patent.common.utils.TextUtils;
 import com.canrd.patent.dal.dto.CaseInputDto;
-import com.canrd.patent.dal.enums.CaseTypeEnum;
-import com.canrd.patent.dal.enums.PaidTypeEnum;
-import com.canrd.patent.dal.enums.ReduceTypeEnum;
-import com.canrd.patent.dal.enums.ServiceTypeEnum;
+import com.canrd.patent.dal.enums.*;
 import com.canrd.patent.dal.model.Casement;
+import com.canrd.patent.dal.model.Order;
 import com.canrd.patent.service.CaseHandlingService;
 import com.canrd.patent.service.CasementService;
+import com.canrd.patent.service.OrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -30,6 +29,8 @@ public class CasementPageController {
     private CasementService casementService;
     @Resource
     private CaseHandlingService caseHandlingService;
+    @Resource
+    private OrderService orderService;
     @RequestMapping(value="/submit_case")
     public ModelAndView submitCase(CaseInputDto caseInputDto){
@@ -45,11 +46,15 @@ public class CasementPageController {
             ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null;
             Long expense = Long.parseLong(caseInputDto.getExpense())*100;
             Casement casement = caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,IndexController.MEMBER_ID);
+
+            Order order = orderService.saveOrder(casement.getId(), 1l, expense, IndexController.MEMBER_ID);
+
             modelAndView.addObject("caseId", casement.getId());
+            modelAndView.addObject("orderId", order.getId());
             modelAndView.addObject("caseType", CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
             modelAndView.addObject("name", casement.getName() == null ? "暂无名称" : casement.getName());
-            modelAndView.addObject("caseSn", casement.getCasesn());
-            modelAndView.addObject("contractSn", casement.getCasesn());
+            modelAndView.addObject("caseSn", casement.getCaseSn());
+            modelAndView.addObject("contractSn", casement.getCaseSn());
             modelAndView.addObject("expense", casement.getExpense()/100);
             modelAndView.addObject("totalExpense", casement.getExpense()/100);
             modelAndView.addObject("createDate", DateUtils.format(casement.getCreateDate()));
 package com.canrd.patent.web;
+import com.canrd.patent.dal.dto.CaseOutputDto;
 import com.canrd.patent.dal.dto.OrderListOutputDto;
-import com.canrd.patent.dal.enums.OrderStatusEnum;
+import com.canrd.patent.dal.dto.OrderOutputDto;
+import com.canrd.patent.dal.enums.*;
 import com.canrd.patent.dal.model.Casement;
 import com.canrd.patent.dal.model.Order;
 import com.canrd.patent.service.CasementService;
@@ -31,12 +33,12 @@ public class OrderPageController {
      * @return
      */
     @RequestMapping(value="/save_order")
-    public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
+    public void pay(Long orderId,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
         //判断是否已经存在同样的订单，如果存在，则提醒用户并且数量+1即可
-        Order order = orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
+        Order order = orderService.updateOrder(orderId, address, phone, inName, invoice);
         //跳转到支付宝
         //暂时直接跳转到支付成功的页面
-        response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+expense);
+        response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+order.getExpense());
     }
     @RequestMapping(value="/notify_result")
@@ -69,7 +71,27 @@ public class OrderPageController {
         Assert.notNull(orderId);
         ModelAndView modelAndView = new ModelAndView();
         Order order = orderService.findByOrderId(orderId);
-        modelAndView.addObject("order",order);
+        Casement casement = casementService.findById(order.getCaseId());
+        CaseOutputDto caseOutputDto = new CaseOutputDto();
+        caseOutputDto.setId(casement.getId());
+        caseOutputDto.setName(casement.getName());
+        caseOutputDto.setCaseSn(casement.getCaseSn());
+        caseOutputDto.setCaseType(casement.getCaseType());
+        caseOutputDto.setCaseTypeTitle(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
+        caseOutputDto.setServiceType(casement.getServiceType());
+        caseOutputDto.setServiceTypeTitle(ServiceTypeEnum.valueOf(casement.getServiceType()).getTitle());
+        caseOutputDto.setPaidType(casement.getPaidType());
+        caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());
+        caseOutputDto.setReduceType(casement.getReduceType());
+        caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);
+        caseOutputDto.setContractNum(casement.getCaseSn());
+        caseOutputDto.setCaseStatus(casement.getCaseStatus());
+        caseOutputDto.setMemberId(casement.getMemberId());
+        caseOutputDto.setCreateDate(casement.getCreateDate());
+        caseOutputDto.setUpdateDate(casement.getUpdateDate());
+        OrderOutputDto orderOutputDto = new OrderOutputDto();
+        orderOutputDto.setCaseOutputDto(caseOutputDto);
+        modelAndView.addObject("order",orderOutputDto);
         modelAndView.setViewName("/order_detail");
         return modelAndView;
     }
@@ -85,7 +107,24 @@ public class OrderPageController {
         for(Order order:orderList){
             OrderListOutputDto orderListOutputDto = new OrderListOutputDto();
             Casement casement = casementService.findById(order.getCaseId());
-            orderListOutputDto.setCasement(casement);
+            CaseOutputDto caseOutputDto = new CaseOutputDto();
+            caseOutputDto.setId(casement.getId());
+            caseOutputDto.setName(casement.getName());
+            caseOutputDto.setCaseSn(casement.getCaseSn());
+            caseOutputDto.setCaseType(casement.getCaseType());
+            caseOutputDto.setCaseTypeTitle(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
+            caseOutputDto.setServiceType(casement.getServiceType());
+            caseOutputDto.setServiceTypeTitle(ServiceTypeEnum.valueOf(casement.getServiceType()).getTitle());
+            caseOutputDto.setPaidType(casement.getPaidType());
+            caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());
+            caseOutputDto.setReduceType(casement.getReduceType());
+            caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);
+            caseOutputDto.setContractNum(casement.getCaseSn());
+            caseOutputDto.setCaseStatus(casement.getCaseStatus());
+            caseOutputDto.setMemberId(casement.getMemberId());
+            caseOutputDto.setCreateDate(casement.getCreateDate());
+            caseOutputDto.setUpdateDate(casement.getUpdateDate());
+            orderListOutputDto.setCaseOutputDto(caseOutputDto);
             orderListOutputDtoList.add(orderListOutputDto);
         }
         ModelAndView modelAndView = new ModelAndView();
@@ -8,17 +8,12 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
+    <result column="case_sn" 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" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
@@ -95,8 +90,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    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, 
+    id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status, 
     member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
@@ -153,18 +147,14 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into casement (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)
-    values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{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 into casement (name, case_sn, case_type, 
+      service_type, paid_type, reduce_type, 
+      expense, 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}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -179,39 +169,24 @@
       <if test="name != null">
         name,
       </if>
-      <if test="casesn != null">
-        caseSn,
+      <if test="caseSn != null">
+        case_sn,
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status,
-      </if>
       <if test="caseStatus != null">
         case_status,
       </if>
@@ -229,39 +204,24 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -299,39 +259,24 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.casesn != null">
-        caseSn = #{record.casesn,jdbcType=VARCHAR},
+      <if test="record.caseSn != null">
+        case_sn = #{record.caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="record.orderStatus != null">
-        order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="record.caseStatus != null">
         case_status = #{record.caseStatus,jdbcType=VARCHAR},
       </if>
@@ -357,17 +302,12 @@
     update casement
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
-      caseSn = #{record.casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
@@ -386,39 +326,24 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        caseSn = #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        case_sn = #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status = #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         case_status = #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -441,17 +366,12 @@
     -->
     update casement
     set name = #{name,jdbcType=VARCHAR},
-      caseSn = #{casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
@@ -12,7 +12,11 @@
     <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="address" jdbcType="VARCHAR" property="address" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="in_name" jdbcType="VARCHAR" property="inName" />
+    <result column="invoice" jdbcType="VARCHAR" property="invoice" />
+    <result column="is_canceled" 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" />
@@ -88,8 +92,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
-    update_date
+    id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name, 
+    invoice, is_canceled, member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -146,13 +150,15 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, isCanceled, 
-      member_id, create_date, update_date
-      )
+      pay_type, order_status, address, 
+      phone, in_name, invoice, 
+      is_canceled, member_id, create_date, 
+      update_date)
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,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">
     <!--
@@ -179,8 +185,20 @@
       <if test="orderStatus != null">
         order_status,
       </if>
-      <if test="iscanceled != null">
-        isCanceled,
+      <if test="address != null">
+        address,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="inName != null">
+        in_name,
+      </if>
+      <if test="invoice != null">
+        invoice,
+      </if>
+      <if test="isCanceled != null">
+        is_canceled,
       </if>
       <if test="memberId != null">
         member_id,
@@ -208,8 +226,20 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
@@ -257,8 +287,20 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="record.iscanceled != null">
-        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inName != null">
+        in_name = #{record.inName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.invoice != null">
+        invoice = #{record.invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isCanceled != null">
+        is_canceled = #{record.isCanceled,jdbcType=BIT},
       </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
@@ -286,7 +328,11 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{record.iscanceled,jdbcType=BIT},
+      address = #{record.address,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      in_name = #{record.inName,jdbcType=VARCHAR},
+      invoice = #{record.invoice,jdbcType=VARCHAR},
+      is_canceled = #{record.isCanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -316,8 +362,20 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        isCanceled = #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        in_name = #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        invoice = #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        is_canceled = #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
@@ -342,7 +400,11 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{iscanceled,jdbcType=BIT},
+      address = #{address,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      in_name = #{inName,jdbcType=VARCHAR},
+      invoice = #{invoice,jdbcType=VARCHAR},
+      is_canceled = #{isCanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
@@ -89,11 +89,11 @@
                         <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 class="case-type"><span>案件类型：</span><span>${order.caseOutputDto.caseTypeTitle}</span></div>
                                     <div><span>
                                         <c:choose>
-                                            <c:when test="${order.casement.name!=null}">
-                                                ${order.casement.name}
+                                            <c:when test="${order.caseOutputDto.name!=null}">
+                                                ${order.caseOutputDto.name}
                                             </c:when>
                                             <c:otherwise>
                                                 暂无名称
@@ -102,14 +102,14 @@
                                     </span></div>
                                 </td>
                                 <td class="td-width-120">
-                                        ${order.casement.caseSn}
+                                        ${order.caseOutputDto.caseSn}
                                 </td>
                                 <td class="td-width-120">
                                     <div>
-                                        <span>${order.casement.serviceTypeTile}</span>
+                                        <span>${order.caseOutputDto.serviceTypeTitle}</span>
                                     </div>
                                     <div>
-                                        <span>${order.casement.paidTypeTile}</span>
+                                        <span>${order.caseOutputDto.paidTypeTitle}</span>
                                     </div>
                                 </td>
                                 <td class="td-width-120">
@@ -125,7 +125,7 @@
                                 </td>
                                 <td class="td-width-120">
                                     <div>
-                                        <span>未支付</span>
+                                        <span>${order.caseOutputDto.caseStatusTitle}</span>
                                     </div>
                                     <div>
                                         <a href="javascript:" class="color-ff6642">未支付</a>
@@ -137,104 +137,12 @@
                             </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>合同号：<span>${order.caseOutputDto.contractNum}</span></span>
+                                    <span>立案时间：<span>${order.caseOutputDto.createDate}</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>
-                                <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>
@@ -114,8 +114,7 @@
         <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
         <div>
             <form id="pay_form" method="post">
-                <input type="hidden" name="caseId" id="pay_case_id" />
-                <input type="hidden" name="expense" id="pay_expense" />
+                <input type="hidden" name="orderId" value="${orderId}" />
                 <input type="hidden" name="address" id="pay_address" />
                 <input type="hidden" name="phone" id="pay_phone" />
                 <input type="hidden" name="inName" id="in_name" />
@@ -161,8 +160,6 @@
      * 提交支付
      */
     function submit_pay(){
-        var id = $("#case_id").val();
-        var expense = $("#expense span").text();
         var address = $("#address").val();
         if(address==""){
             alert("地址不能为空");
@@ -187,8 +184,6 @@
             $("#invoice").focus();
             return;
         }
-        $("#pay_case_id").val(id);
-        $("#pay_expense").val(expense);
         $("#pay_address").val(address);
         $("#pay_phone").val(phone);
         $("#in_name").val(company==null?person:company);
@@ -8,17 +8,12 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
+    <result column="case_sn" 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" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
@@ -95,8 +90,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    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, 
+    id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status, 
     member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
@@ -153,18 +147,14 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into casement (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)
-    values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{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 into casement (name, case_sn, case_type, 
+      service_type, paid_type, reduce_type, 
+      expense, 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}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -179,39 +169,24 @@
       <if test="name != null">
         name,
       </if>
-      <if test="casesn != null">
-        caseSn,
+      <if test="caseSn != null">
+        case_sn,
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status,
-      </if>
       <if test="caseStatus != null">
         case_status,
       </if>
@@ -229,39 +204,24 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -299,39 +259,24 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.casesn != null">
-        caseSn = #{record.casesn,jdbcType=VARCHAR},
+      <if test="record.caseSn != null">
+        case_sn = #{record.caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="record.orderStatus != null">
-        order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="record.caseStatus != null">
         case_status = #{record.caseStatus,jdbcType=VARCHAR},
       </if>
@@ -357,17 +302,12 @@
     update casement
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
-      caseSn = #{record.casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
@@ -386,39 +326,24 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        caseSn = #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        case_sn = #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status = #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         case_status = #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -441,17 +366,12 @@
     -->
     update casement
     set name = #{name,jdbcType=VARCHAR},
-      caseSn = #{casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
@@ -12,7 +12,11 @@
     <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="address" jdbcType="VARCHAR" property="address" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="in_name" jdbcType="VARCHAR" property="inName" />
+    <result column="invoice" jdbcType="VARCHAR" property="invoice" />
+    <result column="is_canceled" 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" />
@@ -88,8 +92,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
-    update_date
+    id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name, 
+    invoice, is_canceled, member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -146,13 +150,15 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, isCanceled, 
-      member_id, create_date, update_date
-      )
+      pay_type, order_status, address, 
+      phone, in_name, invoice, 
+      is_canceled, member_id, create_date, 
+      update_date)
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,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">
     <!--
@@ -179,8 +185,20 @@
       <if test="orderStatus != null">
         order_status,
       </if>
-      <if test="iscanceled != null">
-        isCanceled,
+      <if test="address != null">
+        address,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="inName != null">
+        in_name,
+      </if>
+      <if test="invoice != null">
+        invoice,
+      </if>
+      <if test="isCanceled != null">
+        is_canceled,
       </if>
       <if test="memberId != null">
         member_id,
@@ -208,8 +226,20 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
@@ -257,8 +287,20 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="record.iscanceled != null">
-        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inName != null">
+        in_name = #{record.inName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.invoice != null">
+        invoice = #{record.invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isCanceled != null">
+        is_canceled = #{record.isCanceled,jdbcType=BIT},
       </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
@@ -286,7 +328,11 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{record.iscanceled,jdbcType=BIT},
+      address = #{record.address,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      in_name = #{record.inName,jdbcType=VARCHAR},
+      invoice = #{record.invoice,jdbcType=VARCHAR},
+      is_canceled = #{record.isCanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -316,8 +362,20 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        isCanceled = #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        in_name = #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        invoice = #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        is_canceled = #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
@@ -342,7 +400,11 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{iscanceled,jdbcType=BIT},
+      address = #{address,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      in_name = #{inName,jdbcType=VARCHAR},
+      invoice = #{invoice,jdbcType=VARCHAR},
+      is_canceled = #{isCanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
@@ -8,17 +8,12 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
+    <result column="case_sn" 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" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
@@ -95,8 +90,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    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, 
+    id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status, 
     member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
@@ -153,18 +147,14 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into casement (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)
-    values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, 
-      #{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 into casement (name, case_sn, case_type, 
+      service_type, paid_type, reduce_type, 
+      expense, 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}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
     <!--
@@ -179,39 +169,24 @@
       <if test="name != null">
         name,
       </if>
-      <if test="casesn != null">
-        caseSn,
+      <if test="caseSn != null">
+        case_sn,
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status,
-      </if>
       <if test="caseStatus != null">
         case_status,
       </if>
@@ -229,39 +204,24 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -299,39 +259,24 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.casesn != null">
-        caseSn = #{record.casesn,jdbcType=VARCHAR},
+      <if test="record.caseSn != null">
+        case_sn = #{record.caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="record.orderStatus != null">
-        order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="record.caseStatus != null">
         case_status = #{record.caseStatus,jdbcType=VARCHAR},
       </if>
@@ -357,17 +302,12 @@
     update casement
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
-      caseSn = #{record.casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
@@ -386,39 +326,24 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="casesn != null">
-        caseSn = #{casesn,jdbcType=VARCHAR},
+      <if test="caseSn != null">
+        case_sn = #{caseSn,jdbcType=VARCHAR},
       </if>
       <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>
-      <if test="orderStatus != null">
-        order_status = #{orderStatus,jdbcType=VARCHAR},
-      </if>
       <if test="caseStatus != null">
         case_status = #{caseStatus,jdbcType=VARCHAR},
       </if>
@@ -441,17 +366,12 @@
     -->
     update casement
     set name = #{name,jdbcType=VARCHAR},
-      caseSn = #{casesn,jdbcType=VARCHAR},
+      case_sn = #{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},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
@@ -12,7 +12,11 @@
     <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="address" jdbcType="VARCHAR" property="address" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="in_name" jdbcType="VARCHAR" property="inName" />
+    <result column="invoice" jdbcType="VARCHAR" property="invoice" />
+    <result column="is_canceled" 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" />
@@ -88,8 +92,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date, 
-    update_date
+    id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name, 
+    invoice, is_canceled, member_id, create_date, update_date
   </sql>
   <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
     <!--
@@ -146,13 +150,15 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into orders (case_id, quantity, expense, 
-      pay_type, order_status, isCanceled, 
-      member_id, create_date, update_date
-      )
+      pay_type, order_status, address, 
+      phone, in_name, invoice, 
+      is_canceled, member_id, create_date, 
+      update_date)
     values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, 
-      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT}, 
-      #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,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">
     <!--
@@ -179,8 +185,20 @@
       <if test="orderStatus != null">
         order_status,
       </if>
-      <if test="iscanceled != null">
-        isCanceled,
+      <if test="address != null">
+        address,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="inName != null">
+        in_name,
+      </if>
+      <if test="invoice != null">
+        invoice,
+      </if>
+      <if test="isCanceled != null">
+        is_canceled,
       </if>
       <if test="memberId != null">
         member_id,
@@ -208,8 +226,20 @@
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
@@ -257,8 +287,20 @@
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="record.iscanceled != null">
-        isCanceled = #{record.iscanceled,jdbcType=BIT},
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inName != null">
+        in_name = #{record.inName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.invoice != null">
+        invoice = #{record.invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isCanceled != null">
+        is_canceled = #{record.isCanceled,jdbcType=BIT},
       </if>
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=VARCHAR},
@@ -286,7 +328,11 @@
       expense = #{record.expense,jdbcType=BIGINT},
       pay_type = #{record.payType,jdbcType=VARCHAR},
       order_status = #{record.orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{record.iscanceled,jdbcType=BIT},
+      address = #{record.address,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      in_name = #{record.inName,jdbcType=VARCHAR},
+      invoice = #{record.invoice,jdbcType=VARCHAR},
+      is_canceled = #{record.isCanceled,jdbcType=BIT},
       member_id = #{record.memberId,jdbcType=VARCHAR},
       create_date = #{record.createDate,jdbcType=TIMESTAMP},
       update_date = #{record.updateDate,jdbcType=TIMESTAMP}
@@ -316,8 +362,20 @@
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
       </if>
-      <if test="iscanceled != null">
-        isCanceled = #{iscanceled,jdbcType=BIT},
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="inName != null">
+        in_name = #{inName,jdbcType=VARCHAR},
+      </if>
+      <if test="invoice != null">
+        invoice = #{invoice,jdbcType=VARCHAR},
+      </if>
+      <if test="isCanceled != null">
+        is_canceled = #{isCanceled,jdbcType=BIT},
       </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
@@ -342,7 +400,11 @@
       expense = #{expense,jdbcType=BIGINT},
       pay_type = #{payType,jdbcType=VARCHAR},
       order_status = #{orderStatus,jdbcType=VARCHAR},
-      isCanceled = #{iscanceled,jdbcType=BIT},
+      address = #{address,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      in_name = #{inName,jdbcType=VARCHAR},
+      invoice = #{invoice,jdbcType=VARCHAR},
+      is_canceled = #{isCanceled,jdbcType=BIT},
       member_id = #{memberId,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_date = #{updateDate,jdbcType=TIMESTAMP}
@@ -114,8 +114,7 @@
         <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
         <div>
             <form id="pay_form" method="post">
-                <input type="hidden" name="caseId" id="pay_case_id" />
-                <input type="hidden" name="expense" id="pay_expense" />
+                <input type="hidden" name="orderId" value="${orderId}" />
                 <input type="hidden" name="address" id="pay_address" />
                 <input type="hidden" name="phone" id="pay_phone" />
                 <input type="hidden" name="inName" id="in_name" />
@@ -161,8 +160,6 @@
      * 提交支付
      */
     function submit_pay(){
-        var id = $("#case_id").val();
-        var expense = $("#expense span").text();
         var address = $("#address").val();
         if(address==""){
             alert("地址不能为空");
@@ -187,8 +184,6 @@
             $("#invoice").focus();
             return;
         }
-        $("#pay_case_id").val(id);
-        $("#pay_expense").val(expense);
         $("#pay_address").val(address);
         $("#pay_phone").val(phone);
         $("#in_name").val(company==null?person:company);