kelude / canrd-patent · Commits

Commit 01a7d9c352134f95877e9405971065c176f0b173

Authored by maoyangou
1 parent be773884

model problem

Inline Side-by-side
Showing 52 changed files with 1291 additions and 774 deletions
.idea/artifacts/patent_war_exploded.xml
  View file @01a7d9c
... ... @@ -18,6 +18,7 @@
18 18 <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" />
19 19 <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" />
20 20 <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.2.3.RELEASE" />
  21 + <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
21 22 <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.3.0" />
22 23 <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.2.2" />
23 24 <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" />
... ...
.idea/workspace.xml
  View file @01a7d9c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" />
  4 + <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
  6 + <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="" />
  7 + <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="" />
  8 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-detail.jsp" afterPath="" />
  9 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-manage.jsp" afterPath="" />
  10 + <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" />
  11 + <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" />
  12 + <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" />
  13 + <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" />
  14 + <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" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />
  17 + <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" />
  18 + <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" />
  19 + <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" />
  20 + <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" />
  21 + <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" />
  22 + <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" />
  23 + <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" />
  24 + <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" />
  25 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />
  26 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />
  27 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />
  28 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" />
  29 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" />
  30 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" />
  31 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" />
  32 + <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" />
  33 + <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" />
  34 + <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" />
  35 + <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" />
  36 + <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" />
  37 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" />
  38 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" />
  39 + <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" />
  40 + <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" />
  41 + <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" />
  42 + <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" />
  43 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" />
  44 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" />
  45 + <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" />
  46 + <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" />
  47 + <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" />
  48 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
  49 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/sql/ddl.sql" afterPath="$PROJECT_DIR$/doc/sql/ddl.sql" />
  50 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />
  51 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />
  52 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  53 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay_result.jsp" afterPath="$PROJECT_DIR$/target/patent/pay_result.jsp" />
  54 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
  55 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  56 + </list>
5 57 <ignored path="patent.iws" />
6 58 <ignored path=".idea/workspace.xml" />
7 59 <ignored path="$PROJECT_DIR$/target/" />
... ... @@ -23,105 +75,101 @@
23 75 </component>
24 76 <component name="FileEditorManager">
25 77 <leaf>
26   - <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="true">
  78 + <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="false">
27 79 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
28 80 <provider selected="true" editor-type-id="text-editor">
29   - <state vertical-scroll-proportion="3.0097086">
30   - <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
  81 + <state vertical-scroll-proportion="0.0">
  82 + <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
31 83 <folding />
32 84 </state>
33 85 </provider>
34 86 </entry>
35 87 </file>
36   - <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
37   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  88 + <file leaf-file-name="Casement.java" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
38 90 <provider selected="true" editor-type-id="text-editor">
39 91 <state vertical-scroll-proportion="0.0">
40   - <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  92 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
41 93 <folding />
42 94 </state>
43 95 </provider>
44 96 </entry>
45 97 </file>
46   - <file leaf-file-name="error.jsp" pinned="false" current-in-tab="false">
47   - <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
  98 + <file leaf-file-name="CasementDataController.java" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
48 100 <provider selected="true" editor-type-id="text-editor">
49   - <state vertical-scroll-proportion="-3.75">
50   - <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
  101 + <state vertical-scroll-proportion="0.0">
  102 + <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
51 103 <folding />
52 104 </state>
53 105 </provider>
54 106 </entry>
55 107 </file>
56   - <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="false">
57   - <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
  108 + <file leaf-file-name="CasementPageController.java" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
58 110 <provider selected="true" editor-type-id="text-editor">
59   - <state vertical-scroll-proportion="-16.25">
60   - <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
  111 + <state vertical-scroll-proportion="0.0">
  112 + <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
61 113 <folding />
62 114 </state>
63 115 </provider>
64 116 </entry>
65 117 </file>
66   - <file leaf-file-name="Assert.java" pinned="false" current-in-tab="false">
67   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
  118 + <file leaf-file-name="CaseHandlingService.java" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
68 120 <provider selected="true" editor-type-id="text-editor">
69 121 <state vertical-scroll-proportion="0.0">
70   - <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
  122 + <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
71 123 <folding />
72 124 </state>
73 125 </provider>
74 126 </entry>
75 127 </file>
76   - <file leaf-file-name="OrderService.java" pinned="false" current-in-tab="false">
77   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
  128 + <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">
  129 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
78 130 <provider selected="true" editor-type-id="text-editor">
79   - <state vertical-scroll-proportion="0.0">
80   - <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
81   - <folding>
82   - <element signature="imports" expanded="true" />
83   - <element signature="e#1787#1788#0" expanded="true" />
84   - <element signature="e#1849#1850#0" expanded="true" />
85   - </folding>
  131 + <state vertical-scroll-proportion="-0.0">
  132 + <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
  133 + <folding />
86 134 </state>
87 135 </provider>
88 136 </entry>
89 137 </file>
90   - <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
91   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  138 + <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="true">
  139 + <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
92 140 <provider selected="true" editor-type-id="text-editor">
93   - <state vertical-scroll-proportion="-15.625">
94   - <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
  141 + <state vertical-scroll-proportion="0.0">
  142 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
95 143 <folding />
96 144 </state>
97 145 </provider>
98 146 </entry>
99 147 </file>
100   - <file leaf-file-name="notice.jsp" pinned="false" current-in-tab="false">
101   - <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
  148 + <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
  149 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
102 150 <provider selected="true" editor-type-id="text-editor">
103   - <state vertical-scroll-proportion="-16.875">
104   - <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
  151 + <state vertical-scroll-proportion="0.0">
  152 + <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
105 153 <folding />
106 154 </state>
107 155 </provider>
108 156 </entry>
109 157 </file>
110   - <file leaf-file-name="OrderDataController.java" pinned="false" current-in-tab="false">
111   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
  158 + <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
  159 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
112 160 <provider selected="true" editor-type-id="text-editor">
113 161 <state vertical-scroll-proportion="0.0">
114   - <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
  162 + <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
115 163 <folding />
116 164 </state>
117 165 </provider>
118 166 </entry>
119 167 </file>
120   - <file leaf-file-name="OrderMapper.java" pinned="false" current-in-tab="false">
121   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">
  168 + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
  169 + <entry file="file://$PROJECT_DIR$/pom.xml">
122 170 <provider selected="true" editor-type-id="text-editor">
123 171 <state vertical-scroll-proportion="0.0">
124   - <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
  172 + <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
125 173 <folding />
126 174 </state>
127 175 </provider>
... ... @@ -151,10 +199,6 @@
151 199 <component name="IdeDocumentHistory">
152 200 <option name="CHANGED_PATHS">
153 201 <list>
154   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseType.java" />
155   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" />
156   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceEnum.java" />
157   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" />
158 202 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" />
159 203 <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
160 204 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
... ... @@ -182,7 +226,6 @@
182 226 <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" />
183 227 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentPageController.java" />
184 228 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
185   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
186 229 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" />
187 230 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
188 231 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
... ... @@ -199,9 +242,14 @@
199 242 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
200 243 <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
201 244 <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
202   - <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
203 245 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
  246 + <option value="$PROJECT_DIR$/pom.xml" />
  247 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
  248 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
204 249 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
  250 + <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  251 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
  252 + <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
205 253 </list>
206 254 </option>
207 255 </component>
... ... @@ -312,6 +360,9 @@
312 360 <sortByType />
313 361 </navigator>
314 362 <panes>
  363 + <pane id="Scope" />
  364 + <pane id="PackagesPane" />
  365 + <pane id="Scratches" />
315 366 <pane id="ProjectPane">
316 367 <subPane>
317 368 <PATH>
... ... @@ -330,11 +381,120 @@
330 381 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331 382 </PATH_ELEMENT>
332 383 </PATH>
  384 + <PATH>
  385 + <PATH_ELEMENT>
  386 + <option name="myItemId" value="patent" />
  387 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  388 + </PATH_ELEMENT>
  389 + <PATH_ELEMENT>
  390 + <option name="myItemId" value="canrd-patent" />
  391 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  392 + </PATH_ELEMENT>
  393 + <PATH_ELEMENT>
  394 + <option name="myItemId" value="src" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="test" />
  399 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  400 + </PATH_ELEMENT>
  401 + <PATH_ELEMENT>
  402 + <option name="myItemId" value="resources" />
  403 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  404 + </PATH_ELEMENT>
  405 + </PATH>
  406 + <PATH>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="patent" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  410 + </PATH_ELEMENT>
  411 + <PATH_ELEMENT>
  412 + <option name="myItemId" value="canrd-patent" />
  413 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  414 + </PATH_ELEMENT>
  415 + <PATH_ELEMENT>
  416 + <option name="myItemId" value="src" />
  417 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  418 + </PATH_ELEMENT>
  419 + <PATH_ELEMENT>
  420 + <option name="myItemId" value="test" />
  421 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  422 + </PATH_ELEMENT>
  423 + <PATH_ELEMENT>
  424 + <option name="myItemId" value="resources" />
  425 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  426 + </PATH_ELEMENT>
  427 + <PATH_ELEMENT>
  428 + <option name="myItemId" value="mbg" />
  429 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  430 + </PATH_ELEMENT>
  431 + </PATH>
  432 + <PATH>
  433 + <PATH_ELEMENT>
  434 + <option name="myItemId" value="patent" />
  435 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  436 + </PATH_ELEMENT>
  437 + <PATH_ELEMENT>
  438 + <option name="myItemId" value="canrd-patent" />
  439 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  440 + </PATH_ELEMENT>
  441 + <PATH_ELEMENT>
  442 + <option name="myItemId" value="src" />
  443 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  444 + </PATH_ELEMENT>
  445 + <PATH_ELEMENT>
  446 + <option name="myItemId" value="test" />
  447 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  448 + </PATH_ELEMENT>
  449 + </PATH>
  450 + <PATH>
  451 + <PATH_ELEMENT>
  452 + <option name="myItemId" value="patent" />
  453 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  454 + </PATH_ELEMENT>
  455 + <PATH_ELEMENT>
  456 + <option name="myItemId" value="canrd-patent" />
  457 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  458 + </PATH_ELEMENT>
  459 + <PATH_ELEMENT>
  460 + <option name="myItemId" value="src" />
  461 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  462 + </PATH_ELEMENT>
  463 + </PATH>
  464 + <PATH>
  465 + <PATH_ELEMENT>
  466 + <option name="myItemId" value="patent" />
  467 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  468 + </PATH_ELEMENT>
  469 + <PATH_ELEMENT>
  470 + <option name="myItemId" value="canrd-patent" />
  471 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  472 + </PATH_ELEMENT>
  473 + <PATH_ELEMENT>
  474 + <option name="myItemId" value="doc" />
  475 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  476 + </PATH_ELEMENT>
  477 + </PATH>
  478 + <PATH>
  479 + <PATH_ELEMENT>
  480 + <option name="myItemId" value="patent" />
  481 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  482 + </PATH_ELEMENT>
  483 + <PATH_ELEMENT>
  484 + <option name="myItemId" value="canrd-patent" />
  485 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  486 + </PATH_ELEMENT>
  487 + <PATH_ELEMENT>
  488 + <option name="myItemId" value="doc" />
  489 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  490 + </PATH_ELEMENT>
  491 + <PATH_ELEMENT>
  492 + <option name="myItemId" value="sql" />
  493 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  494 + </PATH_ELEMENT>
  495 + </PATH>
333 496 </subPane>
334 497 </pane>
335   - <pane id="Scope" />
336   - <pane id="PackagesPane" />
337   - <pane id="Scratches" />
338 498 </panes>
339 499 </component>
340 500 <component name="PropertiesComponent">
... ... @@ -821,57 +981,58 @@
821 981 <workItem from="1469026864774" duration="4528000" />
822 982 <workItem from="1469112269396" duration="6881000" />
823 983 <workItem from="1469242140776" duration="1637000" />
824   - <workItem from="1469243959439" duration="3683000" />
  984 + <workItem from="1469243959439" duration="8023000" />
  985 + <workItem from="1469259852751" duration="117000" />
825 986 </task>
826 987 <servers />
827 988 </component>
828 989 <component name="TimeTrackingManager">
829   - <option name="totallyTimeSpent" value="81538000" />
  990 + <option name="totallyTimeSpent" value="85995000" />
830 991 </component>
831 992 <component name="ToolWindowManager">
832   - <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
833   - <editor active="false" />
  993 + <frame x="1280" y="23" width="1920" height="1057" extended-state="0" />
  994 + <editor active="true" />
834 995 <layout>
835 996 <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" />
836 997 <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" />
837 998 <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" />
838   - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.6507772" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  999 + <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" />
839 1000 <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" />
840   - <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" />
841   - <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" />
  1001 + <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" />
842 1002 <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" />
843 1003 <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" />
844   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5316062" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
845 1004 <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" />
846 1005 <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" />
847 1006 <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" />
848   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31619936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
849 1007 <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" />
850 1008 <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" />
851 1009 <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" />
852   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10915868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1010 + <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" />
853 1011 <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" />
854   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15601704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
855   - <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" />
  1012 + <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" />
856 1013 <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" />
  1014 + <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" />
857 1015 <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" />
858 1016 <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" />
  1017 + <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" />
  1018 + <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" />
  1019 + <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" />
859 1020 <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" />
860 1021 <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" />
861 1022 </layout>
862 1023 <layout-to-restore>
863   - <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" />
864 1024 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
865   - <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" />
  1025 + <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" />
866 1026 <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" />
  1027 + <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" />
867 1028 <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" />
868 1029 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
869 1030 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
870 1031 <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" />
871 1032 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
872 1033 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24313408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
873   - <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" />
874 1034 <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" />
  1035 + <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" />
875 1036 <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" />
876 1037 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
877 1038 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
... ... @@ -917,41 +1078,6 @@
917 1078 <option name="FILTER_TARGETS" value="false" />
918 1079 </component>
919 1080 <component name="editorHistoryManager">
920   - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
921   - <provider selected="true" editor-type-id="text-editor">
922   - <state vertical-scroll-proportion="0.0">
923   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
924   - </state>
925   - </provider>
926   - </entry>
927   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java">
928   - <provider selected="true" editor-type-id="text-editor">
929   - <state vertical-scroll-proportion="0.0">
930   - <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
931   - </state>
932   - </provider>
933   - </entry>
934   - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
935   - <provider selected="true" editor-type-id="text-editor">
936   - <state vertical-scroll-proportion="7.9166665">
937   - <caret line="197" column="60" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
938   - </state>
939   - </provider>
940   - </entry>
941   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
942   - <provider selected="true" editor-type-id="text-editor">
943   - <state vertical-scroll-proportion="0.0">
944   - <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
945   - </state>
946   - </provider>
947   - </entry>
948   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java">
949   - <provider selected="true" editor-type-id="text-editor">
950   - <state vertical-scroll-proportion="0.0">
951   - <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" />
952   - </state>
953   - </provider>
954   - </entry>
955 1081 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java">
956 1082 <provider selected="true" editor-type-id="text-editor">
957 1083 <state vertical-scroll-proportion="0.0">
... ... @@ -1010,7 +1136,6 @@
1010 1136 <provider selected="true" editor-type-id="text-editor">
1011 1137 <state vertical-scroll-proportion="0.22900763">
1012 1138 <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
1013   - <folding />
1014 1139 </state>
1015 1140 </provider>
1016 1141 </entry>
... ... @@ -1050,14 +1175,6 @@
1050 1175 </state>
1051 1176 </provider>
1052 1177 </entry>
1053   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1054   - <provider selected="true" editor-type-id="text-editor">
1055   - <state vertical-scroll-proportion="0.0">
1056   - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1057   - <folding />
1058   - </state>
1059   - </provider>
1060   - </entry>
1061 1178 <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
1062 1179 <provider selected="true" editor-type-id="text-editor">
1063 1180 <state vertical-scroll-proportion="0.0">
... ... @@ -1079,27 +1196,6 @@
1079 1196 </state>
1080 1197 </provider>
1081 1198 </entry>
1082   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1083   - <provider selected="true" editor-type-id="text-editor">
1084   - <state vertical-scroll-proportion="0.0">
1085   - <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
1086   - </state>
1087   - </provider>
1088   - </entry>
1089   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
1090   - <provider selected="true" editor-type-id="text-editor">
1091   - <state vertical-scroll-proportion="0.0">
1092   - <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
1093   - </state>
1094   - </provider>
1095   - </entry>
1096   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
1097   - <provider selected="true" editor-type-id="text-editor">
1098   - <state vertical-scroll-proportion="0.0">
1099   - <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
1100   - </state>
1101   - </provider>
1102   - </entry>
1103 1199 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
1104 1200 <provider selected="true" editor-type-id="text-editor">
1105 1201 <state vertical-scroll-proportion="0.0">
... ... @@ -1135,14 +1231,6 @@
1135 1231 </state>
1136 1232 </provider>
1137 1233 </entry>
1138   - <entry file="file://$PROJECT_DIR$/pom.xml">
1139   - <provider selected="true" editor-type-id="text-editor">
1140   - <state vertical-scroll-proportion="0.0">
1141   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1142   - <folding />
1143   - </state>
1144   - </provider>
1145   - </entry>
1146 1234 <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">
1147 1235 <provider selected="true" editor-type-id="text-editor">
1148 1236 <state vertical-scroll-proportion="0.0">
... ... @@ -1155,7 +1243,6 @@
1155 1243 <provider selected="true" editor-type-id="text-editor">
1156 1244 <state vertical-scroll-proportion="0.0">
1157 1245 <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
1158   - <folding />
1159 1246 </state>
1160 1247 </provider>
1161 1248 </entry>
... ... @@ -1163,7 +1250,6 @@
1163 1250 <provider selected="true" editor-type-id="text-editor">
1164 1251 <state vertical-scroll-proportion="0.0">
1165 1252 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1166   - <folding />
1167 1253 </state>
1168 1254 </provider>
1169 1255 </entry>
... ... @@ -1171,15 +1257,6 @@
1171 1257 <provider selected="true" editor-type-id="text-editor">
1172 1258 <state vertical-scroll-proportion="1.2162921">
1173 1259 <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" />
1174   - <folding />
1175   - </state>
1176   - </provider>
1177   - </entry>
1178   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1179   - <provider selected="true" editor-type-id="text-editor">
1180   - <state vertical-scroll-proportion="0.8623595">
1181   - <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
1182   - <folding />
1183 1260 </state>
1184 1261 </provider>
1185 1262 </entry>
... ... @@ -1187,9 +1264,7 @@
1187 1264 <provider selected="true" editor-type-id="text-editor">
1188 1265 <state vertical-scroll-proportion="0.0">
1189 1266 <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />
1190   - <folding>
1191   - <marker date="1469245798000" expanded="true" signature="-1:-1" placeholder="update order..." />
1192   - </folding>
  1267 + <folding />
1193 1268 </state>
1194 1269 </provider>
1195 1270 </entry>
... ... @@ -1197,23 +1272,6 @@
1197 1272 <provider selected="true" editor-type-id="text-editor">
1198 1273 <state vertical-scroll-proportion="-6.111111">
1199 1274 <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
1200   - <folding />
1201   - </state>
1202   - </provider>
1203   - </entry>
1204   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1205   - <provider selected="true" editor-type-id="text-editor">
1206   - <state vertical-scroll-proportion="0.0">
1207   - <caret line="41" column="26" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
1208   - <folding />
1209   - </state>
1210   - </provider>
1211   - </entry>
1212   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
1213   - <provider selected="true" editor-type-id="text-editor">
1214   - <state vertical-scroll-proportion="0.0">
1215   - <caret line="51" column="46" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="46" />
1216   - <folding />
1217 1275 </state>
1218 1276 </provider>
1219 1277 </entry>
... ... @@ -1221,7 +1279,6 @@
1221 1279 <provider selected="true" editor-type-id="text-editor">
1222 1280 <state vertical-scroll-proportion="0.0">
1223 1281 <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
1224   - <folding />
1225 1282 </state>
1226 1283 </provider>
1227 1284 </entry>
... ... @@ -1229,7 +1286,6 @@
1229 1286 <provider selected="true" editor-type-id="text-editor">
1230 1287 <state vertical-scroll-proportion="0.0">
1231 1288 <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
1232   - <folding />
1233 1289 </state>
1234 1290 </provider>
1235 1291 </entry>
... ... @@ -1237,7 +1293,6 @@
1237 1293 <provider selected="true" editor-type-id="text-editor">
1238 1294 <state vertical-scroll-proportion="-16.25">
1239 1295 <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1240   - <folding />
1241 1296 </state>
1242 1297 </provider>
1243 1298 </entry>
... ... @@ -1245,7 +1300,6 @@
1245 1300 <provider selected="true" editor-type-id="text-editor">
1246 1301 <state vertical-scroll-proportion="-4.9562936">
1247 1302 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1248   - <folding />
1249 1303 </state>
1250 1304 </provider>
1251 1305 </entry>
... ... @@ -1253,7 +1307,6 @@
1253 1307 <provider selected="true" editor-type-id="text-editor">
1254 1308 <state vertical-scroll-proportion="-3.75">
1255 1309 <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
1256   - <folding />
1257 1310 </state>
1258 1311 </provider>
1259 1312 </entry>
... ... @@ -1261,22 +1314,75 @@
1261 1314 <provider selected="true" editor-type-id="text-editor">
1262 1315 <state vertical-scroll-proportion="-16.875">
1263 1316 <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
  1317 + </state>
  1318 + </provider>
  1319 + </entry>
  1320 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
  1321 + <provider selected="true" editor-type-id="text-editor">
  1322 + <state vertical-scroll-proportion="0.0">
  1323 + <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
  1324 + </state>
  1325 + </provider>
  1326 + </entry>
  1327 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  1328 + <provider selected="true" editor-type-id="text-editor">
  1329 + <state vertical-scroll-proportion="0.0">
  1330 + <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
1264 1331 <folding />
1265 1332 </state>
1266 1333 </provider>
1267 1334 </entry>
1268   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  1335 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java">
  1336 + <provider selected="true" editor-type-id="text-editor">
  1337 + <state vertical-scroll-proportion="0.0">
  1338 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1339 + </state>
  1340 + </provider>
  1341 + </entry>
  1342 + <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2.jar!/META-INF/c.tld">
1269 1343 <provider selected="true" editor-type-id="text-editor">
1270   - <state vertical-scroll-proportion="-15.625">
1271   - <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
  1344 + <state vertical-scroll-proportion="0.0">
  1345 + <caret line="108" column="16" selection-start-line="108" selection-start-column="16" selection-end-line="108" selection-end-column="16" />
1272 1346 <folding />
1273 1347 </state>
1274 1348 </provider>
1275 1349 </entry>
1276   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
  1350 + <entry file="file://$PROJECT_DIR$/pom.xml">
1277 1351 <provider selected="true" editor-type-id="text-editor">
1278 1352 <state vertical-scroll-proportion="0.0">
1279   - <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
  1353 + <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
  1354 + <folding />
  1355 + </state>
  1356 + </provider>
  1357 + </entry>
  1358 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
  1359 + <provider selected="true" editor-type-id="text-editor">
  1360 + <state vertical-scroll-proportion="0.0">
  1361 + <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
  1362 + <folding>
  1363 + <element signature="imports" expanded="true" />
  1364 + <element signature="e#325#326#0" expanded="true" />
  1365 + <element signature="e#375#376#0" expanded="true" />
  1366 + <element signature="e#415#416#0" expanded="true" />
  1367 + </folding>
  1368 + </state>
  1369 + </provider>
  1370 + </entry>
  1371 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
  1372 + <provider selected="true" editor-type-id="text-editor">
  1373 + <state vertical-scroll-proportion="0.0">
  1374 + <caret line="162" column="21" selection-start-line="162" selection-start-column="21" selection-end-line="162" selection-end-column="21" />
  1375 + <folding>
  1376 + <element signature="e#10630#10631#0" expanded="true" />
  1377 + <element signature="e#10690#10691#0" expanded="true" />
  1378 + </folding>
  1379 + </state>
  1380 + </provider>
  1381 + </entry>
  1382 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1383 + <provider selected="true" editor-type-id="text-editor">
  1384 + <state vertical-scroll-proportion="0.0">
  1385 + <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
1280 1386 <folding />
1281 1387 </state>
1282 1388 </provider>
... ... @@ -1284,27 +1390,80 @@
1284 1390 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
1285 1391 <provider selected="true" editor-type-id="text-editor">
1286 1392 <state vertical-scroll-proportion="0.0">
1287   - <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
  1393 + <caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
1288 1394 <folding>
1289 1395 <element signature="imports" expanded="true" />
1290   - <element signature="e#1787#1788#0" expanded="true" />
1291   - <element signature="e#1849#1850#0" expanded="true" />
1292 1396 </folding>
1293 1397 </state>
1294 1398 </provider>
1295 1399 </entry>
1296   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  1400 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  1401 + <provider selected="true" editor-type-id="text-editor">
  1402 + <state vertical-scroll-proportion="-19.75">
  1403 + <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
  1404 + </state>
  1405 + </provider>
  1406 + </entry>
  1407 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
1297 1408 <provider selected="true" editor-type-id="text-editor">
1298 1409 <state vertical-scroll-proportion="0.0">
1299   - <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  1410 + <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
  1411 + <folding />
  1412 + </state>
  1413 + </provider>
  1414 + </entry>
  1415 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
  1416 + <provider selected="true" editor-type-id="text-editor">
  1417 + <state vertical-scroll-proportion="0.0">
  1418 + <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
  1419 + <folding />
  1420 + </state>
  1421 + </provider>
  1422 + </entry>
  1423 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
  1424 + <provider selected="true" editor-type-id="text-editor">
  1425 + <state vertical-scroll-proportion="0.0">
  1426 + <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
  1427 + <folding />
  1428 + </state>
  1429 + </provider>
  1430 + </entry>
  1431 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  1432 + <provider selected="true" editor-type-id="text-editor">
  1433 + <state vertical-scroll-proportion="0.0">
  1434 + <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
1300 1435 <folding />
1301 1436 </state>
1302 1437 </provider>
1303 1438 </entry>
1304 1439 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
1305 1440 <provider selected="true" editor-type-id="text-editor">
1306   - <state vertical-scroll-proportion="3.0097086">
1307   - <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
  1441 + <state vertical-scroll-proportion="0.0">
  1442 + <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
  1443 + <folding />
  1444 + </state>
  1445 + </provider>
  1446 + </entry>
  1447 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
  1448 + <provider selected="true" editor-type-id="text-editor">
  1449 + <state vertical-scroll-proportion="0.0">
  1450 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
  1451 + <folding />
  1452 + </state>
  1453 + </provider>
  1454 + </entry>
  1455 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
  1456 + <provider selected="true" editor-type-id="text-editor">
  1457 + <state vertical-scroll-proportion="0.0">
  1458 + <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
  1459 + <folding />
  1460 + </state>
  1461 + </provider>
  1462 + </entry>
  1463 + <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
  1464 + <provider selected="true" editor-type-id="text-editor">
  1465 + <state vertical-scroll-proportion="0.0">
  1466 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1308 1467 <folding />
1309 1468 </state>
1310 1469 </provider>
... ...
doc/.DS_Store
View file @01a7d9c
No preview for this file type
doc/patent.mwb deleted 100644 → 0
View file @be77388
No preview for this file type
doc/patent.mwb.bak deleted 100644 → 0
View file @be77388
No preview for this file type
doc/sql/ddl.sql
  View file @01a7d9c
... ... @@ -5,20 +5,34 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=&#39;TRADITIONAL,ALLOW_INVALID_DATES&#39;;
5 5 ALTER SCHEMA `patent` DEFAULT COLLATE utf8mb4_general_ci ;
6 6  
7 7 CREATE TABLE IF NOT EXISTS `patent`.`casement` (
8   - `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
  8 + `id` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '案件管ç†è¡¨',
9 9 `name` VARCHAR(32) NULL DEFAULT NULL,
10 10 `caseSn` VARCHAR(32) NOT NULL,
11 11 `case_type` VARCHAR(32) NOT NULL COMMENT 'å‘明类型：INVE' /* comment truncated */ /*TION_TYPE
12 12 实用新型：PRACTICAL_NEW
13 13 外观设计：APPEARENCE_DESIGN
14 14 å‘明+新型：INVENTION_NEW*/,
  15 + `case_type_title` VARCHAR(32) NOT NULL,
15 16 `service_type` VARCHAR(32) NOT NULL COMMENT '标准æœåŠ¡ï¼šSTANDE' /* comment truncated */ /*D_SERVICE
16 17 æ‹…ä¿æŽˆæƒï¼šAUTHORITY_GUARANTEE*/,
  18 + `service_type_title` VARCHAR(32) NOT NULL,
17 19 `paid_type` VARCHAR(32) NOT NULL COMMENT '缴纳ï' /* comment truncated */ /*šPAID
18 20 ä¸ç¼´çº³ï¼šNO_PAID*/,
  21 + `paid_type_title` VARCHAR(32) NOT NULL,
19 22 `reduce_type` VARCHAR(32) NULL DEFAULT NULL,
  23 + `reduce_type_title` VARCHAR(32) NULL DEFAULT NULL,
20 24 `expense` BIGINT(20) NOT NULL,
21   - `formula` VARCHAR(128) NULL DEFAULT NULL COMMENT '计算公å¼',
  25 + `order_status` VARCHAR(32) NOT NULL COMMENT 'SUBMITED(å·²æ' /* comment truncated */ /*交)
  26 +PENDING(正在支付)
  27 +PAID_SUCCESS(支付æˆåŠŸ)
  28 +PAID_FAILURE(支付失败)*/,
  29 + `order_status_title` VARCHAR(32) NULL DEFAULT NULL,
  30 + `case_status` VARCHAR(32) NOT NULL COMMENT 'INIT(åˆå' /* comment truncated */ /*‹åŒ–)
  31 +COMPLETED(完æˆ)*/,
  32 + `case_status_title` VARCHAR(32) NULL DEFAULT NULL,
  33 + `member_id` VARCHAR(32) NOT NULL COMMENT '登陆ID',
  34 + `create_date` DATETIME NOT NULL,
  35 + `update_date` DATETIME NOT NULL,
22 36 PRIMARY KEY (`id`))
23 37 ENGINE = InnoDB
24 38 DEFAULT CHARACTER SET = utf8mb4;
... ... @@ -29,6 +43,25 @@ COLLATE = utf8mb4_general_ci ;
29 43 ALTER TABLE `patent`.`mybatis_test`
30 44 COLLATE = utf8mb4_general_ci ;
31 45  
  46 +CREATE TABLE IF NOT EXISTS `patent`.`orders` (
  47 + `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
  48 + `case_id` BIGINT(20) NOT NULL,
  49 + `quantity` BIGINT(20) NOT NULL,
  50 + `expense` BIGINT(20) NOT NULL,
  51 + `pay_type` VARCHAR(32) NOT NULL DEFAULT '支付å®' COMMENT '支付表',
  52 + `order_status` VARCHAR(32) NOT NULL COMMENT 'SUBMITED(å·²æ' /* comment truncated */ /*交)
  53 +PENDING(正在支付)
  54 +PAID_SUCCESS(支付æˆåŠŸ)
  55 +PAID_FAILURE(支付失败)*/,
  56 + `order_status_title` VARCHAR(32) NOT NULL,
  57 + `isCanceled` TINYINT(1) NOT NULL,
  58 + `member_id` VARCHAR(32) NOT NULL,
  59 + `create_date` DATETIME NOT NULL,
  60 + `update_date` DATETIME NOT NULL,
  61 + PRIMARY KEY (`id`))
  62 +ENGINE = InnoDB
  63 +DEFAULT CHARACTER SET = utf8mb4;
  64 +
32 65  
33 66 SET SQL_MODE=@OLD_SQL_MODE;
34 67 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
... ...
patent.iml
  View file @01a7d9c
... ... @@ -41,6 +41,7 @@
41 41 <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" />
42 42 <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" />
43 43 <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.3.RELEASE" level="project" />
  44 + <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
44 45 <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.3.0" level="project" />
45 46 <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
46 47 <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" />
... ...
... ... @@ -103,6 +103,11 @@
103 103 <version>4.2.3.RELEASE</version>
104 104 </dependency>
105 105 <dependency>
  106 + <groupId>jstl</groupId>
  107 + <artifactId>jstl</artifactId>
  108 + <version>1.2</version>
  109 + </dependency>
  110 + <dependency>
106 111 <groupId>org.mybatis</groupId>
107 112 <artifactId>mybatis</artifactId>
108 113 <version>3.3.0</version>
... ...
src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java 0 → 100644
  View file @01a7d9c
  1 +package com.canrd.patent.dal.dto;
  2 +
  3 +import com.canrd.patent.dal.model.Casement;
  4 +import com.canrd.patent.dal.model.Order;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * Created by ouyangmao on 16/7/23.
  10 + */
  11 +public class OrderListOutputDto extends Order{
  12 + Casement casement;
  13 +
  14 + public Casement getCasement() {
  15 + return casement;
  16 + }
  17 +
  18 + public void setCasement(Casement casement) {
  19 + this.casement = casement;
  20 + }
  21 +}
... ...
src/main/java/com/canrd/patent/dal/model/Casement.java
  View file @01a7d9c
... ... @@ -37,6 +37,14 @@ public class Casement {
37 37  
38 38 /**
39 39 * This field was generated by MyBatis Generator.
  40 + * This field corresponds to the database column casement.case_type_title
  41 + *
  42 + * @mbggenerated
  43 + */
  44 + private String caseTypeTitle;
  45 +
  46 + /**
  47 + * This field was generated by MyBatis Generator.
40 48 * This field corresponds to the database column casement.service_type
41 49 *
42 50 * @mbggenerated
... ... @@ -45,6 +53,14 @@ public class Casement {
45 53  
46 54 /**
47 55 * This field was generated by MyBatis Generator.
  56 + * This field corresponds to the database column casement.service_type_title
  57 + *
  58 + * @mbggenerated
  59 + */
  60 + private String serviceTypeTitle;
  61 +
  62 + /**
  63 + * This field was generated by MyBatis Generator.
48 64 * This field corresponds to the database column casement.paid_type
49 65 *
50 66 * @mbggenerated
... ... @@ -53,6 +69,14 @@ public class Casement {
53 69  
54 70 /**
55 71 * This field was generated by MyBatis Generator.
  72 + * This field corresponds to the database column casement.paid_type_title
  73 + *
  74 + * @mbggenerated
  75 + */
  76 + private String paidTypeTitle;
  77 +
  78 + /**
  79 + * This field was generated by MyBatis Generator.
56 80 * This field corresponds to the database column casement.reduce_type
57 81 *
58 82 * @mbggenerated
... ... @@ -61,6 +85,14 @@ public class Casement {
61 85  
62 86 /**
63 87 * This field was generated by MyBatis Generator.
  88 + * This field corresponds to the database column casement.reduce_type_title
  89 + *
  90 + * @mbggenerated
  91 + */
  92 + private String reduceTypeTitle;
  93 +
  94 + /**
  95 + * This field was generated by MyBatis Generator.
64 96 * This field corresponds to the database column casement.expense
65 97 *
66 98 * @mbggenerated
... ... @@ -205,6 +237,30 @@ public class Casement {
205 237  
206 238 /**
207 239 * This method was generated by MyBatis Generator.
  240 + * This method returns the value of the database column casement.case_type_title
  241 + *
  242 + * @return the value of casement.case_type_title
  243 + *
  244 + * @mbggenerated
  245 + */
  246 + public String getCaseTypeTitle() {
  247 + return caseTypeTitle;
  248 + }
  249 +
  250 + /**
  251 + * This method was generated by MyBatis Generator.
  252 + * This method sets the value of the database column casement.case_type_title
  253 + *
  254 + * @param caseTypeTitle the value for casement.case_type_title
  255 + *
  256 + * @mbggenerated
  257 + */
  258 + public void setCaseTypeTitle(String caseTypeTitle) {
  259 + this.caseTypeTitle = caseTypeTitle == null ? null : caseTypeTitle.trim();
  260 + }
  261 +
  262 + /**
  263 + * This method was generated by MyBatis Generator.
208 264 * This method returns the value of the database column casement.service_type
209 265 *
210 266 * @return the value of casement.service_type
... ... @@ -229,6 +285,30 @@ public class Casement {
229 285  
230 286 /**
231 287 * This method was generated by MyBatis Generator.
  288 + * This method returns the value of the database column casement.service_type_title
  289 + *
  290 + * @return the value of casement.service_type_title
  291 + *
  292 + * @mbggenerated
  293 + */
  294 + public String getServiceTypeTitle() {
  295 + return serviceTypeTitle;
  296 + }
  297 +
  298 + /**
  299 + * This method was generated by MyBatis Generator.
  300 + * This method sets the value of the database column casement.service_type_title
  301 + *
  302 + * @param serviceTypeTitle the value for casement.service_type_title
  303 + *
  304 + * @mbggenerated
  305 + */
  306 + public void setServiceTypeTitle(String serviceTypeTitle) {
  307 + this.serviceTypeTitle = serviceTypeTitle == null ? null : serviceTypeTitle.trim();
  308 + }
  309 +
  310 + /**
  311 + * This method was generated by MyBatis Generator.
232 312 * This method returns the value of the database column casement.paid_type
233 313 *
234 314 * @return the value of casement.paid_type
... ... @@ -253,6 +333,30 @@ public class Casement {
253 333  
254 334 /**
255 335 * This method was generated by MyBatis Generator.
  336 + * This method returns the value of the database column casement.paid_type_title
  337 + *
  338 + * @return the value of casement.paid_type_title
  339 + *
  340 + * @mbggenerated
  341 + */
  342 + public String getPaidTypeTitle() {
  343 + return paidTypeTitle;
  344 + }
  345 +
  346 + /**
  347 + * This method was generated by MyBatis Generator.
  348 + * This method sets the value of the database column casement.paid_type_title
  349 + *
  350 + * @param paidTypeTitle the value for casement.paid_type_title
  351 + *
  352 + * @mbggenerated
  353 + */
  354 + public void setPaidTypeTitle(String paidTypeTitle) {
  355 + this.paidTypeTitle = paidTypeTitle == null ? null : paidTypeTitle.trim();
  356 + }
  357 +
  358 + /**
  359 + * This method was generated by MyBatis Generator.
256 360 * This method returns the value of the database column casement.reduce_type
257 361 *
258 362 * @return the value of casement.reduce_type
... ... @@ -277,6 +381,30 @@ public class Casement {
277 381  
278 382 /**
279 383 * This method was generated by MyBatis Generator.
  384 + * This method returns the value of the database column casement.reduce_type_title
  385 + *
  386 + * @return the value of casement.reduce_type_title
  387 + *
  388 + * @mbggenerated
  389 + */
  390 + public String getReduceTypeTitle() {
  391 + return reduceTypeTitle;
  392 + }
  393 +
  394 + /**
  395 + * This method was generated by MyBatis Generator.
  396 + * This method sets the value of the database column casement.reduce_type_title
  397 + *
  398 + * @param reduceTypeTitle the value for casement.reduce_type_title
  399 + *
  400 + * @mbggenerated
  401 + */
  402 + public void setReduceTypeTitle(String reduceTypeTitle) {
  403 + this.reduceTypeTitle = reduceTypeTitle == null ? null : reduceTypeTitle.trim();
  404 + }
  405 +
  406 + /**
  407 + * This method was generated by MyBatis Generator.
280 408 * This method returns the value of the database column casement.expense
281 409 *
282 410 * @return the value of casement.expense
... ...
src/main/java/com/canrd/patent/dal/model/CasementExample.java
  View file @01a7d9c
... ... @@ -465,6 +465,76 @@ public class CasementExample {
465 465 return (Criteria) this;
466 466 }
467 467  
  468 + public Criteria andCaseTypeTitleIsNull() {
  469 + addCriterion("case_type_title is null");
  470 + return (Criteria) this;
  471 + }
  472 +
  473 + public Criteria andCaseTypeTitleIsNotNull() {
  474 + addCriterion("case_type_title is not null");
  475 + return (Criteria) this;
  476 + }
  477 +
  478 + public Criteria andCaseTypeTitleEqualTo(String value) {
  479 + addCriterion("case_type_title =", value, "caseTypeTitle");
  480 + return (Criteria) this;
  481 + }
  482 +
  483 + public Criteria andCaseTypeTitleNotEqualTo(String value) {
  484 + addCriterion("case_type_title <>", value, "caseTypeTitle");
  485 + return (Criteria) this;
  486 + }
  487 +
  488 + public Criteria andCaseTypeTitleGreaterThan(String value) {
  489 + addCriterion("case_type_title >", value, "caseTypeTitle");
  490 + return (Criteria) this;
  491 + }
  492 +
  493 + public Criteria andCaseTypeTitleGreaterThanOrEqualTo(String value) {
  494 + addCriterion("case_type_title >=", value, "caseTypeTitle");
  495 + return (Criteria) this;
  496 + }
  497 +
  498 + public Criteria andCaseTypeTitleLessThan(String value) {
  499 + addCriterion("case_type_title <", value, "caseTypeTitle");
  500 + return (Criteria) this;
  501 + }
  502 +
  503 + public Criteria andCaseTypeTitleLessThanOrEqualTo(String value) {
  504 + addCriterion("case_type_title <=", value, "caseTypeTitle");
  505 + return (Criteria) this;
  506 + }
  507 +
  508 + public Criteria andCaseTypeTitleLike(String value) {
  509 + addCriterion("case_type_title like", value, "caseTypeTitle");
  510 + return (Criteria) this;
  511 + }
  512 +
  513 + public Criteria andCaseTypeTitleNotLike(String value) {
  514 + addCriterion("case_type_title not like", value, "caseTypeTitle");
  515 + return (Criteria) this;
  516 + }
  517 +
  518 + public Criteria andCaseTypeTitleIn(List<String> values) {
  519 + addCriterion("case_type_title in", values, "caseTypeTitle");
  520 + return (Criteria) this;
  521 + }
  522 +
  523 + public Criteria andCaseTypeTitleNotIn(List<String> values) {
  524 + addCriterion("case_type_title not in", values, "caseTypeTitle");
  525 + return (Criteria) this;
  526 + }
  527 +
  528 + public Criteria andCaseTypeTitleBetween(String value1, String value2) {
  529 + addCriterion("case_type_title between", value1, value2, "caseTypeTitle");
  530 + return (Criteria) this;
  531 + }
  532 +
  533 + public Criteria andCaseTypeTitleNotBetween(String value1, String value2) {
  534 + addCriterion("case_type_title not between", value1, value2, "caseTypeTitle");
  535 + return (Criteria) this;
  536 + }
  537 +
468 538 public Criteria andServiceTypeIsNull() {
469 539 addCriterion("service_type is null");
470 540 return (Criteria) this;
... ... @@ -535,6 +605,76 @@ public class CasementExample {
535 605 return (Criteria) this;
536 606 }
537 607  
  608 + public Criteria andServiceTypeTitleIsNull() {
  609 + addCriterion("service_type_title is null");
  610 + return (Criteria) this;
  611 + }
  612 +
  613 + public Criteria andServiceTypeTitleIsNotNull() {
  614 + addCriterion("service_type_title is not null");
  615 + return (Criteria) this;
  616 + }
  617 +
  618 + public Criteria andServiceTypeTitleEqualTo(String value) {
  619 + addCriterion("service_type_title =", value, "serviceTypeTitle");
  620 + return (Criteria) this;
  621 + }
  622 +
  623 + public Criteria andServiceTypeTitleNotEqualTo(String value) {
  624 + addCriterion("service_type_title <>", value, "serviceTypeTitle");
  625 + return (Criteria) this;
  626 + }
  627 +
  628 + public Criteria andServiceTypeTitleGreaterThan(String value) {
  629 + addCriterion("service_type_title >", value, "serviceTypeTitle");
  630 + return (Criteria) this;
  631 + }
  632 +
  633 + public Criteria andServiceTypeTitleGreaterThanOrEqualTo(String value) {
  634 + addCriterion("service_type_title >=", value, "serviceTypeTitle");
  635 + return (Criteria) this;
  636 + }
  637 +
  638 + public Criteria andServiceTypeTitleLessThan(String value) {
  639 + addCriterion("service_type_title <", value, "serviceTypeTitle");
  640 + return (Criteria) this;
  641 + }
  642 +
  643 + public Criteria andServiceTypeTitleLessThanOrEqualTo(String value) {
  644 + addCriterion("service_type_title <=", value, "serviceTypeTitle");
  645 + return (Criteria) this;
  646 + }
  647 +
  648 + public Criteria andServiceTypeTitleLike(String value) {
  649 + addCriterion("service_type_title like", value, "serviceTypeTitle");
  650 + return (Criteria) this;
  651 + }
  652 +
  653 + public Criteria andServiceTypeTitleNotLike(String value) {
  654 + addCriterion("service_type_title not like", value, "serviceTypeTitle");
  655 + return (Criteria) this;
  656 + }
  657 +
  658 + public Criteria andServiceTypeTitleIn(List<String> values) {
  659 + addCriterion("service_type_title in", values, "serviceTypeTitle");
  660 + return (Criteria) this;
  661 + }
  662 +
  663 + public Criteria andServiceTypeTitleNotIn(List<String> values) {
  664 + addCriterion("service_type_title not in", values, "serviceTypeTitle");
  665 + return (Criteria) this;
  666 + }
  667 +
  668 + public Criteria andServiceTypeTitleBetween(String value1, String value2) {
  669 + addCriterion("service_type_title between", value1, value2, "serviceTypeTitle");
  670 + return (Criteria) this;
  671 + }
  672 +
  673 + public Criteria andServiceTypeTitleNotBetween(String value1, String value2) {
  674 + addCriterion("service_type_title not between", value1, value2, "serviceTypeTitle");
  675 + return (Criteria) this;
  676 + }
  677 +
538 678 public Criteria andPaidTypeIsNull() {
539 679 addCriterion("paid_type is null");
540 680 return (Criteria) this;
... ... @@ -605,6 +745,76 @@ public class CasementExample {
605 745 return (Criteria) this;
606 746 }
607 747  
  748 + public Criteria andPaidTypeTitleIsNull() {
  749 + addCriterion("paid_type_title is null");
  750 + return (Criteria) this;
  751 + }
  752 +
  753 + public Criteria andPaidTypeTitleIsNotNull() {
  754 + addCriterion("paid_type_title is not null");
  755 + return (Criteria) this;
  756 + }
  757 +
  758 + public Criteria andPaidTypeTitleEqualTo(String value) {
  759 + addCriterion("paid_type_title =", value, "paidTypeTitle");
  760 + return (Criteria) this;
  761 + }
  762 +
  763 + public Criteria andPaidTypeTitleNotEqualTo(String value) {
  764 + addCriterion("paid_type_title <>", value, "paidTypeTitle");
  765 + return (Criteria) this;
  766 + }
  767 +
  768 + public Criteria andPaidTypeTitleGreaterThan(String value) {
  769 + addCriterion("paid_type_title >", value, "paidTypeTitle");
  770 + return (Criteria) this;
  771 + }
  772 +
  773 + public Criteria andPaidTypeTitleGreaterThanOrEqualTo(String value) {
  774 + addCriterion("paid_type_title >=", value, "paidTypeTitle");
  775 + return (Criteria) this;
  776 + }
  777 +
  778 + public Criteria andPaidTypeTitleLessThan(String value) {
  779 + addCriterion("paid_type_title <", value, "paidTypeTitle");
  780 + return (Criteria) this;
  781 + }
  782 +
  783 + public Criteria andPaidTypeTitleLessThanOrEqualTo(String value) {
  784 + addCriterion("paid_type_title <=", value, "paidTypeTitle");
  785 + return (Criteria) this;
  786 + }
  787 +
  788 + public Criteria andPaidTypeTitleLike(String value) {
  789 + addCriterion("paid_type_title like", value, "paidTypeTitle");
  790 + return (Criteria) this;
  791 + }
  792 +
  793 + public Criteria andPaidTypeTitleNotLike(String value) {
  794 + addCriterion("paid_type_title not like", value, "paidTypeTitle");
  795 + return (Criteria) this;
  796 + }
  797 +
  798 + public Criteria andPaidTypeTitleIn(List<String> values) {
  799 + addCriterion("paid_type_title in", values, "paidTypeTitle");
  800 + return (Criteria) this;
  801 + }
  802 +
  803 + public Criteria andPaidTypeTitleNotIn(List<String> values) {
  804 + addCriterion("paid_type_title not in", values, "paidTypeTitle");
  805 + return (Criteria) this;
  806 + }
  807 +
  808 + public Criteria andPaidTypeTitleBetween(String value1, String value2) {
  809 + addCriterion("paid_type_title between", value1, value2, "paidTypeTitle");
  810 + return (Criteria) this;
  811 + }
  812 +
  813 + public Criteria andPaidTypeTitleNotBetween(String value1, String value2) {
  814 + addCriterion("paid_type_title not between", value1, value2, "paidTypeTitle");
  815 + return (Criteria) this;
  816 + }
  817 +
608 818 public Criteria andReduceTypeIsNull() {
609 819 addCriterion("reduce_type is null");
610 820 return (Criteria) this;
... ... @@ -675,6 +885,76 @@ public class CasementExample {
675 885 return (Criteria) this;
676 886 }
677 887  
  888 + public Criteria andReduceTypeTitleIsNull() {
  889 + addCriterion("reduce_type_title is null");
  890 + return (Criteria) this;
  891 + }
  892 +
  893 + public Criteria andReduceTypeTitleIsNotNull() {
  894 + addCriterion("reduce_type_title is not null");
  895 + return (Criteria) this;
  896 + }
  897 +
  898 + public Criteria andReduceTypeTitleEqualTo(String value) {
  899 + addCriterion("reduce_type_title =", value, "reduceTypeTitle");
  900 + return (Criteria) this;
  901 + }
  902 +
  903 + public Criteria andReduceTypeTitleNotEqualTo(String value) {
  904 + addCriterion("reduce_type_title <>", value, "reduceTypeTitle");
  905 + return (Criteria) this;
  906 + }
  907 +
  908 + public Criteria andReduceTypeTitleGreaterThan(String value) {
  909 + addCriterion("reduce_type_title >", value, "reduceTypeTitle");
  910 + return (Criteria) this;
  911 + }
  912 +
  913 + public Criteria andReduceTypeTitleGreaterThanOrEqualTo(String value) {
  914 + addCriterion("reduce_type_title >=", value, "reduceTypeTitle");
  915 + return (Criteria) this;
  916 + }
  917 +
  918 + public Criteria andReduceTypeTitleLessThan(String value) {
  919 + addCriterion("reduce_type_title <", value, "reduceTypeTitle");
  920 + return (Criteria) this;
  921 + }
  922 +
  923 + public Criteria andReduceTypeTitleLessThanOrEqualTo(String value) {
  924 + addCriterion("reduce_type_title <=", value, "reduceTypeTitle");
  925 + return (Criteria) this;
  926 + }
  927 +
  928 + public Criteria andReduceTypeTitleLike(String value) {
  929 + addCriterion("reduce_type_title like", value, "reduceTypeTitle");
  930 + return (Criteria) this;
  931 + }
  932 +
  933 + public Criteria andReduceTypeTitleNotLike(String value) {
  934 + addCriterion("reduce_type_title not like", value, "reduceTypeTitle");
  935 + return (Criteria) this;
  936 + }
  937 +
  938 + public Criteria andReduceTypeTitleIn(List<String> values) {
  939 + addCriterion("reduce_type_title in", values, "reduceTypeTitle");
  940 + return (Criteria) this;
  941 + }
  942 +
  943 + public Criteria andReduceTypeTitleNotIn(List<String> values) {
  944 + addCriterion("reduce_type_title not in", values, "reduceTypeTitle");
  945 + return (Criteria) this;
  946 + }
  947 +
  948 + public Criteria andReduceTypeTitleBetween(String value1, String value2) {
  949 + addCriterion("reduce_type_title between", value1, value2, "reduceTypeTitle");
  950 + return (Criteria) this;
  951 + }
  952 +
  953 + public Criteria andReduceTypeTitleNotBetween(String value1, String value2) {
  954 + addCriterion("reduce_type_title not between", value1, value2, "reduceTypeTitle");
  955 + return (Criteria) this;
  956 + }
  957 +
678 958 public Criteria andExpenseIsNull() {
679 959 addCriterion("expense is null");
680 960 return (Criteria) this;
... ...
src/main/java/com/canrd/patent/dal/model/Order.java
  View file @01a7d9c
... ... @@ -53,6 +53,14 @@ public class Order {
53 53  
54 54 /**
55 55 * This field was generated by MyBatis Generator.
  56 + * This field corresponds to the database column orders.isCanceled
  57 + *
  58 + * @mbggenerated
  59 + */
  60 + private Boolean iscanceled;
  61 +
  62 + /**
  63 + * This field was generated by MyBatis Generator.
56 64 * This field corresponds to the database column orders.member_id
57 65 *
58 66 * @mbggenerated
... ... @@ -221,6 +229,30 @@ public class Order {
221 229  
222 230 /**
223 231 * This method was generated by MyBatis Generator.
  232 + * This method returns the value of the database column orders.isCanceled
  233 + *
  234 + * @return the value of orders.isCanceled
  235 + *
  236 + * @mbggenerated
  237 + */
  238 + public Boolean getIscanceled() {
  239 + return iscanceled;
  240 + }
  241 +
  242 + /**
  243 + * This method was generated by MyBatis Generator.
  244 + * This method sets the value of the database column orders.isCanceled
  245 + *
  246 + * @param iscanceled the value for orders.isCanceled
  247 + *
  248 + * @mbggenerated
  249 + */
  250 + public void setIscanceled(Boolean iscanceled) {
  251 + this.iscanceled = iscanceled;
  252 + }
  253 +
  254 + /**
  255 + * This method was generated by MyBatis Generator.
224 256 * This method returns the value of the database column orders.member_id
225 257 *
226 258 * @return the value of orders.member_id
... ...
src/main/java/com/canrd/patent/dal/model/OrderExample.java
  View file @01a7d9c
... ... @@ -575,6 +575,66 @@ public class OrderExample {
575 575 return (Criteria) this;
576 576 }
577 577  
  578 + public Criteria andIscanceledIsNull() {
  579 + addCriterion("isCanceled is null");
  580 + return (Criteria) this;
  581 + }
  582 +
  583 + public Criteria andIscanceledIsNotNull() {
  584 + addCriterion("isCanceled is not null");
  585 + return (Criteria) this;
  586 + }
  587 +
  588 + public Criteria andIscanceledEqualTo(Boolean value) {
  589 + addCriterion("isCanceled =", value, "iscanceled");
  590 + return (Criteria) this;
  591 + }
  592 +
  593 + public Criteria andIscanceledNotEqualTo(Boolean value) {
  594 + addCriterion("isCanceled <>", value, "iscanceled");
  595 + return (Criteria) this;
  596 + }
  597 +
  598 + public Criteria andIscanceledGreaterThan(Boolean value) {
  599 + addCriterion("isCanceled >", value, "iscanceled");
  600 + return (Criteria) this;
  601 + }
  602 +
  603 + public Criteria andIscanceledGreaterThanOrEqualTo(Boolean value) {
  604 + addCriterion("isCanceled >=", value, "iscanceled");
  605 + return (Criteria) this;
  606 + }
  607 +
  608 + public Criteria andIscanceledLessThan(Boolean value) {
  609 + addCriterion("isCanceled <", value, "iscanceled");
  610 + return (Criteria) this;
  611 + }
  612 +
  613 + public Criteria andIscanceledLessThanOrEqualTo(Boolean value) {
  614 + addCriterion("isCanceled <=", value, "iscanceled");
  615 + return (Criteria) this;
  616 + }
  617 +
  618 + public Criteria andIscanceledIn(List<Boolean> values) {
  619 + addCriterion("isCanceled in", values, "iscanceled");
  620 + return (Criteria) this;
  621 + }
  622 +
  623 + public Criteria andIscanceledNotIn(List<Boolean> values) {
  624 + addCriterion("isCanceled not in", values, "iscanceled");
  625 + return (Criteria) this;
  626 + }
  627 +
  628 + public Criteria andIscanceledBetween(Boolean value1, Boolean value2) {
  629 + addCriterion("isCanceled between", value1, value2, "iscanceled");
  630 + return (Criteria) this;
  631 + }
  632 +
  633 + public Criteria andIscanceledNotBetween(Boolean value1, Boolean value2) {
  634 + addCriterion("isCanceled not between", value1, value2, "iscanceled");
  635 + return (Criteria) this;
  636 + }
  637 +
578 638 public Criteria andMemberIdIsNull() {
579 639 addCriterion("member_id is null");
580 640 return (Criteria) this;
... ...
src/main/java/com/canrd/patent/service/CaseHandlingService.java
  View file @01a7d9c
... ... @@ -40,10 +40,14 @@ public class CaseHandlingService {
40 40 if(StringUtils.isEmpty(preCasement)) {
41 41 Casement casement = new Casement();
42 42 casement.setCaseType(caseTypeEnum.name());
  43 + casement.setCaseTypeTitle(caseTypeEnum.getTitle());
43 44 casement.setCasesn(generatorCaseSn());
44 45 casement.setServiceType(serviceTypeEnum.name());
  46 + casement.setServiceTypeTitle(serviceTypeEnum.getTitle());
45 47 casement.setPaidType(paidTypeEnum.name());
  48 + casement.setPaidTypeTitle(paidTypeEnum.getTitle());
46 49 casement.setReduceType(reduceTypeEnum != null ? reduceTypeEnum.name() : null);
  50 + casement.setReduceTypeTitle(reduceTypeEnum != null ? reduceTypeEnum.getTitle() : null);
47 51 casement.setExpense(expense);
48 52 casement.setOrderStatus(OrderStatusEnum.SUBMITED.name());
49 53 casement.setCaseStatus(CaseStatusEnum.INIT.name());
... ...
src/main/java/com/canrd/patent/service/CasementService.java
  View file @01a7d9c
... ... @@ -158,4 +158,13 @@ public class CasementService {
158 158 reduceType.setDescription(reduceTypeEnum.getDescription());
159 159 return reduceType;
160 160 }
  161 +
  162 + /***
  163 + * 根据id查询casement
  164 + * @param id
  165 + * @return
  166 + */
  167 + public Casement findById(Long id){
  168 + return casementMapper.selectByPrimaryKey(id);
  169 + }
161 170 }
... ...
src/main/java/com/canrd/patent/service/OrderService.java
  View file @01a7d9c
... ... @@ -37,6 +37,7 @@ public class OrderService {
37 37 order.setExpense(expense);
38 38 order.setPayType("支付宝");
39 39 order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
  40 + order.setIscanceled(false);
40 41 order.setMemberId(memberId);
41 42 order.setCreateDate(new Date());
42 43 order.setUpdateDate(new Date());
... ... @@ -77,6 +78,7 @@ public class OrderService {
77 78 OrderExample orderExample = new OrderExample();
78 79 OrderExample.Criteria criteria = orderExample.createCriteria();
79 80 criteria.andMemberIdEqualTo(memberId);
  81 + criteria.andIscanceledEqualTo(false);
80 82 return orderMapper.selectByExample(orderExample);
81 83 }
82 84 }
... ...
src/main/java/com/canrd/patent/web/OrderPageController.java
  View file @01a7d9c
1 1 package com.canrd.patent.web;
2 2  
  3 +import com.canrd.patent.dal.dto.OrderListOutputDto;
3 4 import com.canrd.patent.dal.enums.OrderStatusEnum;
  5 +import com.canrd.patent.dal.model.Casement;
4 6 import com.canrd.patent.dal.model.Order;
  7 +import com.canrd.patent.service.CasementService;
5 8 import com.canrd.patent.service.OrderService;
  9 +import com.google.common.collect.Lists;
6 10 import org.springframework.stereotype.Controller;
7 11 import org.springframework.util.Assert;
8 12 import org.springframework.web.bind.annotation.RequestMapping;
... ... @@ -20,6 +24,8 @@ import java.util.List;
20 24 public class OrderPageController {
21 25 @Resource
22 26 private OrderService orderService;
  27 + @Resource
  28 + private CasementService casementService;
23 29 /***
24 30 * 保存订单并跳转到支付宝进行支付
25 31 * @return
... ... @@ -27,17 +33,17 @@ public class OrderPageController {
27 33 @RequestMapping(value="/save_order")
28 34 public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
29 35 //判断是否已经存在同样的订单，如果存在，则提醒用户并且数量+1即可
30   - orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
  36 + Order order = orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
31 37 //跳转到支付宝
32 38 //暂时直接跳转到支付成功的页面
33   - response.sendRedirect("http://localhost:8081/notity_result?orderId=xxxxorderIdxxxx&paymentResult=xxxxSUCCESStxxxx&totalAmount=10000000");
  39 + response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+expense);
34 40 }
35 41  
36 42 @RequestMapping(value="/notify_result")
37 43 public ModelAndView notifyResult(String orderId,String paymentResult,Long totalAmount){
38 44 System.out.println("orderId:"+orderId+",paymentResult:"+paymentResult+",totalAmount:"+totalAmount);
39 45  
40   - if("success".equals(paymentResult)){
  46 + if("success".toUpperCase().equals(paymentResult)){
41 47 //更新支付成功
42 48 orderService.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.PAID_SUCCESS.name());
43 49 }else{
... ... @@ -74,10 +80,17 @@ public class OrderPageController {
74 80 */
75 81 @RequestMapping(value="/query_order_list")
76 82 public ModelAndView queryOrderList(){
77   - List<Order> order = orderService.findByOrderList(IndexController.MEMBER_ID);
  83 + List<OrderListOutputDto> orderListOutputDtoList = Lists.newArrayList();
  84 + List<Order> orderList = orderService.findByOrderList(IndexController.MEMBER_ID);
  85 + for(Order order:orderList){
  86 + OrderListOutputDto orderListOutputDto = new OrderListOutputDto();
  87 + Casement casement = casementService.findById(order.getCaseId());
  88 + orderListOutputDto.setCasement(casement);
  89 + orderListOutputDtoList.add(orderListOutputDto);
  90 + }
78 91 ModelAndView modelAndView = new ModelAndView();
79   - modelAndView.addObject("order",order);
80   - modelAndView.setViewName("/order_detail");
  92 + modelAndView.addObject("orderListOutputDtoList",orderListOutputDtoList);
  93 + modelAndView.setViewName("/case_manage");
81 94 return modelAndView;
82 95 }
83 96 }
... ...
src/main/resources/mapper/CasementMapper.xml
  View file @01a7d9c
... ... @@ -10,9 +10,13 @@
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11 11 <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
  13 + <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
13 14 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
  15 + <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
14 16 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
  17 + <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
15 18 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
  19 + <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
16 20 <result column="expense" jdbcType="BIGINT" property="expense" />
17 21 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
18 22 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
... ... @@ -91,8 +95,9 @@
91 95 WARNING - @mbggenerated
92 96 This element is automatically generated by MyBatis Generator, do not modify.
93 97 -->
94   - id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status,
95   - case_status, member_id, create_date, update_date
  98 + id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
  99 + paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  100 + member_id, create_date, update_date
96 101 </sql>
97 102 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
98 103 <!--
... ... @@ -149,15 +154,17 @@
149 154 SELECT LAST_INSERT_ID()
150 155 </selectKey>
151 156 insert into casement (name, caseSn, case_type,
152   - service_type, paid_type, reduce_type,
153   - expense, order_status, case_status,
154   - member_id, create_date, update_date
155   - )
  157 + case_type_title, service_type, service_type_title,
  158 + paid_type, paid_type_title, reduce_type,
  159 + reduce_type_title, expense, order_status,
  160 + case_status, member_id, create_date,
  161 + update_date)
156 162 values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
157   - #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
158   - #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR},
159   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
160   - )
  163 + #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
  164 + #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  165 + #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
  166 + #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  167 + #{updateDate,jdbcType=TIMESTAMP})
161 168 </insert>
162 169 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
163 170 <!--
... ... @@ -178,15 +185,27 @@
178 185 <if test="caseType != null">
179 186 case_type,
180 187 </if>
  188 + <if test="caseTypeTitle != null">
  189 + case_type_title,
  190 + </if>
181 191 <if test="serviceType != null">
182 192 service_type,
183 193 </if>
  194 + <if test="serviceTypeTitle != null">
  195 + service_type_title,
  196 + </if>
184 197 <if test="paidType != null">
185 198 paid_type,
186 199 </if>
  200 + <if test="paidTypeTitle != null">
  201 + paid_type_title,
  202 + </if>
187 203 <if test="reduceType != null">
188 204 reduce_type,
189 205 </if>
  206 + <if test="reduceTypeTitle != null">
  207 + reduce_type_title,
  208 + </if>
190 209 <if test="expense != null">
191 210 expense,
192 211 </if>
... ... @@ -216,15 +235,27 @@
216 235 <if test="caseType != null">
217 236 #{caseType,jdbcType=VARCHAR},
218 237 </if>
  238 + <if test="caseTypeTitle != null">
  239 + #{caseTypeTitle,jdbcType=VARCHAR},
  240 + </if>
219 241 <if test="serviceType != null">
220 242 #{serviceType,jdbcType=VARCHAR},
221 243 </if>
  244 + <if test="serviceTypeTitle != null">
  245 + #{serviceTypeTitle,jdbcType=VARCHAR},
  246 + </if>
222 247 <if test="paidType != null">
223 248 #{paidType,jdbcType=VARCHAR},
224 249 </if>
  250 + <if test="paidTypeTitle != null">
  251 + #{paidTypeTitle,jdbcType=VARCHAR},
  252 + </if>
225 253 <if test="reduceType != null">
226 254 #{reduceType,jdbcType=VARCHAR},
227 255 </if>
  256 + <if test="reduceTypeTitle != null">
  257 + #{reduceTypeTitle,jdbcType=VARCHAR},
  258 + </if>
228 259 <if test="expense != null">
229 260 #{expense,jdbcType=BIGINT},
230 261 </if>
... ... @@ -274,15 +305,27 @@
274 305 <if test="record.caseType != null">
275 306 case_type = #{record.caseType,jdbcType=VARCHAR},
276 307 </if>
  308 + <if test="record.caseTypeTitle != null">
  309 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
  310 + </if>
277 311 <if test="record.serviceType != null">
278 312 service_type = #{record.serviceType,jdbcType=VARCHAR},
279 313 </if>
  314 + <if test="record.serviceTypeTitle != null">
  315 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
  316 + </if>
280 317 <if test="record.paidType != null">
281 318 paid_type = #{record.paidType,jdbcType=VARCHAR},
282 319 </if>
  320 + <if test="record.paidTypeTitle != null">
  321 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
  322 + </if>
283 323 <if test="record.reduceType != null">
284 324 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
285 325 </if>
  326 + <if test="record.reduceTypeTitle != null">
  327 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
  328 + </if>
286 329 <if test="record.expense != null">
287 330 expense = #{record.expense,jdbcType=BIGINT},
288 331 </if>
... ... @@ -316,9 +359,13 @@
316 359 name = #{record.name,jdbcType=VARCHAR},
317 360 caseSn = #{record.casesn,jdbcType=VARCHAR},
318 361 case_type = #{record.caseType,jdbcType=VARCHAR},
  362 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
319 363 service_type = #{record.serviceType,jdbcType=VARCHAR},
  364 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
320 365 paid_type = #{record.paidType,jdbcType=VARCHAR},
  366 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
321 367 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
  368 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
322 369 expense = #{record.expense,jdbcType=BIGINT},
323 370 order_status = #{record.orderStatus,jdbcType=VARCHAR},
324 371 case_status = #{record.caseStatus,jdbcType=VARCHAR},
... ... @@ -345,15 +392,27 @@
345 392 <if test="caseType != null">
346 393 case_type = #{caseType,jdbcType=VARCHAR},
347 394 </if>
  395 + <if test="caseTypeTitle != null">
  396 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
  397 + </if>
348 398 <if test="serviceType != null">
349 399 service_type = #{serviceType,jdbcType=VARCHAR},
350 400 </if>
  401 + <if test="serviceTypeTitle != null">
  402 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
  403 + </if>
351 404 <if test="paidType != null">
352 405 paid_type = #{paidType,jdbcType=VARCHAR},
353 406 </if>
  407 + <if test="paidTypeTitle != null">
  408 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
  409 + </if>
354 410 <if test="reduceType != null">
355 411 reduce_type = #{reduceType,jdbcType=VARCHAR},
356 412 </if>
  413 + <if test="reduceTypeTitle != null">
  414 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
  415 + </if>
357 416 <if test="expense != null">
358 417 expense = #{expense,jdbcType=BIGINT},
359 418 </if>
... ... @@ -384,9 +443,13 @@
384 443 set name = #{name,jdbcType=VARCHAR},
385 444 caseSn = #{casesn,jdbcType=VARCHAR},
386 445 case_type = #{caseType,jdbcType=VARCHAR},
  446 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
387 447 service_type = #{serviceType,jdbcType=VARCHAR},
  448 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
388 449 paid_type = #{paidType,jdbcType=VARCHAR},
  450 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
389 451 reduce_type = #{reduceType,jdbcType=VARCHAR},
  452 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
390 453 expense = #{expense,jdbcType=BIGINT},
391 454 order_status = #{orderStatus,jdbcType=VARCHAR},
392 455 case_status = #{caseStatus,jdbcType=VARCHAR},
... ...
src/main/resources/mapper/OrderMapper.xml
  View file @01a7d9c
... ... @@ -12,6 +12,7 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  15 + <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
15 16 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
16 17 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
17 18 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -87,7 +88,8 @@
87 88 WARNING - @mbggenerated
88 89 This element is automatically generated by MyBatis Generator, do not modify.
89 90 -->
90   - id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
  91 + id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
  92 + update_date
91 93 </sql>
92 94 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
93 95 <!--
... ... @@ -144,11 +146,13 @@
144 146 SELECT LAST_INSERT_ID()
145 147 </selectKey>
146 148 insert into orders (case_id, quantity, expense,
147   - pay_type, order_status, member_id,
148   - create_date, update_date)
  149 + pay_type, order_status, isCanceled,
  150 + member_id, create_date, update_date
  151 + )
149 152 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
150   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
151   - #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
  153 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
  154 + #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
  155 + )
152 156 </insert>
153 157 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
154 158 <!--
... ... @@ -175,6 +179,9 @@
175 179 <if test="orderStatus != null">
176 180 order_status,
177 181 </if>
  182 + <if test="iscanceled != null">
  183 + isCanceled,
  184 + </if>
178 185 <if test="memberId != null">
179 186 member_id,
180 187 </if>
... ... @@ -201,6 +208,9 @@
201 208 <if test="orderStatus != null">
202 209 #{orderStatus,jdbcType=VARCHAR},
203 210 </if>
  211 + <if test="iscanceled != null">
  212 + #{iscanceled,jdbcType=BIT},
  213 + </if>
204 214 <if test="memberId != null">
205 215 #{memberId,jdbcType=VARCHAR},
206 216 </if>
... ... @@ -247,6 +257,9 @@
247 257 <if test="record.orderStatus != null">
248 258 order_status = #{record.orderStatus,jdbcType=VARCHAR},
249 259 </if>
  260 + <if test="record.iscanceled != null">
  261 + isCanceled = #{record.iscanceled,jdbcType=BIT},
  262 + </if>
250 263 <if test="record.memberId != null">
251 264 member_id = #{record.memberId,jdbcType=VARCHAR},
252 265 </if>
... ... @@ -273,6 +286,7 @@
273 286 expense = #{record.expense,jdbcType=BIGINT},
274 287 pay_type = #{record.payType,jdbcType=VARCHAR},
275 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
  289 + isCanceled = #{record.iscanceled,jdbcType=BIT},
276 290 member_id = #{record.memberId,jdbcType=VARCHAR},
277 291 create_date = #{record.createDate,jdbcType=TIMESTAMP},
278 292 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -302,6 +316,9 @@
302 316 <if test="orderStatus != null">
303 317 order_status = #{orderStatus,jdbcType=VARCHAR},
304 318 </if>
  319 + <if test="iscanceled != null">
  320 + isCanceled = #{iscanceled,jdbcType=BIT},
  321 + </if>
305 322 <if test="memberId != null">
306 323 member_id = #{memberId,jdbcType=VARCHAR},
307 324 </if>
... ... @@ -325,6 +342,7 @@
325 342 expense = #{expense,jdbcType=BIGINT},
326 343 pay_type = #{payType,jdbcType=VARCHAR},
327 344 order_status = #{orderStatus,jdbcType=VARCHAR},
  345 + isCanceled = #{iscanceled,jdbcType=BIT},
328 346 member_id = #{memberId,jdbcType=VARCHAR},
329 347 create_date = #{createDate,jdbcType=TIMESTAMP},
330 348 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
src/main/webapp/case_manage.jsp
  View file @01a7d9c
  1 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1 2 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
2 3 <html lang="en">
3 4 <head>
... ... @@ -85,52 +86,63 @@
85 86 </tr>
86 87 </thead>
87 88 <tbody>
88   - <tr>
89   - <td class="td-width-210">
90   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
91   - <div><span>暂无名称</span></div>
92   - </td>
93   - <td class="td-width-120">
94   - GG1603754CA
95   - </td>
96   - <td class="td-width-120">
97   - <div>
98   - <span>标准服务</span>
99   - </div>
100   - <div>
101   - <span>官费暂不缴纳</span>
102   - </div>
103   - </td>
104   - <td class="td-width-120">
105   - <div>
106   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
107   - </div>
108   - <div>
109   - <a href="javascript:" class="color-ff6642">取消案件</a>
110   - </div>
111   - </td>
112   - <td class="td-width-120">
113   - <span>3800</span>
114   - </td>
115   - <td class="td-width-120">
116   - <div>
117   - <span>未支付</span>
118   - </div>
119   - <div>
120   - <a href="javascript:" class="color-ff6642">未支付</a>
121   - </div>
122   - <div>
123   - <a href="javascript:">订单详情</a>
124   - </div>
125   - </td>
126   - </tr>
127   - <tr class="case-list-item-bottom-tr">
128   - <td colspan="6">
129   - <span>合同号：<span>466686664696562</span></span>
130   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
131   - <span class="color-ff6642 delete-btn">删除</span>
132   - </td>
133   - </tr>
  89 + <c:forEach items="${orderListOutputDtoList}" var="order">
  90 + <tr>
  91 + <td class="td-width-210">
  92 + <div class="case-type"><span>案件类型：</span><span>${order.casement.caseTypeTile}</span></div>
  93 + <div><span>
  94 + <c:choose>
  95 + <c:when test="${order.casement.name!=null}">
  96 + ${order.casement.name}
  97 + </c:when>
  98 + <c:otherwise>
  99 + 暂无名称
  100 + </c:otherwise>
  101 + </c:choose>
  102 + </span></div>
  103 + </td>
  104 + <td class="td-width-120">
  105 + ${order.casement.caseSn}
  106 + </td>
  107 + <td class="td-width-120">
  108 + <div>
  109 + <span>${order.casement.serviceTypeTile}</span>
  110 + </div>
  111 + <div>
  112 + <span>${order.casement.paidTypeTile}</span>
  113 + </div>
  114 + </td>
  115 + <td class="td-width-120">
  116 + <div>
  117 + <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
  118 + </div>
  119 + <div>
  120 + <a href="javascript:" class="color-ff6642">取消案件</a>
  121 + </div>
  122 + </td>
  123 + <td class="td-width-120">
  124 + <span>${order.expense}</span>
  125 + </td>
  126 + <td class="td-width-120">
  127 + <div>
  128 + <span>未支付</span>
  129 + </div>
  130 + <div>
  131 + <a href="javascript:" class="color-ff6642">未支付</a>
  132 + </div>
  133 + <div>
  134 + <a href="javascript:">订单详情</a>
  135 + </div>
  136 + </td>
  137 + </tr>
  138 + <tr class="case-list-item-bottom-tr">
  139 + <td colspan="6">
  140 + <span>合同号：<span>466686664696562</span></span>
  141 + <span>立案时间：<span>2016-05-13 22:40:53</span></span>
  142 + <span class="color-ff6642 delete-btn">删除</span>
  143 + </td>
  144 + </tr>
  145 + </c:forEach>
134 146 <tr>
135 147 <td class="td-width-210">
136 148 <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
... ...
src/main/webapp/pay_result.jsp
  View file @01a7d9c
... ... @@ -29,6 +29,7 @@
29 29 <p>支付金额: ${totalAmount}</p>
30 30 <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
31 31 <p><a href="/case_detail.jsp">案件详情</a></p>
  32 + <p><a href="/query_order_list">案件管理</a></p>
32 33 </div>
33 34 </div>
34 35  
... ...
target/classes/com/canrd/patent/dal/model/Casement.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/Order.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/service/CaseHandlingService.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/service/CasementService.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/service/OrderService.class
View file @01a7d9c
No preview for this file type
target/classes/com/canrd/patent/web/OrderPageController.class
View file @01a7d9c
No preview for this file type
target/classes/mapper/CasementMapper.xml
  View file @01a7d9c
... ... @@ -10,9 +10,13 @@
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11 11 <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
  13 + <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
13 14 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
  15 + <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
14 16 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
  17 + <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
15 18 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
  19 + <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
16 20 <result column="expense" jdbcType="BIGINT" property="expense" />
17 21 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
18 22 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
... ... @@ -91,8 +95,9 @@
91 95 WARNING - @mbggenerated
92 96 This element is automatically generated by MyBatis Generator, do not modify.
93 97 -->
94   - id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status,
95   - case_status, member_id, create_date, update_date
  98 + id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
  99 + paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  100 + member_id, create_date, update_date
96 101 </sql>
97 102 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
98 103 <!--
... ... @@ -149,15 +154,17 @@
149 154 SELECT LAST_INSERT_ID()
150 155 </selectKey>
151 156 insert into casement (name, caseSn, case_type,
152   - service_type, paid_type, reduce_type,
153   - expense, order_status, case_status,
154   - member_id, create_date, update_date
155   - )
  157 + case_type_title, service_type, service_type_title,
  158 + paid_type, paid_type_title, reduce_type,
  159 + reduce_type_title, expense, order_status,
  160 + case_status, member_id, create_date,
  161 + update_date)
156 162 values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
157   - #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
158   - #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR},
159   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
160   - )
  163 + #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
  164 + #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  165 + #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
  166 + #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  167 + #{updateDate,jdbcType=TIMESTAMP})
161 168 </insert>
162 169 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
163 170 <!--
... ... @@ -178,15 +185,27 @@
178 185 <if test="caseType != null">
179 186 case_type,
180 187 </if>
  188 + <if test="caseTypeTitle != null">
  189 + case_type_title,
  190 + </if>
181 191 <if test="serviceType != null">
182 192 service_type,
183 193 </if>
  194 + <if test="serviceTypeTitle != null">
  195 + service_type_title,
  196 + </if>
184 197 <if test="paidType != null">
185 198 paid_type,
186 199 </if>
  200 + <if test="paidTypeTitle != null">
  201 + paid_type_title,
  202 + </if>
187 203 <if test="reduceType != null">
188 204 reduce_type,
189 205 </if>
  206 + <if test="reduceTypeTitle != null">
  207 + reduce_type_title,
  208 + </if>
190 209 <if test="expense != null">
191 210 expense,
192 211 </if>
... ... @@ -216,15 +235,27 @@
216 235 <if test="caseType != null">
217 236 #{caseType,jdbcType=VARCHAR},
218 237 </if>
  238 + <if test="caseTypeTitle != null">
  239 + #{caseTypeTitle,jdbcType=VARCHAR},
  240 + </if>
219 241 <if test="serviceType != null">
220 242 #{serviceType,jdbcType=VARCHAR},
221 243 </if>
  244 + <if test="serviceTypeTitle != null">
  245 + #{serviceTypeTitle,jdbcType=VARCHAR},
  246 + </if>
222 247 <if test="paidType != null">
223 248 #{paidType,jdbcType=VARCHAR},
224 249 </if>
  250 + <if test="paidTypeTitle != null">
  251 + #{paidTypeTitle,jdbcType=VARCHAR},
  252 + </if>
225 253 <if test="reduceType != null">
226 254 #{reduceType,jdbcType=VARCHAR},
227 255 </if>
  256 + <if test="reduceTypeTitle != null">
  257 + #{reduceTypeTitle,jdbcType=VARCHAR},
  258 + </if>
228 259 <if test="expense != null">
229 260 #{expense,jdbcType=BIGINT},
230 261 </if>
... ... @@ -274,15 +305,27 @@
274 305 <if test="record.caseType != null">
275 306 case_type = #{record.caseType,jdbcType=VARCHAR},
276 307 </if>
  308 + <if test="record.caseTypeTitle != null">
  309 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
  310 + </if>
277 311 <if test="record.serviceType != null">
278 312 service_type = #{record.serviceType,jdbcType=VARCHAR},
279 313 </if>
  314 + <if test="record.serviceTypeTitle != null">
  315 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
  316 + </if>
280 317 <if test="record.paidType != null">
281 318 paid_type = #{record.paidType,jdbcType=VARCHAR},
282 319 </if>
  320 + <if test="record.paidTypeTitle != null">
  321 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
  322 + </if>
283 323 <if test="record.reduceType != null">
284 324 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
285 325 </if>
  326 + <if test="record.reduceTypeTitle != null">
  327 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
  328 + </if>
286 329 <if test="record.expense != null">
287 330 expense = #{record.expense,jdbcType=BIGINT},
288 331 </if>
... ... @@ -316,9 +359,13 @@
316 359 name = #{record.name,jdbcType=VARCHAR},
317 360 caseSn = #{record.casesn,jdbcType=VARCHAR},
318 361 case_type = #{record.caseType,jdbcType=VARCHAR},
  362 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
319 363 service_type = #{record.serviceType,jdbcType=VARCHAR},
  364 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
320 365 paid_type = #{record.paidType,jdbcType=VARCHAR},
  366 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
321 367 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
  368 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
322 369 expense = #{record.expense,jdbcType=BIGINT},
323 370 order_status = #{record.orderStatus,jdbcType=VARCHAR},
324 371 case_status = #{record.caseStatus,jdbcType=VARCHAR},
... ... @@ -345,15 +392,27 @@
345 392 <if test="caseType != null">
346 393 case_type = #{caseType,jdbcType=VARCHAR},
347 394 </if>
  395 + <if test="caseTypeTitle != null">
  396 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
  397 + </if>
348 398 <if test="serviceType != null">
349 399 service_type = #{serviceType,jdbcType=VARCHAR},
350 400 </if>
  401 + <if test="serviceTypeTitle != null">
  402 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
  403 + </if>
351 404 <if test="paidType != null">
352 405 paid_type = #{paidType,jdbcType=VARCHAR},
353 406 </if>
  407 + <if test="paidTypeTitle != null">
  408 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
  409 + </if>
354 410 <if test="reduceType != null">
355 411 reduce_type = #{reduceType,jdbcType=VARCHAR},
356 412 </if>
  413 + <if test="reduceTypeTitle != null">
  414 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
  415 + </if>
357 416 <if test="expense != null">
358 417 expense = #{expense,jdbcType=BIGINT},
359 418 </if>
... ... @@ -384,9 +443,13 @@
384 443 set name = #{name,jdbcType=VARCHAR},
385 444 caseSn = #{casesn,jdbcType=VARCHAR},
386 445 case_type = #{caseType,jdbcType=VARCHAR},
  446 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
387 447 service_type = #{serviceType,jdbcType=VARCHAR},
  448 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
388 449 paid_type = #{paidType,jdbcType=VARCHAR},
  450 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
389 451 reduce_type = #{reduceType,jdbcType=VARCHAR},
  452 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
390 453 expense = #{expense,jdbcType=BIGINT},
391 454 order_status = #{orderStatus,jdbcType=VARCHAR},
392 455 case_status = #{caseStatus,jdbcType=VARCHAR},
... ...
target/classes/mapper/OrderMapper.xml
  View file @01a7d9c
... ... @@ -12,6 +12,7 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  15 + <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
15 16 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
16 17 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
17 18 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -87,7 +88,8 @@
87 88 WARNING - @mbggenerated
88 89 This element is automatically generated by MyBatis Generator, do not modify.
89 90 -->
90   - id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
  91 + id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
  92 + update_date
91 93 </sql>
92 94 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
93 95 <!--
... ... @@ -144,11 +146,13 @@
144 146 SELECT LAST_INSERT_ID()
145 147 </selectKey>
146 148 insert into orders (case_id, quantity, expense,
147   - pay_type, order_status, member_id,
148   - create_date, update_date)
  149 + pay_type, order_status, isCanceled,
  150 + member_id, create_date, update_date
  151 + )
149 152 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
150   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
151   - #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
  153 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
  154 + #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
  155 + )
152 156 </insert>
153 157 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
154 158 <!--
... ... @@ -175,6 +179,9 @@
175 179 <if test="orderStatus != null">
176 180 order_status,
177 181 </if>
  182 + <if test="iscanceled != null">
  183 + isCanceled,
  184 + </if>
178 185 <if test="memberId != null">
179 186 member_id,
180 187 </if>
... ... @@ -201,6 +208,9 @@
201 208 <if test="orderStatus != null">
202 209 #{orderStatus,jdbcType=VARCHAR},
203 210 </if>
  211 + <if test="iscanceled != null">
  212 + #{iscanceled,jdbcType=BIT},
  213 + </if>
204 214 <if test="memberId != null">
205 215 #{memberId,jdbcType=VARCHAR},
206 216 </if>
... ... @@ -247,6 +257,9 @@
247 257 <if test="record.orderStatus != null">
248 258 order_status = #{record.orderStatus,jdbcType=VARCHAR},
249 259 </if>
  260 + <if test="record.iscanceled != null">
  261 + isCanceled = #{record.iscanceled,jdbcType=BIT},
  262 + </if>
250 263 <if test="record.memberId != null">
251 264 member_id = #{record.memberId,jdbcType=VARCHAR},
252 265 </if>
... ... @@ -273,6 +286,7 @@
273 286 expense = #{record.expense,jdbcType=BIGINT},
274 287 pay_type = #{record.payType,jdbcType=VARCHAR},
275 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
  289 + isCanceled = #{record.iscanceled,jdbcType=BIT},
276 290 member_id = #{record.memberId,jdbcType=VARCHAR},
277 291 create_date = #{record.createDate,jdbcType=TIMESTAMP},
278 292 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -302,6 +316,9 @@
302 316 <if test="orderStatus != null">
303 317 order_status = #{orderStatus,jdbcType=VARCHAR},
304 318 </if>
  319 + <if test="iscanceled != null">
  320 + isCanceled = #{iscanceled,jdbcType=BIT},
  321 + </if>
305 322 <if test="memberId != null">
306 323 member_id = #{memberId,jdbcType=VARCHAR},
307 324 </if>
... ... @@ -325,6 +342,7 @@
325 342 expense = #{expense,jdbcType=BIGINT},
326 343 pay_type = #{payType,jdbcType=VARCHAR},
327 344 order_status = #{orderStatus,jdbcType=VARCHAR},
  345 + isCanceled = #{iscanceled,jdbcType=BIT},
328 346 member_id = #{memberId,jdbcType=VARCHAR},
329 347 create_date = #{createDate,jdbcType=TIMESTAMP},
330 348 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class
View file @01a7d9c
No preview for this file type
target/patent/WEB-INF/classes/mapper/CasementMapper.xml
  View file @01a7d9c
... ... @@ -10,9 +10,13 @@
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11 11 <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
  13 + <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
13 14 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
  15 + <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
14 16 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
  17 + <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
15 18 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
  19 + <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
16 20 <result column="expense" jdbcType="BIGINT" property="expense" />
17 21 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
18 22 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
... ... @@ -91,8 +95,9 @@
91 95 WARNING - @mbggenerated
92 96 This element is automatically generated by MyBatis Generator, do not modify.
93 97 -->
94   - id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status,
95   - case_status, member_id, create_date, update_date
  98 + id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
  99 + paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  100 + member_id, create_date, update_date
96 101 </sql>
97 102 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
98 103 <!--
... ... @@ -149,15 +154,17 @@
149 154 SELECT LAST_INSERT_ID()
150 155 </selectKey>
151 156 insert into casement (name, caseSn, case_type,
152   - service_type, paid_type, reduce_type,
153   - expense, order_status, case_status,
154   - member_id, create_date, update_date
155   - )
  157 + case_type_title, service_type, service_type_title,
  158 + paid_type, paid_type_title, reduce_type,
  159 + reduce_type_title, expense, order_status,
  160 + case_status, member_id, create_date,
  161 + update_date)
156 162 values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
157   - #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
158   - #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR},
159   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
160   - )
  163 + #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
  164 + #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  165 + #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
  166 + #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  167 + #{updateDate,jdbcType=TIMESTAMP})
161 168 </insert>
162 169 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
163 170 <!--
... ... @@ -178,15 +185,27 @@
178 185 <if test="caseType != null">
179 186 case_type,
180 187 </if>
  188 + <if test="caseTypeTitle != null">
  189 + case_type_title,
  190 + </if>
181 191 <if test="serviceType != null">
182 192 service_type,
183 193 </if>
  194 + <if test="serviceTypeTitle != null">
  195 + service_type_title,
  196 + </if>
184 197 <if test="paidType != null">
185 198 paid_type,
186 199 </if>
  200 + <if test="paidTypeTitle != null">
  201 + paid_type_title,
  202 + </if>
187 203 <if test="reduceType != null">
188 204 reduce_type,
189 205 </if>
  206 + <if test="reduceTypeTitle != null">
  207 + reduce_type_title,
  208 + </if>
190 209 <if test="expense != null">
191 210 expense,
192 211 </if>
... ... @@ -216,15 +235,27 @@
216 235 <if test="caseType != null">
217 236 #{caseType,jdbcType=VARCHAR},
218 237 </if>
  238 + <if test="caseTypeTitle != null">
  239 + #{caseTypeTitle,jdbcType=VARCHAR},
  240 + </if>
219 241 <if test="serviceType != null">
220 242 #{serviceType,jdbcType=VARCHAR},
221 243 </if>
  244 + <if test="serviceTypeTitle != null">
  245 + #{serviceTypeTitle,jdbcType=VARCHAR},
  246 + </if>
222 247 <if test="paidType != null">
223 248 #{paidType,jdbcType=VARCHAR},
224 249 </if>
  250 + <if test="paidTypeTitle != null">
  251 + #{paidTypeTitle,jdbcType=VARCHAR},
  252 + </if>
225 253 <if test="reduceType != null">
226 254 #{reduceType,jdbcType=VARCHAR},
227 255 </if>
  256 + <if test="reduceTypeTitle != null">
  257 + #{reduceTypeTitle,jdbcType=VARCHAR},
  258 + </if>
228 259 <if test="expense != null">
229 260 #{expense,jdbcType=BIGINT},
230 261 </if>
... ... @@ -274,15 +305,27 @@
274 305 <if test="record.caseType != null">
275 306 case_type = #{record.caseType,jdbcType=VARCHAR},
276 307 </if>
  308 + <if test="record.caseTypeTitle != null">
  309 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
  310 + </if>
277 311 <if test="record.serviceType != null">
278 312 service_type = #{record.serviceType,jdbcType=VARCHAR},
279 313 </if>
  314 + <if test="record.serviceTypeTitle != null">
  315 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
  316 + </if>
280 317 <if test="record.paidType != null">
281 318 paid_type = #{record.paidType,jdbcType=VARCHAR},
282 319 </if>
  320 + <if test="record.paidTypeTitle != null">
  321 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
  322 + </if>
283 323 <if test="record.reduceType != null">
284 324 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
285 325 </if>
  326 + <if test="record.reduceTypeTitle != null">
  327 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
  328 + </if>
286 329 <if test="record.expense != null">
287 330 expense = #{record.expense,jdbcType=BIGINT},
288 331 </if>
... ... @@ -316,9 +359,13 @@
316 359 name = #{record.name,jdbcType=VARCHAR},
317 360 caseSn = #{record.casesn,jdbcType=VARCHAR},
318 361 case_type = #{record.caseType,jdbcType=VARCHAR},
  362 + case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
319 363 service_type = #{record.serviceType,jdbcType=VARCHAR},
  364 + service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
320 365 paid_type = #{record.paidType,jdbcType=VARCHAR},
  366 + paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
321 367 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
  368 + reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
322 369 expense = #{record.expense,jdbcType=BIGINT},
323 370 order_status = #{record.orderStatus,jdbcType=VARCHAR},
324 371 case_status = #{record.caseStatus,jdbcType=VARCHAR},
... ... @@ -345,15 +392,27 @@
345 392 <if test="caseType != null">
346 393 case_type = #{caseType,jdbcType=VARCHAR},
347 394 </if>
  395 + <if test="caseTypeTitle != null">
  396 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
  397 + </if>
348 398 <if test="serviceType != null">
349 399 service_type = #{serviceType,jdbcType=VARCHAR},
350 400 </if>
  401 + <if test="serviceTypeTitle != null">
  402 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
  403 + </if>
351 404 <if test="paidType != null">
352 405 paid_type = #{paidType,jdbcType=VARCHAR},
353 406 </if>
  407 + <if test="paidTypeTitle != null">
  408 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
  409 + </if>
354 410 <if test="reduceType != null">
355 411 reduce_type = #{reduceType,jdbcType=VARCHAR},
356 412 </if>
  413 + <if test="reduceTypeTitle != null">
  414 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
  415 + </if>
357 416 <if test="expense != null">
358 417 expense = #{expense,jdbcType=BIGINT},
359 418 </if>
... ... @@ -384,9 +443,13 @@
384 443 set name = #{name,jdbcType=VARCHAR},
385 444 caseSn = #{casesn,jdbcType=VARCHAR},
386 445 case_type = #{caseType,jdbcType=VARCHAR},
  446 + case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
387 447 service_type = #{serviceType,jdbcType=VARCHAR},
  448 + service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
388 449 paid_type = #{paidType,jdbcType=VARCHAR},
  450 + paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
389 451 reduce_type = #{reduceType,jdbcType=VARCHAR},
  452 + reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
390 453 expense = #{expense,jdbcType=BIGINT},
391 454 order_status = #{orderStatus,jdbcType=VARCHAR},
392 455 case_status = #{caseStatus,jdbcType=VARCHAR},
... ...
target/patent/WEB-INF/classes/mapper/OrderMapper.xml
  View file @01a7d9c
... ... @@ -12,6 +12,7 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  15 + <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
15 16 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
16 17 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
17 18 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -87,7 +88,8 @@
87 88 WARNING - @mbggenerated
88 89 This element is automatically generated by MyBatis Generator, do not modify.
89 90 -->
90   - id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
  91 + id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
  92 + update_date
91 93 </sql>
92 94 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
93 95 <!--
... ... @@ -144,11 +146,13 @@
144 146 SELECT LAST_INSERT_ID()
145 147 </selectKey>
146 148 insert into orders (case_id, quantity, expense,
147   - pay_type, order_status, member_id,
148   - create_date, update_date)
  149 + pay_type, order_status, isCanceled,
  150 + member_id, create_date, update_date
  151 + )
149 152 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
150   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
151   - #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
  153 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
  154 + #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
  155 + )
152 156 </insert>
153 157 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
154 158 <!--
... ... @@ -175,6 +179,9 @@
175 179 <if test="orderStatus != null">
176 180 order_status,
177 181 </if>
  182 + <if test="iscanceled != null">
  183 + isCanceled,
  184 + </if>
178 185 <if test="memberId != null">
179 186 member_id,
180 187 </if>
... ... @@ -201,6 +208,9 @@
201 208 <if test="orderStatus != null">
202 209 #{orderStatus,jdbcType=VARCHAR},
203 210 </if>
  211 + <if test="iscanceled != null">
  212 + #{iscanceled,jdbcType=BIT},
  213 + </if>
204 214 <if test="memberId != null">
205 215 #{memberId,jdbcType=VARCHAR},
206 216 </if>
... ... @@ -247,6 +257,9 @@
247 257 <if test="record.orderStatus != null">
248 258 order_status = #{record.orderStatus,jdbcType=VARCHAR},
249 259 </if>
  260 + <if test="record.iscanceled != null">
  261 + isCanceled = #{record.iscanceled,jdbcType=BIT},
  262 + </if>
250 263 <if test="record.memberId != null">
251 264 member_id = #{record.memberId,jdbcType=VARCHAR},
252 265 </if>
... ... @@ -273,6 +286,7 @@
273 286 expense = #{record.expense,jdbcType=BIGINT},
274 287 pay_type = #{record.payType,jdbcType=VARCHAR},
275 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
  289 + isCanceled = #{record.iscanceled,jdbcType=BIT},
276 290 member_id = #{record.memberId,jdbcType=VARCHAR},
277 291 create_date = #{record.createDate,jdbcType=TIMESTAMP},
278 292 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -302,6 +316,9 @@
302 316 <if test="orderStatus != null">
303 317 order_status = #{orderStatus,jdbcType=VARCHAR},
304 318 </if>
  319 + <if test="iscanceled != null">
  320 + isCanceled = #{iscanceled,jdbcType=BIT},
  321 + </if>
305 322 <if test="memberId != null">
306 323 member_id = #{memberId,jdbcType=VARCHAR},
307 324 </if>
... ... @@ -325,6 +342,7 @@
325 342 expense = #{expense,jdbcType=BIGINT},
326 343 pay_type = #{payType,jdbcType=VARCHAR},
327 344 order_status = #{orderStatus,jdbcType=VARCHAR},
  345 + isCanceled = #{iscanceled,jdbcType=BIT},
328 346 member_id = #{memberId,jdbcType=VARCHAR},
329 347 create_date = #{createDate,jdbcType=TIMESTAMP},
330 348 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
target/patent/case-detail.jsp deleted 100644 → 0
  View file @be77388
1   -<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2   -<html lang="en">
3   -<head>
4   - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5   - <title>科路得</title>
6   - <link rel="stylesheet" type="text/css" href="/css/case-detail.css">
7   -</head>
8   -
9   -<body>
10   -<jsp:include page="/include/header.jsp" flush="true"/>
11   -
12   -<div class="case-manage-wrap">
13   - <div class="content">
14   - <div class="location-wrap">
15   - <span>个人中心</span>
16   - <i class="row-right"></i>
17   - <i class="row-right"></i>
18   - <span class="current">案件管理</span>
19   - </div>
20   - <div class="main-wrap">
21   - <div class="side-nav">
22   - <!-- user-side-bar.html -->
23   - <div class="user-side-bar">
24   - <div class="user-info">
25   - <div class="head-ico"></div>
26   - <p class="user-phone">18354206939</p>
27   -
28   - <div class="edit-btn">编辑</div>
29   - </div>
30   - <ul>
31   - <li data-nav-type="my-cases">我的案件</li>
32   - <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>
33   - <li>案件管理</li>
34   - </ul>
35   - </div>
36   - </div>
37   - <div class="case-detail-wrap">
38   - <div class="case-status-wrap">
39   - <div class="case-section-wrap">
40   - <span class="register-section current-status-ico ">立案阶段</span>
41   - <span class="write-section normal-status-ico ">撰写阶段</span>
42   - <span class="law-section normal-status-ico">法律状态</span>
43   - </div>
44   - <div class="register-section-status section-status">
45   - <div class="status-item arrive go-over">
46   - <div class="dot"></div>
47   - <div>
48   - <div class="half-status-desc right"></div>
49   - </div>
50   - <div class="status-desc"><span>下单</span></div>
51   - </div>
52   - <div class="status-item arrive go-over">
53   - <div class="dot"></div>
54   - <div>
55   - <div class="half-status-desc left"></div>
56   - <div class="half-status-desc right"></div>
57   - </div>
58   - <div class="status-desc"><span>确认立案</span></div>
59   - </div>
60   - <div class="status-item arrive notice">
61   - <div class="dot"></div>
62   - <div>
63   - <div class="half-status-desc left"></div>
64   - <div class="half-status-desc right"></div>
65   - </div>
66   - <div class="status-desc">
67   - <span>付款</span>
68   -
69   - <p class="non-pay"><span class="help-ico"></span><span>未付款</span></p>
70   - </div>
71   - </div>
72   - <div class="status-item">
73   - <div class="dot"></div>
74   - <div>
75   - <div class="half-status-desc left"></div>
76   - </div>
77   - <div class="status-desc"><span>确认立案信息</span></div>
78   - </div>
79   - </div>
80   - <div class="write-section-status hidden section-status">
81   - <div class="status-item arrive go-over">
82   - <div class="dot"></div>
83   - <div>
84   - <div class="half-status-desc right"></div>
85   - </div>
86   - <div class="status-desc"><span>分配资深代理人</span></div>
87   - </div>
88   - <div class="status-item arrive go-over">
89   - <div class="dot"></div>
90   - <div>
91   - <div class="half-status-desc left"></div>
92   - <div class="half-status-desc right"></div>
93   - </div>
94   - <div class="status-desc"><span>确认技术交底书</span></div>
95   - </div>
96   - <div class="status-item arrive go-over">
97   - <div class="dot"></div>
98   - <div>
99   - <div class="half-status-desc left"></div>
100   - <div class="half-status-desc right"></div>
101   - </div>
102   - <div class="status-desc"><span>技术查新</span></div>
103   - </div>
104   - <div class="status-item arrive go-over">
105   - <div class="dot"></div>
106   - <div>
107   - <div class="half-status-desc left"></div>
108   - <div class="half-status-desc right"></div>
109   - </div>
110   - <div class="status-desc"><span>资深代理人撰写</span></div>
111   - </div>
112   - <div class="status-item arrive">
113   - <div class="dot"></div>
114   - <div>
115   - <div class="half-status-desc left"></div>
116   - <div class="half-status-desc right"></div>
117   - </div>
118   - <div class="status-desc"><span>确认申请文书</span></div>
119   - </div>
120   - <div class="status-item">
121   - <div class="dot"></div>
122   - <div>
123   - <div class="half-status-desc left"></div>
124   - </div>
125   - <div class="status-desc"><span>递交国知局</span></div>
126   - </div>
127   - </div>
128   - </div>
129   - <div class="case-detail-type-wrap">
130   - <div class="detail-type-title-wrap">
131   - <span class="current-selected" id="server-name">服务名称</span>
132   - <span id="write-info">著录信息</span>
133   - <span id="user-files">我的文件</span>
134   - <span id="canrd-files">Canrd 文件</span>
135   - <span id="org-files">主管部门文件</span>
136   - </div>
137   - <div class="detail-type-content">
138   - <div class="server-name-content">
139   - <p class="notice">注：请尽快完善您的案件信息，否则会影响您的专利申请进展。</p>
140   -
141   - <div class="content-item">
142   - <h3>基本信息</h3>
143   -
144   - <div>
145   - <p>案件编号:<span class="case-num">GG1603754CA</span></p>
146   -
147   - <p>立案时间:<span class="created-time">2016-05-13 22:40:53</span></p>
148   - </div>
149   - </div>
150   - <div class="content-item">
151   - <h3>客户要求</h3>
152   -
153   - <form class="content-form">
154   - <div>
155   - <span class="width-100">
156   - <label for=""><strong class="must-ico">*</strong>专利名称:</label>
157   - </span>
158   - <input type="text" placeholder="请输入专利名称">
159   - </div>
160   - <div>
161   - <span class="width-100">
162   - <label for="">专利类型:</label>
163   - </span>
164   - <input type="text" value="专利类型" hidden>
165   - <span class="btn-label">发明类型</span>
166   - </div>
167   - <div>
168   - <span class="width-100">
169   - <label for=""><strong class="must-ico">*</strong>技术领域:</label>
170   - </span>
171   - <input type="text" placeholder="选择技术领域">
172   - </div>
173   - <div>
174   - <span class="width-100">
175   - <label for=""><strong class="must-ico">*</strong>第一申请人:</label>
176   - </span>
177   - <input type="text">
178   - </div>
179   - <div>
180   - <span class="width-100">
181   - <label for="">其他申请人:</label>
182   - </span>
183   - <input type="text">
184   - </div>
185   - <div>
186   - <span class="width-100">
187   - <label for=""><strong class="must-ico">*</strong>第一发明人:</label>
188   - </span>
189   - <input type="text">
190   - </div>
191   - <div>
192   - <span class="width-100">
193   - <label for="">其他发明人:</label>
194   - </span>
195   - <input type="text">
196   - </div>
197   - <div>
198   - <span class="width-100">
199   - <label for=""><strong class="must-ico">*</strong>技术联系人:</label>
200   - </span>
201   - <input type="text">
202   - </div>
203   - <div class="marginLeft-200">
204   - <div class="present-req">
205   - <span><input type="checkbox" name=""
206   - class="checkbox"><label>申请递交实质审查请求</label></span>
207   - <span><input type="checkbox" name=""><label>费用减缓</label> <a
208   - href="javascript:" class="help-ico"></a></span>
209   - <span><input type="checkbox" name=""><label>提前公开</label> <a
210   - href="javascript:" class="help-ico"></a></span>
211   - </div>
212   - </div>
213   - <p class="spec-state">特殊申明：申请日之前6个月内，以下列形式公开的情况<a href="javascript:"
214   - class="declare-notice">不丧失新颖性</a>
215   - <a href="javascript:" class="help-ico"></a>
216   - </p>
217   -
218   - <div class="marginLeft-200">
219   - <div>
220   - <span>
221   - <input type="checkbox" name="">
222   - <label>在中国政府主办或者承认的国际展览会上第一次展出的发明创造。</label>
223   - </span>
224   - </div>
225   - <div>
226   - <span>
227   - <input type="checkbox" name="">
228   - <label>他人未经申请人同意而泄露其内容的情况是指发生非法滥用权力和剽窃他人发明创造的行为。</label>
229   - </span>
230   - </div>
231   - </div>
232   - <div>
233   - <span class="submit-btn">提交</span>
234   - </div>
235   - </form>
236   - </div>
237   - </div>
238   - <div></div>
239   - <div></div>
240   - <div></div>
241   - <div></div>
242   - </div>
243   - </div>
244   - </div>
245   - </div>
246   - </div>
247   -</div>
248   -<jsp:include page="/include/footer.jsp" flush="true"/>
249   -<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
250   -</body>
251   -
252   -</html>
253 0 \ No newline at end of file
target/patent/case-manage.jsp deleted 100644 → 0
  View file @be77388
1   -<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2   -<html lang="en">
3   -<head>
4   - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5   - <title>科路得</title>
6   - <link rel="stylesheet" type="text/css" href="/css/case-manage.css">
7   -</head>
8   -
9   -<body>
10   -<jsp:include page="/include/header.jsp" flush="true"/>
11   -
12   -<div class="case-manage-wrap">
13   - <div class="content">
14   - <div class="location-wrap">
15   - <span>个人中心</span>
16   - <i class="row-right"></i>
17   - <i class="row-right"></i>
18   - <span class="current">案件管理</span>
19   - </div>
20   - <div class="main-wrap">
21   - <div class="side-nav">
22   - <!-- user-side-bar.html -->
23   - <div class="user-side-bar">
24   - <div class="user-info">
25   - <div class="head-ico"></div>
26   - <p class="user-phone">18354206939</p>
27   -
28   - <div class="edit-btn">编辑</div>
29   - </div>
30   - <ul>
31   - <li data-nav-type="my-cases">我的案件</li>
32   - <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>
33   - <li>案件管理</li>
34   - </ul>
35   - </div>
36   - </div>
37   - <div class="my-case">
38   - <div class="case-statistics">
39   - <p>
40   - <span>全部案件(<a herf="javascript:void(0)" class="case-number all-case">6</a>)</span>
41   - <span>专利(<a herf="javascript:void(0)" class="case-number patent-case">6</a>)</span></p>
42   - </div>
43   - <div class="case-query">
44   - <form>
45   - <div class="search-box">
46   - <span>
47   - <input type="text" name="search-box" placeholder="请输入案件编号/名称">
48   - </span>
49   -
50   - <div class="query-icon search-ico"></div>
51   - </div>
52   - <div class="start-time">
53   - <span>
54   - <input type="text" name="start-time" placeholder="起止时间：">
55   - </span>
56   -
57   - <div class="query-icon calendar-ico"></div>
58   - </div>
59   - <div class="end-time">
60   - <span>
61   - <input type="text" name="end-time" placeholder="至：">
62   - </span>
63   -
64   - <div class="query-icon calendar-ico"></div>
65   - </div>
66   - <div class="deal-status">
67   - <select>
68   - <option value="已下单">已下单</option>
69   - <option value="未支付">未支付</option>
70   - <option value="完成">完成</option>
71   - </select>
72   - </div>
73   - </form>
74   - </div>
75   - <div class="case-list">
76   - <table>
77   - <thead>
78   - <tr class="table-head">
79   - <th>服务名称</th>
80   - <th>案件编号</th>
81   - <th>服务信息</th>
82   - <th>业务操作</th>
83   - <th>费用(元)</th>
84   - <th>交易状态</th>
85   - </tr>
86   - </thead>
87   - <tbody>
88   - <tr>
89   - <td class="td-width-210">
90   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
91   - <div><span>暂无名称</span></div>
92   - </td>
93   - <td class="td-width-120">
94   - GG1603754CA
95   - </td>
96   - <td class="td-width-120">
97   - <div>
98   - <span>标准服务</span>
99   - </div>
100   - <div>
101   - <span>官费暂不缴纳</span>
102   - </div>
103   - </td>
104   - <td class="td-width-120">
105   - <div>
106   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
107   - </div>
108   - <div>
109   - <a href="javascript:" class="color-ff6642">取消案件</a>
110   - </div>
111   - </td>
112   - <td class="td-width-120">
113   - <span>3800</span>
114   - </td>
115   - <td class="td-width-120">
116   - <div>
117   - <span>未支付</span>
118   - </div>
119   - <div>
120   - <a href="javascript:" class="color-ff6642">未支付</a>
121   - </div>
122   - <div>
123   - <a href="javascript:">订单详情</a>
124   - </div>
125   - </td>
126   - </tr>
127   - <tr class="case-list-item-bottom-tr">
128   - <td colspan="6">
129   - <span>合同号：<span>466686664696562</span></span>
130   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
131   - <span class="color-ff6642 delete-btn">删除</span>
132   - </td>
133   - </tr>
134   - <tr>
135   - <td class="td-width-210">
136   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
137   - <div><span>暂无名称</span></div>
138   - </td>
139   - <td class="td-width-120">
140   - GG1603754CA
141   - </td>
142   - <td class="td-width-120">
143   - <div>
144   - <span>标准服务</span>
145   - </div>
146   - <div>
147   - <span>官费暂不缴纳</span>
148   - </div>
149   - </td>
150   - <td class="td-width-120">
151   - <div>
152   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
153   - </div>
154   - <div>
155   - <a href="javascript:" class="color-ff6642">取消案件</a>
156   - </div>
157   - </td>
158   - <td class="td-width-120">
159   - <span>3800</span>
160   - </td>
161   - <td class="td-width-120">
162   - <div>
163   - <span>未支付</span>
164   - </div>
165   - <div>
166   - <a href="javascript:" class="color-ff6642">未支付</a>
167   - </div>
168   - <div>
169   - <a href="javascript:">订单详情</a>
170   - </div>
171   - </td>
172   - </tr>
173   - <tr class="case-list-item-bottom-tr">
174   - <td colspan="6">
175   - <span>合同号：<span>466686664696562</span></span>
176   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
177   - <span class="color-ff6642 delete-btn">删除</span>
178   - </td>
179   - </tr>
180   - <tr>
181   - <td class="td-width-210">
182   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
183   - <div><span>暂无名称</span></div>
184   - </td>
185   - <td class="td-width-120">
186   - GG1603754CA
187   - </td>
188   - <td class="td-width-120">
189   - <div>
190   - <span>标准服务</span>
191   - </div>
192   - <div>
193   - <span>官费暂不缴纳</span>
194   - </div>
195   - </td>
196   - <td class="td-width-120">
197   - <div>
198   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
199   - </div>
200   - <div>
201   - <a href="javascript:" class="color-ff6642">取消案件</a>
202   - </div>
203   - </td>
204   - <td class="td-width-120">
205   - <span>3800</span>
206   - </td>
207   - <td class="td-width-120">
208   - <div>
209   - <span>未支付</span>
210   - </div>
211   - <div>
212   - <a href="javascript:" class="color-ff6642">未支付</a>
213   - </div>
214   - <div>
215   - <a href="javascript:">订单详情</a>
216   - </div>
217   - </td>
218   - </tr>
219   - <tr class="case-list-item-bottom-tr">
220   - <td colspan="6">
221   - <span>合同号：<span>466686664696562</span></span>
222   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
223   - <span class="color-ff6642 delete-btn">删除</span>
224   - </td>
225   - </tr>
226   - </tbody>
227   - </table>
228   - </div>
229   - </div>
230   - </div>
231   - </div>
232   -</div>
233   -<jsp:include page="/include/footer.jsp" flush="true"/>
234   -<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
235   -</body>
236   -</html>
target/patent/pay_result.jsp
  View file @01a7d9c
... ... @@ -28,7 +28,8 @@
28 28 <p>支付结果: ${paymentResult}</p>
29 29 <p>支付金额: ${totalAmount}</p>
30 30 <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
31   - <p><a href="/notice.jsp">案件详情</a></p>
  31 + <p><a href="/case_detail.jsp">案件详情</a></p>
  32 + <p><a href="/query_order_list">案件管理</a></p>
32 33 </div>
33 34 </div>
34 35  
... ...