kelude / canrd-patent · Commits

Commit 0e22c93a421584a6f4c611ee0d63fd81c26611c5

Authored by maoyangou
1 parent dc258520
build: skipped

payment

Inline Side-by-side
Showing 61 changed files with 2848 additions and 566 deletions
.idea/workspace.xml
  View file @0e22c93
... ... @@ -2,18 +2,34 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 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/CaseOutputDto.java" />
6   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
  7 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
  8 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
  9 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/error.jsp" />
  10 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" afterPath="" />
  11 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" afterPath="" />
  12 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
  13 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
7 14 <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" />
8 15 <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" />
9   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" />
10   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" />
  17 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" />
  18 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="$PROJECT_DIR$/doc/patent.mwb.bak" />
11 19 <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" />
12   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
  20 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
  21 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
  22 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
  23 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" />
13 24 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
14 25 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/home_patent.jsp" afterPath="$PROJECT_DIR$/target/patent/home_patent.jsp" />
  26 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="$PROJECT_DIR$/doc/patent.mwb" />
15 27 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  28 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" />
  29 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
  30 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" />
16 31 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  32 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/manual/开发规范.txt" afterPath="$PROJECT_DIR$/doc/manual/开发规范.txt" />
17 33 </list>
18 34 <ignored path="patent.iws" />
19 35 <ignored path=".idea/workspace.xml" />
... ... @@ -39,123 +55,42 @@
39 55 <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false">
40 56 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
41 57 <provider selected="true" editor-type-id="text-editor">
42   - <state vertical-scroll-proportion="-6.490196">
43   - <caret line="302" column="30" selection-start-line="302" selection-start-column="30" selection-end-line="302" selection-end-column="30" />
  58 + <state vertical-scroll-proportion="6.25">
  59 + <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="45" selection-end-column="23" />
44 60 <folding />
45 61 </state>
46 62 </provider>
47 63 </entry>
48 64 </file>
49   - <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="true">
50   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
51   - <provider selected="true" editor-type-id="text-editor">
52   - <state vertical-scroll-proportion="0.08941606">
53   - <caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
54   - <folding />
55   - </state>
56   - </provider>
57   - </entry>
58   - </file>
59   - <file leaf-file-name="header.jsp" pinned="false" current-in-tab="false">
60   - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
61   - <provider selected="true" editor-type-id="text-editor">
62   - <state vertical-scroll-proportion="-5.0">
63   - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
64   - <folding />
65   - </state>
66   - </provider>
67   - </entry>
68   - </file>
69   - <file leaf-file-name="HomePatentController.java" pinned="false" current-in-tab="false">
70   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java">
71   - <provider selected="true" editor-type-id="text-editor">
72   - <state vertical-scroll-proportion="0.0">
73   - <caret line="106" column="67" selection-start-line="106" selection-start-column="67" selection-end-line="106" selection-end-column="67" />
74   - <folding />
75   - </state>
76   - </provider>
77   - </entry>
78   - </file>
79   - <file leaf-file-name="CaseOutputDto.java" pinned="false" current-in-tab="false">
80   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
  65 + <file leaf-file-name="PaymentPageController.java" pinned="false" current-in-tab="true">
  66 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java">
81 67 <provider selected="true" editor-type-id="text-editor">
82   - <state vertical-scroll-proportion="0.0">
83   - <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
  68 + <state vertical-scroll-proportion="0.58563536">
  69 + <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
84 70 <folding>
85   - <element signature="e#348#349#0" expanded="true" />
86   - <element signature="e#373#374#0" expanded="true" />
87   - <element signature="e#407#408#0" expanded="true" />
88   - <element signature="e#435#436#0" expanded="true" />
89   - <element signature="e#466#467#0" expanded="true" />
90   - <element signature="e#493#494#0" expanded="true" />
91   - <element signature="e#533#534#0" expanded="true" />
92   - <element signature="e#565#566#0" expanded="true" />
93   - <element signature="e#598#599#0" expanded="true" />
94   - <element signature="e#627#628#0" expanded="true" />
95   - <element signature="e#671#672#0" expanded="true" />
96   - <element signature="e#707#708#0" expanded="true" />
97   - <element signature="e#745#746#0" expanded="true" />
98   - <element signature="e#779#780#0" expanded="true" />
99   - <element signature="e#833#834#0" expanded="true" />
100   - <element signature="e#879#880#0" expanded="true" />
101   - <element signature="e#914#915#0" expanded="true" />
102   - <element signature="e#945#946#0" expanded="true" />
103   - <element signature="e#993#994#0" expanded="true" />
104   - <element signature="e#1033#1034#0" expanded="true" />
105   - <element signature="e#1065#1066#0" expanded="true" />
106   - <element signature="e#1095#1096#0" expanded="true" />
107   - <element signature="e#1139#1140#0" expanded="true" />
108   - <element signature="e#1177#1178#0" expanded="true" />
109   - <element signature="e#1214#1215#0" expanded="true" />
110   - <element signature="e#1247#1248#0" expanded="true" />
111   - <element signature="e#1299#1300#0" expanded="true" />
112   - <element signature="e#1343#1344#0" expanded="true" />
  71 + <element signature="imports" expanded="true" />
113 72 </folding>
114 73 </state>
115 74 </provider>
116 75 </entry>
117 76 </file>
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">
120   - <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0">
122   - <caret line="105" column="62" selection-start-line="105" selection-start-column="62" selection-end-line="105" selection-end-column="62" />
123   - <folding />
124   - </state>
125   - </provider>
126   - </entry>
127   - </file>
128   - <file leaf-file-name="DateUtils.java" pinned="false" current-in-tab="false">
129   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  77 + <file leaf-file-name="PaymentService.java" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java">
130 79 <provider selected="true" editor-type-id="text-editor">
131 80 <state vertical-scroll-proportion="0.0">
132   - <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
  81 + <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
133 82 <folding>
134   - <element signature="e#0#6857#0" expanded="true" />
135   - <element signature="e#895#896#0" expanded="true" />
136   - <element signature="e#953#954#0" expanded="true" />
137   - <element signature="e#1114#1115#0" expanded="true" />
138   - <element signature="e#1173#1174#0" expanded="true" />
  83 + <element signature="imports" expanded="true" />
139 84 </folding>
140 85 </state>
141 86 </provider>
142 87 </entry>
143 88 </file>
144   - <file leaf-file-name="CaseInputDto.java" pinned="false" current-in-tab="false">
145   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
146   - <provider selected="true" editor-type-id="text-editor">
147   - <state vertical-scroll-proportion="0.0">
148   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
149   - <folding />
150   - </state>
151   - </provider>
152   - </entry>
153   - </file>
154   - <file leaf-file-name="HomePatentService.java" pinned="false" current-in-tab="false">
155   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java">
  89 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="false">
  90 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
156 91 <provider selected="true" editor-type-id="text-editor">
157   - <state vertical-scroll-proportion="0.0">
158   - <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
  92 + <state vertical-scroll-proportion="-40.72549">
  93 + <caret line="164" column="48" selection-start-line="164" selection-start-column="48" selection-end-line="164" selection-end-column="48" />
159 94 <folding />
160 95 </state>
161 96 </provider>
... ... @@ -185,16 +120,6 @@
185 120 <component name="IdeDocumentHistory">
186 121 <option name="CHANGED_PATHS">
187 122 <list>
188   - <option value="$PROJECT_DIR$/src/main/webapp/css/service.css" />
189   - <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
190   - <option value="$PROJECT_DIR$/src/main/webapp/case-detail.html" />
191   - <option value="$PROJECT_DIR$/src/main/webapp/case-manage.html" />
192   - <option value="$PROJECT_DIR$/src/main/webapp/index.html" />
193   - <option value="$PROJECT_DIR$/src/main/webapp/pay.html" />
194   - <option value="$PROJECT_DIR$/src/main/webapp/service.html" />
195   - <option value="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" />
196   - <option value="$PROJECT_DIR$/src/main/webapp/include/footer.xhtml" />
197   - <option value="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" />
198 123 <option value="$PROJECT_DIR$/src/main/webapp/service.jsp" />
199 124 <option value="$PROJECT_DIR$/src/main/resources.local/props/application.properties" />
200 125 <option value="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" />
... ... @@ -204,12 +129,10 @@
204 129 <option value="$PROJECT_DIR$/pom.xml" />
205 130 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java" />
206 131 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" />
207   - <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
208 132 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseType.java" />
209 133 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" />
210 134 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceEnum.java" />
211 135 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" />
212   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
213 136 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" />
214 137 <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
215 138 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
... ... @@ -226,16 +149,28 @@
226 149 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
227 150 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
228 151 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
229   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
230 152 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" />
231 153 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" />
232 154 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" />
233   - <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
234   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
235 155 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
236 156 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
  157 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
  158 + <option value="$PROJECT_DIR$/src/main/webapp/error.jsp" />
  159 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
  160 + <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
  161 + <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" />
  162 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentPageController.java" />
  163 + <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
237 164 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
  165 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" />
  166 + <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
  167 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
  168 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
  169 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
  170 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
  171 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
238 172 <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  173 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
239 174 </list>
240 175 </option>
241 176 </component>
... ... @@ -318,10 +253,9 @@
318 253 <order />
319 254 </component>
320 255 <component name="ProjectFrameBounds">
321   - <option name="x" value="1280" />
322 256 <option name="y" value="23" />
323   - <option name="width" value="1920" />
324   - <option name="height" value="1057" />
  257 + <option name="width" value="1280" />
  258 + <option name="height" value="734" />
325 259 </component>
326 260 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
327 261 <OptionsSetting value="true" id="Add" />
... ... @@ -347,8 +281,8 @@
347 281 </navigator>
348 282 <panes>
349 283 <pane id="PackagesPane" />
350   - <pane id="Scope" />
351 284 <pane id="Scratches" />
  285 + <pane id="Scope" />
352 286 <pane id="ProjectPane">
353 287 <subPane>
354 288 <PATH>
... ... @@ -380,6 +314,14 @@
380 314 <option name="myItemId" value="src" />
381 315 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
382 316 </PATH_ELEMENT>
  317 + <PATH_ELEMENT>
  318 + <option name="myItemId" value="test" />
  319 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  320 + </PATH_ELEMENT>
  321 + <PATH_ELEMENT>
  322 + <option name="myItemId" value="resources" />
  323 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  324 + </PATH_ELEMENT>
383 325 </PATH>
384 326 <PATH>
385 327 <PATH_ELEMENT>
... ... @@ -395,11 +337,15 @@
395 337 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
396 338 </PATH_ELEMENT>
397 339 <PATH_ELEMENT>
398   - <option name="myItemId" value="main" />
  340 + <option name="myItemId" value="test" />
399 341 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
400 342 </PATH_ELEMENT>
401 343 <PATH_ELEMENT>
402   - <option name="myItemId" value="webapp" />
  344 + <option name="myItemId" value="resources" />
  345 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  346 + </PATH_ELEMENT>
  347 + <PATH_ELEMENT>
  348 + <option name="myItemId" value="mbg" />
403 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
404 350 </PATH_ELEMENT>
405 351 </PATH>
... ... @@ -417,7 +363,7 @@
417 363 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
418 364 </PATH_ELEMENT>
419 365 <PATH_ELEMENT>
420   - <option name="myItemId" value="main" />
  366 + <option name="myItemId" value="test" />
421 367 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
422 368 </PATH_ELEMENT>
423 369 </PATH>
... ... @@ -439,15 +385,25 @@
439 385 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440 386 </PATH_ELEMENT>
441 387 <PATH_ELEMENT>
442   - <option name="myItemId" value="java" />
  388 + <option name="myItemId" value="webapp" />
443 389 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
444 390 </PATH_ELEMENT>
  391 + </PATH>
  392 + <PATH>
445 393 <PATH_ELEMENT>
446 394 <option name="myItemId" value="patent" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="canrd-patent" />
447 399 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
448 400 </PATH_ELEMENT>
449 401 <PATH_ELEMENT>
450   - <option name="myItemId" value="web" />
  402 + <option name="myItemId" value="src" />
  403 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  404 + </PATH_ELEMENT>
  405 + <PATH_ELEMENT>
  406 + <option name="myItemId" value="main" />
451 407 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
452 408 </PATH_ELEMENT>
453 409 </PATH>
... ... @@ -469,11 +425,7 @@
469 425 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
470 426 </PATH_ELEMENT>
471 427 <PATH_ELEMENT>
472   - <option name="myItemId" value="java" />
473   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
474   - </PATH_ELEMENT>
475   - <PATH_ELEMENT>
476   - <option name="myItemId" value="patent" />
  428 + <option name="myItemId" value="resources" />
477 429 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
478 430 </PATH_ELEMENT>
479 431 </PATH>
... ... @@ -503,7 +455,7 @@
503 455 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
504 456 </PATH_ELEMENT>
505 457 <PATH_ELEMENT>
506   - <option name="myItemId" value="dal" />
  458 + <option name="myItemId" value="web" />
507 459 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
508 460 </PATH_ELEMENT>
509 461 </PATH>
... ... @@ -533,11 +485,7 @@
533 485 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
534 486 </PATH_ELEMENT>
535 487 <PATH_ELEMENT>
536   - <option name="myItemId" value="dal" />
537   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
538   - </PATH_ELEMENT>
539   - <PATH_ELEMENT>
540   - <option name="myItemId" value="dto" />
  488 + <option name="myItemId" value="service" />
541 489 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
542 490 </PATH_ELEMENT>
543 491 </PATH>
... ... @@ -566,14 +514,6 @@
566 514 <option name="myItemId" value="patent" />
567 515 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
568 516 </PATH_ELEMENT>
569   - <PATH_ELEMENT>
570   - <option name="myItemId" value="common" />
571   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
572   - </PATH_ELEMENT>
573   - <PATH_ELEMENT>
574   - <option name="myItemId" value="utils" />
575   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
576   - </PATH_ELEMENT>
577 517 </PATH>
578 518 <PATH>
579 519 <PATH_ELEMENT>
... ... @@ -585,23 +525,25 @@
585 525 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
586 526 </PATH_ELEMENT>
587 527 <PATH_ELEMENT>
588   - <option name="myItemId" value="src" />
  528 + <option name="myItemId" value="doc" />
589 529 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
590 530 </PATH_ELEMENT>
  531 + </PATH>
  532 + <PATH>
591 533 <PATH_ELEMENT>
592   - <option name="myItemId" value="main" />
593   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  534 + <option name="myItemId" value="patent" />
  535 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
594 536 </PATH_ELEMENT>
595 537 <PATH_ELEMENT>
596   - <option name="myItemId" value="java" />
  538 + <option name="myItemId" value="canrd-patent" />
597 539 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
598 540 </PATH_ELEMENT>
599 541 <PATH_ELEMENT>
600   - <option name="myItemId" value="patent" />
  542 + <option name="myItemId" value="doc" />
601 543 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
602 544 </PATH_ELEMENT>
603 545 <PATH_ELEMENT>
604   - <option name="myItemId" value="common" />
  546 + <option name="myItemId" value="manual" />
605 547 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
606 548 </PATH_ELEMENT>
607 549 </PATH>
... ... @@ -631,9 +573,9 @@
631 573 <recent name="com.canrd.patent.web" />
632 574 </key>
633 575 <key name="CopyFile.RECENT_KEYS">
  576 + <recent name="$PROJECT_DIR$/src/main/webapp" />
634 577 <recent name="$PROJECT_DIR$/src/main/webapp/css" />
635 578 <recent name="$PROJECT_DIR$/src/main/webapp/include" />
636   - <recent name="$PROJECT_DIR$/src/main/webapp" />
637 579 </key>
638 580 <key name="MoveFile.RECENT_KEYS">
639 581 <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
... ... @@ -682,14 +624,14 @@
682 624 <envs />
683 625 <method />
684 626 </configuration>
685   - <configuration default="false" name="HomePatentService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
  627 + <configuration default="false" name="CasementService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
686 628 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
687 629 <pattern>
688 630 <option name="PATTERN" value="com.canrd.patent.service.*" />
689 631 <option name="ENABLED" value="true" />
690 632 </pattern>
691 633 </extension>
692   - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.service.HomePatentService" />
  634 + <option name="MAIN_CLASS_NAME" value="com.canrd.patent.service.CasementService" />
693 635 <option name="VM_PARAMETERS" />
694 636 <option name="PROGRAM_PARAMETERS" />
695 637 <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
... ... @@ -1060,11 +1002,11 @@
1060 1002 <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" />
1061 1003 <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />
1062 1004 <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />
1063   - <item index="3" class="java.lang.String" itemvalue="Application.HomePatentService" />
  1005 + <item index="3" class="java.lang.String" itemvalue="Application.CasementService" />
1064 1006 </list>
1065 1007 <recent_temporary>
1066 1008 <list size="3">
1067   - <item index="0" class="java.lang.String" itemvalue="Application.HomePatentService" />
  1009 + <item index="0" class="java.lang.String" itemvalue="Application.CasementService" />
1068 1010 <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />
1069 1011 <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />
1070 1012 </list>
... ... @@ -1088,37 +1030,39 @@
1088 1030 <workItem from="1468542212525" duration="929000" />
1089 1031 <workItem from="1468640565571" duration="23833000" />
1090 1032 <workItem from="1468748693910" duration="7618000" />
1091   - <workItem from="1468885739175" duration="14388000" />
  1033 + <workItem from="1468885739175" duration="14625000" />
  1034 + <workItem from="1469026864774" duration="4528000" />
  1035 + <workItem from="1469112269396" duration="5853000" />
1092 1036 </task>
1093 1037 <servers />
1094 1038 </component>
1095 1039 <component name="TimeTrackingManager">
1096   - <option name="totallyTimeSpent" value="64572000" />
  1040 + <option name="totallyTimeSpent" value="75190000" />
1097 1041 </component>
1098 1042 <component name="ToolWindowManager">
1099   - <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
  1043 + <frame x="0" y="23" width="1280" height="734" extended-state="6" />
1100 1044 <editor active="true" />
1101 1045 <layout>
1102 1046 <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" />
1103 1047 <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" />
1104 1048 <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" />
1105   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38065523" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1049 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22274144" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1106 1050 <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" />
1107   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3834197" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1051 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44548288" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1108 1052 <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" />
1109 1053 <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" />
1110 1054 <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" />
1111   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.37823835" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1055 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3504673" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1112 1056 <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" />
1113 1057 <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" />
1114 1058 <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="7" side_tool="false" content_ui="tabs" />
1115   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31813473" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1059 + <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" />
1116 1060 <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" />
1117 1061 <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" />
1118 1062 <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" />
1119   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.08642972" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1063 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1292407" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1120 1064 <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" />
1121   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1970181" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  1065 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19789983" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
1122 1066 <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" />
1123 1067 <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" />
1124 1068 <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" />
... ... @@ -1168,7 +1112,7 @@
1168 1112 </component>
1169 1113 <component name="XDebuggerManager">
1170 1114 <breakpoint-manager>
1171   - <option name="time" value="14" />
  1115 + <option name="time" value="21" />
1172 1116 </breakpoint-manager>
1173 1117 <watches-manager>
1174 1118 <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
... ... @@ -1184,57 +1128,6 @@
1184 1128 <option name="FILTER_TARGETS" value="false" />
1185 1129 </component>
1186 1130 <component name="editorHistoryManager">
1187   - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
1188   - <provider selected="true" editor-type-id="text-editor">
1189   - <state vertical-scroll-proportion="0.0">
1190   - <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
1191   - </state>
1192   - </provider>
1193   - </entry>
1194   - <entry file="file://$PROJECT_DIR$/pom.xml">
1195   - <provider selected="true" editor-type-id="text-editor">
1196   - <state vertical-scroll-proportion="0.0">
1197   - <caret line="529" column="25" selection-start-line="529" selection-start-column="25" selection-end-line="529" selection-end-column="25" />
1198   - <folding />
1199   - </state>
1200   - </provider>
1201   - </entry>
1202   - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml">
1203   - <provider selected="true" editor-type-id="text-editor">
1204   - <state vertical-scroll-proportion="0.0">
1205   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1206   - </state>
1207   - </provider>
1208   - </entry>
1209   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/TestModel.java">
1210   - <provider selected="true" editor-type-id="text-editor">
1211   - <state vertical-scroll-proportion="0.0">
1212   - <caret line="0" column="31" selection-start-line="0" selection-start-column="31" selection-end-line="0" selection-end-column="31" />
1213   - </state>
1214   - </provider>
1215   - </entry>
1216   - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml">
1217   - <provider selected="true" editor-type-id="text-editor">
1218   - <state vertical-scroll-proportion="0.0">
1219   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1220   - <folding />
1221   - </state>
1222   - </provider>
1223   - </entry>
1224   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java">
1225   - <provider selected="true" editor-type-id="text-editor">
1226   - <state vertical-scroll-proportion="0.0">
1227   - <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
1228   - </state>
1229   - </provider>
1230   - </entry>
1231   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/TessEnum.java">
1232   - <provider selected="true" editor-type-id="text-editor">
1233   - <state vertical-scroll-proportion="0.0">
1234   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
1235   - </state>
1236   - </provider>
1237   - </entry>
1238 1131 <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/src.zip!/java/lang/String.java">
1239 1132 <provider selected="true" editor-type-id="text-editor">
1240 1133 <state vertical-scroll-proportion="0.0">
... ... @@ -1250,7 +1143,6 @@
1250 1143 <provider selected="true" editor-type-id="text-editor">
1251 1144 <state vertical-scroll-proportion="0.0">
1252 1145 <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
1253   - <folding />
1254 1146 </state>
1255 1147 </provider>
1256 1148 </entry>
... ... @@ -1265,28 +1157,6 @@
1265 1157 </state>
1266 1158 </provider>
1267 1159 </entry>
1268   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
1269   - <provider selected="true" editor-type-id="text-editor">
1270   - <state vertical-scroll-proportion="0.0">
1271   - <caret line="111" column="73" selection-start-line="111" selection-start-column="73" selection-end-line="111" selection-end-column="73" />
1272   - </state>
1273   - </provider>
1274   - </entry>
1275   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
1276   - <provider selected="true" editor-type-id="text-editor">
1277   - <state vertical-scroll-proportion="0.0">
1278   - <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
1279   - </state>
1280   - </provider>
1281   - </entry>
1282   - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
1283   - <provider selected="true" editor-type-id="text-editor">
1284   - <state vertical-scroll-proportion="-8.333333">
1285   - <caret line="15" column="44" selection-start-line="15" selection-start-column="44" selection-end-line="15" selection-end-column="44" />
1286   - <folding />
1287   - </state>
1288   - </provider>
1289   - </entry>
1290 1160 <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
1291 1161 <provider selected="true" editor-type-id="text-editor">
1292 1162 <state vertical-scroll-proportion="0.0">
... ... @@ -1323,7 +1193,6 @@
1323 1193 <provider selected="true" editor-type-id="text-editor">
1324 1194 <state vertical-scroll-proportion="0.0">
1325 1195 <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="10" selection-end-column="31" />
1326   - <folding />
1327 1196 </state>
1328 1197 </provider>
1329 1198 </entry>
... ... @@ -1374,14 +1243,6 @@
1374 1243 </state>
1375 1244 </provider>
1376 1245 </entry>
1377   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
1378   - <provider selected="true" editor-type-id="text-editor">
1379   - <state vertical-scroll-proportion="0.0">
1380   - <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="101" selection-end-column="1" />
1381   - <folding />
1382   - </state>
1383   - </provider>
1384   - </entry>
1385 1246 <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
1386 1247 <provider selected="true" editor-type-id="text-editor">
1387 1248 <state vertical-scroll-proportion="0.0">
... ... @@ -1389,19 +1250,10 @@
1389 1250 </state>
1390 1251 </provider>
1391 1252 </entry>
1392   - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1393   - <provider selected="true" editor-type-id="text-editor">
1394   - <state vertical-scroll-proportion="-1.875">
1395   - <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
1396   - <folding />
1397   - </state>
1398   - </provider>
1399   - </entry>
1400 1253 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java">
1401 1254 <provider selected="true" editor-type-id="text-editor">
1402 1255 <state vertical-scroll-proportion="0.0">
1403 1256 <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
1404   - <folding />
1405 1257 </state>
1406 1258 </provider>
1407 1259 </entry>
... ... @@ -1417,7 +1269,6 @@
1417 1269 <provider selected="true" editor-type-id="text-editor">
1418 1270 <state vertical-scroll-proportion="0.0">
1419 1271 <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
1420   - <folding />
1421 1272 </state>
1422 1273 </provider>
1423 1274 </entry>
... ... @@ -1425,39 +1276,6 @@
1425 1276 <provider selected="true" editor-type-id="text-editor">
1426 1277 <state vertical-scroll-proportion="0.0">
1427 1278 <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" />
1428   - <folding>
1429   - <element signature="e#861#862#0" expanded="false" />
1430   - <element signature="e#894#895#0" expanded="false" />
1431   - <element signature="e#931#932#0" expanded="false" />
1432   - <element signature="e#967#968#0" expanded="false" />
1433   - <element signature="e#1002#1003#0" expanded="false" />
1434   - <element signature="e#1037#1038#0" expanded="false" />
1435   - <element signature="e#1081#1082#0" expanded="false" />
1436   - <element signature="e#1121#1122#0" expanded="false" />
1437   - <element signature="e#1666#1667#0" expanded="false" />
1438   - <element signature="e#1699#1700#0" expanded="false" />
1439   - <element signature="e#1736#1737#0" expanded="false" />
1440   - <element signature="e#1772#1773#0" expanded="false" />
1441   - <element signature="e#1807#1808#0" expanded="false" />
1442   - <element signature="e#1842#1843#0" expanded="false" />
1443   - <element signature="e#1886#1887#0" expanded="false" />
1444   - <element signature="e#1926#1927#0" expanded="false" />
1445   - <element signature="e#2278#2279#0" expanded="false" />
1446   - <element signature="e#2311#2312#0" expanded="false" />
1447   - <element signature="e#2348#2349#0" expanded="false" />
1448   - <element signature="e#2384#2385#0" expanded="false" />
1449   - <element signature="e#2419#2420#0" expanded="false" />
1450   - <element signature="e#2454#2455#0" expanded="false" />
1451   - <element signature="e#2498#2499#0" expanded="false" />
1452   - <element signature="e#2538#2539#0" expanded="false" />
1453   - <element signature="e#3116#3117#0" expanded="false" />
1454   - <element signature="e#3153#3154#0" expanded="false" />
1455   - <element signature="e#3189#3190#0" expanded="false" />
1456   - <element signature="e#3224#3225#0" expanded="false" />
1457   - <element signature="e#3259#3260#0" expanded="false" />
1458   - <element signature="e#3303#3304#0" expanded="false" />
1459   - <element signature="e#3343#3344#0" expanded="false" />
1460   - </folding>
1461 1279 </state>
1462 1280 </provider>
1463 1281 </entry>
... ... @@ -1491,250 +1309,278 @@
1491 1309 </state>
1492 1310 </provider>
1493 1311 </entry>
1494   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1312 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java">
1495 1313 <provider selected="true" editor-type-id="text-editor">
1496 1314 <state vertical-scroll-proportion="0.0">
1497   - <caret line="50" column="118" selection-start-line="50" selection-start-column="13" selection-end-line="50" selection-end-column="204" />
  1315 + <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />
1498 1316 <folding />
1499 1317 </state>
1500 1318 </provider>
1501 1319 </entry>
1502   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java">
  1320 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java">
1503 1321 <provider selected="true" editor-type-id="text-editor">
1504 1322 <state vertical-scroll-proportion="0.0">
1505   - <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />
  1323 + <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
  1324 + </state>
  1325 + </provider>
  1326 + </entry>
  1327 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java">
  1328 + <provider selected="true" editor-type-id="text-editor">
  1329 + <state vertical-scroll-proportion="0.0">
  1330 + <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
1506 1331 <folding />
1507 1332 </state>
1508 1333 </provider>
1509 1334 </entry>
1510   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
  1335 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java">
  1336 + <provider selected="true" editor-type-id="text-editor">
  1337 + <state vertical-scroll-proportion="0.0">
  1338 + <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
  1339 + </state>
  1340 + </provider>
  1341 + </entry>
  1342 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1511 1343 <provider selected="true" editor-type-id="text-editor">
1512 1344 <state vertical-scroll-proportion="0.0">
1513   - <caret line="202" column="13" selection-start-line="202" selection-start-column="13" selection-end-line="202" selection-end-column="13" />
  1345 + <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
  1346 + </state>
  1347 + </provider>
  1348 + </entry>
  1349 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1350 + <provider selected="true" editor-type-id="text-editor">
  1351 + <state vertical-scroll-proportion="0.22900763">
  1352 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
  1353 + <folding />
  1354 + </state>
  1355 + </provider>
  1356 + </entry>
  1357 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
  1358 + <provider selected="true" editor-type-id="text-editor">
  1359 + <state vertical-scroll-proportion="0.13686131">
  1360 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1361 + </state>
  1362 + </provider>
  1363 + </entry>
  1364 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  1365 + <provider selected="true" editor-type-id="text-editor">
  1366 + <state vertical-scroll-proportion="0.3448905">
  1367 + <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
1514 1368 <folding>
1515   - <element signature="e#2917#2918#0" expanded="false" />
1516   - <element signature="e#2942#2943#0" expanded="false" />
1517   - <element signature="e#3194#3195#0" expanded="false" />
1518   - <element signature="e#3222#3223#0" expanded="false" />
1519   - <element signature="e#3475#3476#0" expanded="false" />
1520   - <element signature="e#3502#3503#0" expanded="false" />
1521   - <element signature="e#3766#3767#0" expanded="false" />
1522   - <element signature="e#3827#3828#0" expanded="false" />
1523   - <element signature="e#4086#4087#0" expanded="false" />
1524   - <element signature="e#4115#4116#0" expanded="false" />
1525   - <element signature="e#4389#4390#0" expanded="false" />
1526   - <element signature="e#4456#4457#0" expanded="false" />
1527   - <element signature="e#4723#4724#0" expanded="false" />
1528   - <element signature="e#4754#4755#0" expanded="false" />
1529   - <element signature="e#5040#5041#0" expanded="false" />
1530   - <element signature="e#5113#5114#0" expanded="false" />
1531   - <element signature="e#5389#5390#0" expanded="false" />
1532   - <element signature="e#5423#5424#0" expanded="false" />
1533   - <element signature="e#6073#6074#0" expanded="false" />
1534   - <element signature="e#6104#6105#0" expanded="false" />
1535   - <element signature="e#6390#6391#0" expanded="false" />
1536   - <element signature="e#6463#6464#0" expanded="false" />
1537   - <element signature="e#6736#6737#0" expanded="false" />
1538   - <element signature="e#6769#6770#0" expanded="false" />
1539   - <element signature="e#7065#7066#0" expanded="false" />
1540   - <element signature="e#7144#7145#0" expanded="false" />
1541   - <element signature="e#7404#7405#0" expanded="false" />
1542   - <element signature="e#7434#7435#0" expanded="false" />
1543   - <element signature="e#7711#7712#0" expanded="false" />
1544   - <element signature="e#7749#7750#0" expanded="false" />
1545   - <element signature="e#8025#8026#0" expanded="false" />
1546   - <element signature="e#8059#8060#0" expanded="false" />
1547   - <element signature="e#8715#8716#0" expanded="false" />
1548   - <element signature="e#8748#8749#0" expanded="false" />
1549   - <element signature="e#9044#9045#0" expanded="false" />
1550   - <element signature="e#9123#9124#0" expanded="false" />
1551   - <element signature="e#9390#9391#0" expanded="false" />
1552   - <element signature="e#9421#9422#0" expanded="false" />
1553   - <element signature="e#9707#9708#0" expanded="false" />
1554   - <element signature="e#9780#9781#0" expanded="false" />
1555   - <element signature="e#10051#10052#0" expanded="false" />
1556   - <element signature="e#10084#10085#0" expanded="false" />
1557   - <element signature="e#10378#10379#0" expanded="false" />
1558   - <element signature="e#10422#10423#0" expanded="false" />
1559   - <element signature="e#10693#10694#0" expanded="false" />
1560   - <element signature="e#10726#10727#0" expanded="false" />
1561   - <element signature="e#11020#11021#0" expanded="false" />
1562   - <element signature="e#11064#11065#0" expanded="false" />
  1369 + <element signature="e#0#6857#0" expanded="false" />
  1370 + <element signature="e#895#896#0" expanded="false" />
  1371 + <element signature="e#953#954#0" expanded="false" />
  1372 + <element signature="e#1114#1115#0" expanded="false" />
  1373 + <element signature="e#1173#1174#0" expanded="false" />
1563 1374 </folding>
1564 1375 </state>
1565 1376 </provider>
1566 1377 </entry>
1567   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
  1378 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1568 1379 <provider selected="true" editor-type-id="text-editor">
1569   - <state vertical-scroll-proportion="0.0">
1570   - <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
  1380 + <state vertical-scroll-proportion="0.61496353">
  1381 + <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
1571 1382 <folding>
1572   - <element signature="e#532#533#0" expanded="false" />
1573   - <element signature="e#558#559#0" expanded="false" />
1574   - <element signature="e#593#594#0" expanded="false" />
1575   - <element signature="e#623#624#0" expanded="false" />
1576   - <element signature="e#669#670#0" expanded="false" />
1577   - <element signature="e#697#698#0" expanded="false" />
1578   - <element signature="e#739#740#0" expanded="false" />
1579   - <element signature="e#773#774#0" expanded="false" />
1580   - <element signature="e#825#826#0" expanded="false" />
1581   - <element signature="e#859#860#0" expanded="false" />
1582   - <element signature="e#913#914#0" expanded="false" />
1583   - <element signature="e#959#960#0" expanded="false" />
  1383 + <element signature="e#348#349#0" expanded="false" />
  1384 + <element signature="e#373#374#0" expanded="false" />
  1385 + <element signature="e#407#408#0" expanded="false" />
  1386 + <element signature="e#435#436#0" expanded="false" />
  1387 + <element signature="e#466#467#0" expanded="false" />
  1388 + <element signature="e#493#494#0" expanded="false" />
  1389 + <element signature="e#533#534#0" expanded="false" />
  1390 + <element signature="e#565#566#0" expanded="false" />
  1391 + <element signature="e#598#599#0" expanded="false" />
  1392 + <element signature="e#627#628#0" expanded="false" />
  1393 + <element signature="e#671#672#0" expanded="false" />
  1394 + <element signature="e#707#708#0" expanded="false" />
  1395 + <element signature="e#745#746#0" expanded="false" />
  1396 + <element signature="e#779#780#0" expanded="false" />
  1397 + <element signature="e#833#834#0" expanded="false" />
  1398 + <element signature="e#879#880#0" expanded="false" />
  1399 + <element signature="e#914#915#0" expanded="false" />
  1400 + <element signature="e#945#946#0" expanded="false" />
  1401 + <element signature="e#993#994#0" expanded="false" />
  1402 + <element signature="e#1033#1034#0" expanded="false" />
  1403 + <element signature="e#1065#1066#0" expanded="false" />
  1404 + <element signature="e#1095#1096#0" expanded="false" />
  1405 + <element signature="e#1139#1140#0" expanded="false" />
  1406 + <element signature="e#1177#1178#0" expanded="false" />
  1407 + <element signature="e#1214#1215#0" expanded="false" />
  1408 + <element signature="e#1247#1248#0" expanded="false" />
  1409 + <element signature="e#1299#1300#0" expanded="false" />
  1410 + <element signature="e#1343#1344#0" expanded="false" />
1584 1411 </folding>
1585 1412 </state>
1586 1413 </provider>
1587 1414 </entry>
1588   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java">
  1415 + <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
  1416 + <provider selected="true" editor-type-id="text-editor">
  1417 + <state vertical-scroll-proportion="-8.125">
  1418 + <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
  1419 + <folding />
  1420 + </state>
  1421 + </provider>
  1422 + </entry>
  1423 + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
  1424 + <provider selected="true" editor-type-id="text-editor">
  1425 + <state vertical-scroll-proportion="-12.5">
  1426 + <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="21" />
  1427 + <folding />
  1428 + </state>
  1429 + </provider>
  1430 + </entry>
  1431 + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
1589 1432 <provider selected="true" editor-type-id="text-editor">
1590 1433 <state vertical-scroll-proportion="0.0">
1591   - <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
  1434 + <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />
  1435 + <folding />
1592 1436 </state>
1593 1437 </provider>
1594 1438 </entry>
1595   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java">
  1439 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1596 1440 <provider selected="true" editor-type-id="text-editor">
1597 1441 <state vertical-scroll-proportion="0.0">
1598   - <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
  1442 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1599 1443 <folding />
1600 1444 </state>
1601 1445 </provider>
1602 1446 </entry>
1603   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java">
  1447 + <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
1604 1448 <provider selected="true" editor-type-id="text-editor">
1605 1449 <state vertical-scroll-proportion="0.0">
1606   - <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
  1450 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1451 + <folding />
  1452 + </state>
  1453 + </provider>
  1454 + </entry>
  1455 + <entry file="file://$PROJECT_DIR$/doc/manual/开发规范.txt">
  1456 + <provider selected="true" editor-type-id="text-editor">
  1457 + <state vertical-scroll-proportion="0.0">
  1458 + <caret line="6" column="37" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
  1459 + <folding />
  1460 + </state>
  1461 + </provider>
  1462 + </entry>
  1463 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
  1464 + <provider selected="true" editor-type-id="text-editor">
  1465 + <state vertical-scroll-proportion="0.0">
  1466 + <caret line="111" column="73" selection-start-line="111" selection-start-column="73" selection-end-line="111" selection-end-column="73" />
1607 1467 <folding>
1608   - <element signature="e#442#443#0" expanded="false" />
1609   - <element signature="e#468#469#0" expanded="false" />
1610   - <element signature="e#503#504#0" expanded="false" />
1611   - <element signature="e#533#534#0" expanded="false" />
1612   - <element signature="e#579#580#0" expanded="false" />
1613   - <element signature="e#607#608#0" expanded="false" />
1614   - <element signature="e#649#650#0" expanded="false" />
1615   - <element signature="e#683#684#0" expanded="false" />
1616   - <element signature="e#735#736#0" expanded="false" />
1617   - <element signature="e#769#770#0" expanded="false" />
1618   - <element signature="e#823#824#0" expanded="false" />
1619   - <element signature="e#869#870#0" expanded="false" />
  1468 + <element signature="imports" expanded="false" />
  1469 + <element signature="e#1232#1233#0" expanded="false" />
  1470 + <element signature="e#1268#1269#0" expanded="false" />
  1471 + <element signature="e#1779#1780#0" expanded="false" />
  1472 + <element signature="e#1814#1815#0" expanded="false" />
1620 1473 </folding>
1621 1474 </state>
1622 1475 </provider>
1623 1476 </entry>
1624   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
  1477 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
1625 1478 <provider selected="true" editor-type-id="text-editor">
1626 1479 <state vertical-scroll-proportion="0.0">
1627   - <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
  1480 + <caret line="244" column="1" selection-start-line="244" selection-start-column="1" selection-end-line="244" selection-end-column="1" />
1628 1481 <folding />
1629 1482 </state>
1630 1483 </provider>
1631 1484 </entry>
1632   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java">
  1485 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1633 1486 <provider selected="true" editor-type-id="text-editor">
1634 1487 <state vertical-scroll-proportion="0.0">
1635   - <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
  1488 + <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
1636 1489 <folding />
1637 1490 </state>
1638 1491 </provider>
1639 1492 </entry>
1640   - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1493 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
1641 1494 <provider selected="true" editor-type-id="text-editor">
1642   - <state vertical-scroll-proportion="-5.0">
1643   - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
  1495 + <state vertical-scroll-proportion="0.0">
  1496 + <caret line="47" column="42" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="42" />
1644 1497 <folding />
1645 1498 </state>
1646 1499 </provider>
1647 1500 </entry>
1648   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
  1501 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
1649 1502 <provider selected="true" editor-type-id="text-editor">
1650 1503 <state vertical-scroll-proportion="0.0">
1651   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1504 + <caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="27" selection-end-column="5" />
1652 1505 <folding />
1653 1506 </state>
1654 1507 </provider>
1655 1508 </entry>
1656   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  1509 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java">
1657 1510 <provider selected="true" editor-type-id="text-editor">
1658   - <state vertical-scroll-proportion="0.0">
1659   - <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
1660   - <folding>
1661   - <element signature="e#0#6857#0" expanded="true" />
1662   - <element signature="e#895#896#0" expanded="true" />
1663   - <element signature="e#953#954#0" expanded="true" />
1664   - <element signature="e#1114#1115#0" expanded="true" />
1665   - <element signature="e#1173#1174#0" expanded="true" />
1666   - </folding>
  1511 + <state vertical-scroll-proportion="0.29085872">
  1512 + <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
  1513 + <folding />
1667 1514 </state>
1668 1515 </provider>
1669 1516 </entry>
1670   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
  1517 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
1671 1518 <provider selected="true" editor-type-id="text-editor">
1672 1519 <state vertical-scroll-proportion="0.0">
1673   - <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
1674   - <folding>
1675   - <element signature="e#348#349#0" expanded="true" />
1676   - <element signature="e#373#374#0" expanded="true" />
1677   - <element signature="e#407#408#0" expanded="true" />
1678   - <element signature="e#435#436#0" expanded="true" />
1679   - <element signature="e#466#467#0" expanded="true" />
1680   - <element signature="e#493#494#0" expanded="true" />
1681   - <element signature="e#533#534#0" expanded="true" />
1682   - <element signature="e#565#566#0" expanded="true" />
1683   - <element signature="e#598#599#0" expanded="true" />
1684   - <element signature="e#627#628#0" expanded="true" />
1685   - <element signature="e#671#672#0" expanded="true" />
1686   - <element signature="e#707#708#0" expanded="true" />
1687   - <element signature="e#745#746#0" expanded="true" />
1688   - <element signature="e#779#780#0" expanded="true" />
1689   - <element signature="e#833#834#0" expanded="true" />
1690   - <element signature="e#879#880#0" expanded="true" />
1691   - <element signature="e#914#915#0" expanded="true" />
1692   - <element signature="e#945#946#0" expanded="true" />
1693   - <element signature="e#993#994#0" expanded="true" />
1694   - <element signature="e#1033#1034#0" expanded="true" />
1695   - <element signature="e#1065#1066#0" expanded="true" />
1696   - <element signature="e#1095#1096#0" expanded="true" />
1697   - <element signature="e#1139#1140#0" expanded="true" />
1698   - <element signature="e#1177#1178#0" expanded="true" />
1699   - <element signature="e#1214#1215#0" expanded="true" />
1700   - <element signature="e#1247#1248#0" expanded="true" />
1701   - <element signature="e#1299#1300#0" expanded="true" />
1702   - <element signature="e#1343#1344#0" expanded="true" />
1703   - </folding>
  1520 + <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
  1521 + <folding />
1704 1522 </state>
1705 1523 </provider>
1706 1524 </entry>
1707   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  1525 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
1708 1526 <provider selected="true" editor-type-id="text-editor">
1709 1527 <state vertical-scroll-proportion="0.0">
1710   - <caret line="105" column="62" selection-start-line="105" selection-start-column="62" selection-end-line="105" selection-end-column="62" />
  1528 + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
1711 1529 <folding />
1712 1530 </state>
1713 1531 </provider>
1714 1532 </entry>
1715   - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1533 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1716 1534 <provider selected="true" editor-type-id="text-editor">
1717   - <state vertical-scroll-proportion="-6.490196">
1718   - <caret line="302" column="30" selection-start-line="302" selection-start-column="30" selection-end-line="302" selection-end-column="30" />
  1535 + <state vertical-scroll-proportion="0.0">
  1536 + <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
1719 1537 <folding />
1720 1538 </state>
1721 1539 </provider>
1722 1540 </entry>
1723   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java">
  1541 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
1724 1542 <provider selected="true" editor-type-id="text-editor">
1725 1543 <state vertical-scroll-proportion="0.0">
1726   - <caret line="106" column="67" selection-start-line="106" selection-start-column="67" selection-end-line="106" selection-end-column="67" />
  1544 + <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
  1545 + <folding />
  1546 + </state>
  1547 + </provider>
  1548 + </entry>
  1549 + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1550 + <provider selected="true" editor-type-id="text-editor">
  1551 + <state vertical-scroll-proportion="6.25">
  1552 + <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="45" selection-end-column="23" />
1727 1553 <folding />
1728 1554 </state>
1729 1555 </provider>
1730 1556 </entry>
1731 1557 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1732 1558 <provider selected="true" editor-type-id="text-editor">
1733   - <state vertical-scroll-proportion="0.08941606">
1734   - <caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
  1559 + <state vertical-scroll-proportion="-40.72549">
  1560 + <caret line="164" column="48" selection-start-line="164" selection-start-column="48" selection-end-line="164" selection-end-column="48" />
1735 1561 <folding />
1736 1562 </state>
1737 1563 </provider>
1738 1564 </entry>
  1565 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java">
  1566 + <provider selected="true" editor-type-id="text-editor">
  1567 + <state vertical-scroll-proportion="0.0">
  1568 + <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
  1569 + <folding>
  1570 + <element signature="imports" expanded="true" />
  1571 + </folding>
  1572 + </state>
  1573 + </provider>
  1574 + </entry>
  1575 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java">
  1576 + <provider selected="true" editor-type-id="text-editor">
  1577 + <state vertical-scroll-proportion="0.58563536">
  1578 + <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
  1579 + <folding>
  1580 + <element signature="imports" expanded="true" />
  1581 + </folding>
  1582 + </state>
  1583 + </provider>
  1584 + </entry>
1739 1585 </component>
1740 1586 </project>
1741 1587 \ No newline at end of file
... ...
doc/manual/开发规范.txt
  View file @0e22c93
... ... @@ -3,4 +3,5 @@
3 3 3.所有的sql，必须都要有脚本，并且存放到sql文件夹下
4 4 4.除特殊情况外，命名采用驼峰式命名方法,比如:buyerEmail
5 5 5.工程里一般不允许写system.out.println() e.printStackTrace(),尽量写到日志文件里(log.info(),log.error()等)，便于查问题.
6   -6.每一个方法都尽量写上注释,controller尽量把测试用例写到注释里
7 6 \ No newline at end of file
  7 +6.每一个方法都尽量写上注释,controller尽量把测试用例写到注释里
  8 +7.controller中 data:返回json数据;page:返回页面
8 9 \ No newline at end of file
... ...
doc/patent.mwb
View file @0e22c93
No preview for this file type
doc/patent.mwb.bak
View file @0e22c93
No preview for this file type
src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java
  View file @0e22c93
... ... @@ -5,6 +5,7 @@ package com.canrd.patent.dal.enums;
5 5 */
6 6 public enum OrderStatusEnum implements AbstractEnum {
7 7 SUBMITED(1,"已提交","已经初始化，已经提交，未支付"),
  8 + PAY_PENDING(4,"正在支付","订单正在支付"),
8 9 PAID_SUCCESS(2,"支付成功","订单支付成功"),
9 10 PADI_FAILURE(3,"支付失败","订单支付失败");
10 11 private int val;
... ...
src/main/java/com/canrd/patent/dal/mapper/PaymentMapper.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.dal.mapper;
  2 +
  3 +import com.canrd.patent.dal.model.Payment;
  4 +import com.canrd.patent.dal.model.PaymentExample;
  5 +import java.util.List;
  6 +import org.apache.ibatis.annotations.Param;
  7 +
  8 +public interface PaymentMapper {
  9 + /**
  10 + * This method was generated by MyBatis Generator.
  11 + * This method corresponds to the database table payment
  12 + *
  13 + * @mbggenerated
  14 + */
  15 + int countByExample(PaymentExample example);
  16 +
  17 + /**
  18 + * This method was generated by MyBatis Generator.
  19 + * This method corresponds to the database table payment
  20 + *
  21 + * @mbggenerated
  22 + */
  23 + int deleteByExample(PaymentExample example);
  24 +
  25 + /**
  26 + * This method was generated by MyBatis Generator.
  27 + * This method corresponds to the database table payment
  28 + *
  29 + * @mbggenerated
  30 + */
  31 + int deleteByPrimaryKey(Long id);
  32 +
  33 + /**
  34 + * This method was generated by MyBatis Generator.
  35 + * This method corresponds to the database table payment
  36 + *
  37 + * @mbggenerated
  38 + */
  39 + int insert(Payment record);
  40 +
  41 + /**
  42 + * This method was generated by MyBatis Generator.
  43 + * This method corresponds to the database table payment
  44 + *
  45 + * @mbggenerated
  46 + */
  47 + int insertSelective(Payment record);
  48 +
  49 + /**
  50 + * This method was generated by MyBatis Generator.
  51 + * This method corresponds to the database table payment
  52 + *
  53 + * @mbggenerated
  54 + */
  55 + List<Payment> selectByExample(PaymentExample example);
  56 +
  57 + /**
  58 + * This method was generated by MyBatis Generator.
  59 + * This method corresponds to the database table payment
  60 + *
  61 + * @mbggenerated
  62 + */
  63 + Payment selectByPrimaryKey(Long id);
  64 +
  65 + /**
  66 + * This method was generated by MyBatis Generator.
  67 + * This method corresponds to the database table payment
  68 + *
  69 + * @mbggenerated
  70 + */
  71 + int updateByExampleSelective(@Param("record") Payment record, @Param("example") PaymentExample example);
  72 +
  73 + /**
  74 + * This method was generated by MyBatis Generator.
  75 + * This method corresponds to the database table payment
  76 + *
  77 + * @mbggenerated
  78 + */
  79 + int updateByExample(@Param("record") Payment record, @Param("example") PaymentExample example);
  80 +
  81 + /**
  82 + * This method was generated by MyBatis Generator.
  83 + * This method corresponds to the database table payment
  84 + *
  85 + * @mbggenerated
  86 + */
  87 + int updateByPrimaryKeySelective(Payment record);
  88 +
  89 + /**
  90 + * This method was generated by MyBatis Generator.
  91 + * This method corresponds to the database table payment
  92 + *
  93 + * @mbggenerated
  94 + */
  95 + int updateByPrimaryKey(Payment record);
  96 +}
0 97 \ No newline at end of file
... ...
src/main/java/com/canrd/patent/dal/model/Payment.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.dal.model;
  2 +
  3 +import java.util.Date;
  4 +
  5 +public class Payment {
  6 + /**
  7 + * This field was generated by MyBatis Generator.
  8 + * This field corresponds to the database column payment.id
  9 + *
  10 + * @mbggenerated
  11 + */
  12 + private Long id;
  13 +
  14 + /**
  15 + * This field was generated by MyBatis Generator.
  16 + * This field corresponds to the database column payment.case_id
  17 + *
  18 + * @mbggenerated
  19 + */
  20 + private Long caseId;
  21 +
  22 + /**
  23 + * This field was generated by MyBatis Generator.
  24 + * This field corresponds to the database column payment.expense
  25 + *
  26 + * @mbggenerated
  27 + */
  28 + private Long expense;
  29 +
  30 + /**
  31 + * This field was generated by MyBatis Generator.
  32 + * This field corresponds to the database column payment.pay_type
  33 + *
  34 + * @mbggenerated
  35 + */
  36 + private String payType;
  37 +
  38 + /**
  39 + * This field was generated by MyBatis Generator.
  40 + * This field corresponds to the database column payment.order_status
  41 + *
  42 + * @mbggenerated
  43 + */
  44 + private String orderStatus;
  45 +
  46 + /**
  47 + * This field was generated by MyBatis Generator.
  48 + * This field corresponds to the database column payment.member_id
  49 + *
  50 + * @mbggenerated
  51 + */
  52 + private String memberId;
  53 +
  54 + /**
  55 + * This field was generated by MyBatis Generator.
  56 + * This field corresponds to the database column payment.create_date
  57 + *
  58 + * @mbggenerated
  59 + */
  60 + private Date createDate;
  61 +
  62 + /**
  63 + * This field was generated by MyBatis Generator.
  64 + * This field corresponds to the database column payment.update_date
  65 + *
  66 + * @mbggenerated
  67 + */
  68 + private Date updateDate;
  69 +
  70 + /**
  71 + * This method was generated by MyBatis Generator.
  72 + * This method returns the value of the database column payment.id
  73 + *
  74 + * @return the value of payment.id
  75 + *
  76 + * @mbggenerated
  77 + */
  78 + public Long getId() {
  79 + return id;
  80 + }
  81 +
  82 + /**
  83 + * This method was generated by MyBatis Generator.
  84 + * This method sets the value of the database column payment.id
  85 + *
  86 + * @param id the value for payment.id
  87 + *
  88 + * @mbggenerated
  89 + */
  90 + public void setId(Long id) {
  91 + this.id = id;
  92 + }
  93 +
  94 + /**
  95 + * This method was generated by MyBatis Generator.
  96 + * This method returns the value of the database column payment.case_id
  97 + *
  98 + * @return the value of payment.case_id
  99 + *
  100 + * @mbggenerated
  101 + */
  102 + public Long getCaseId() {
  103 + return caseId;
  104 + }
  105 +
  106 + /**
  107 + * This method was generated by MyBatis Generator.
  108 + * This method sets the value of the database column payment.case_id
  109 + *
  110 + * @param caseId the value for payment.case_id
  111 + *
  112 + * @mbggenerated
  113 + */
  114 + public void setCaseId(Long caseId) {
  115 + this.caseId = caseId;
  116 + }
  117 +
  118 + /**
  119 + * This method was generated by MyBatis Generator.
  120 + * This method returns the value of the database column payment.expense
  121 + *
  122 + * @return the value of payment.expense
  123 + *
  124 + * @mbggenerated
  125 + */
  126 + public Long getExpense() {
  127 + return expense;
  128 + }
  129 +
  130 + /**
  131 + * This method was generated by MyBatis Generator.
  132 + * This method sets the value of the database column payment.expense
  133 + *
  134 + * @param expense the value for payment.expense
  135 + *
  136 + * @mbggenerated
  137 + */
  138 + public void setExpense(Long expense) {
  139 + this.expense = expense;
  140 + }
  141 +
  142 + /**
  143 + * This method was generated by MyBatis Generator.
  144 + * This method returns the value of the database column payment.pay_type
  145 + *
  146 + * @return the value of payment.pay_type
  147 + *
  148 + * @mbggenerated
  149 + */
  150 + public String getPayType() {
  151 + return payType;
  152 + }
  153 +
  154 + /**
  155 + * This method was generated by MyBatis Generator.
  156 + * This method sets the value of the database column payment.pay_type
  157 + *
  158 + * @param payType the value for payment.pay_type
  159 + *
  160 + * @mbggenerated
  161 + */
  162 + public void setPayType(String payType) {
  163 + this.payType = payType == null ? null : payType.trim();
  164 + }
  165 +
  166 + /**
  167 + * This method was generated by MyBatis Generator.
  168 + * This method returns the value of the database column payment.order_status
  169 + *
  170 + * @return the value of payment.order_status
  171 + *
  172 + * @mbggenerated
  173 + */
  174 + public String getOrderStatus() {
  175 + return orderStatus;
  176 + }
  177 +
  178 + /**
  179 + * This method was generated by MyBatis Generator.
  180 + * This method sets the value of the database column payment.order_status
  181 + *
  182 + * @param orderStatus the value for payment.order_status
  183 + *
  184 + * @mbggenerated
  185 + */
  186 + public void setOrderStatus(String orderStatus) {
  187 + this.orderStatus = orderStatus == null ? null : orderStatus.trim();
  188 + }
  189 +
  190 + /**
  191 + * This method was generated by MyBatis Generator.
  192 + * This method returns the value of the database column payment.member_id
  193 + *
  194 + * @return the value of payment.member_id
  195 + *
  196 + * @mbggenerated
  197 + */
  198 + public String getMemberId() {
  199 + return memberId;
  200 + }
  201 +
  202 + /**
  203 + * This method was generated by MyBatis Generator.
  204 + * This method sets the value of the database column payment.member_id
  205 + *
  206 + * @param memberId the value for payment.member_id
  207 + *
  208 + * @mbggenerated
  209 + */
  210 + public void setMemberId(String memberId) {
  211 + this.memberId = memberId == null ? null : memberId.trim();
  212 + }
  213 +
  214 + /**
  215 + * This method was generated by MyBatis Generator.
  216 + * This method returns the value of the database column payment.create_date
  217 + *
  218 + * @return the value of payment.create_date
  219 + *
  220 + * @mbggenerated
  221 + */
  222 + public Date getCreateDate() {
  223 + return createDate;
  224 + }
  225 +
  226 + /**
  227 + * This method was generated by MyBatis Generator.
  228 + * This method sets the value of the database column payment.create_date
  229 + *
  230 + * @param createDate the value for payment.create_date
  231 + *
  232 + * @mbggenerated
  233 + */
  234 + public void setCreateDate(Date createDate) {
  235 + this.createDate = createDate;
  236 + }
  237 +
  238 + /**
  239 + * This method was generated by MyBatis Generator.
  240 + * This method returns the value of the database column payment.update_date
  241 + *
  242 + * @return the value of payment.update_date
  243 + *
  244 + * @mbggenerated
  245 + */
  246 + public Date getUpdateDate() {
  247 + return updateDate;
  248 + }
  249 +
  250 + /**
  251 + * This method was generated by MyBatis Generator.
  252 + * This method sets the value of the database column payment.update_date
  253 + *
  254 + * @param updateDate the value for payment.update_date
  255 + *
  256 + * @mbggenerated
  257 + */
  258 + public void setUpdateDate(Date updateDate) {
  259 + this.updateDate = updateDate;
  260 + }
  261 +}
0 262 \ No newline at end of file
... ...
src/main/java/com/canrd/patent/dal/model/PaymentExample.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.dal.model;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.Date;
  5 +import java.util.List;
  6 +
  7 +public class PaymentExample {
  8 + /**
  9 + * This field was generated by MyBatis Generator.
  10 + * This field corresponds to the database table payment
  11 + *
  12 + * @mbggenerated
  13 + */
  14 + protected String orderByClause;
  15 +
  16 + /**
  17 + * This field was generated by MyBatis Generator.
  18 + * This field corresponds to the database table payment
  19 + *
  20 + * @mbggenerated
  21 + */
  22 + protected boolean distinct;
  23 +
  24 + /**
  25 + * This field was generated by MyBatis Generator.
  26 + * This field corresponds to the database table payment
  27 + *
  28 + * @mbggenerated
  29 + */
  30 + protected List<Criteria> oredCriteria;
  31 +
  32 + /**
  33 + * This method was generated by MyBatis Generator.
  34 + * This method corresponds to the database table payment
  35 + *
  36 + * @mbggenerated
  37 + */
  38 + public PaymentExample() {
  39 + oredCriteria = new ArrayList<Criteria>();
  40 + }
  41 +
  42 + /**
  43 + * This method was generated by MyBatis Generator.
  44 + * This method corresponds to the database table payment
  45 + *
  46 + * @mbggenerated
  47 + */
  48 + public void setOrderByClause(String orderByClause) {
  49 + this.orderByClause = orderByClause;
  50 + }
  51 +
  52 + /**
  53 + * This method was generated by MyBatis Generator.
  54 + * This method corresponds to the database table payment
  55 + *
  56 + * @mbggenerated
  57 + */
  58 + public String getOrderByClause() {
  59 + return orderByClause;
  60 + }
  61 +
  62 + /**
  63 + * This method was generated by MyBatis Generator.
  64 + * This method corresponds to the database table payment
  65 + *
  66 + * @mbggenerated
  67 + */
  68 + public void setDistinct(boolean distinct) {
  69 + this.distinct = distinct;
  70 + }
  71 +
  72 + /**
  73 + * This method was generated by MyBatis Generator.
  74 + * This method corresponds to the database table payment
  75 + *
  76 + * @mbggenerated
  77 + */
  78 + public boolean isDistinct() {
  79 + return distinct;
  80 + }
  81 +
  82 + /**
  83 + * This method was generated by MyBatis Generator.
  84 + * This method corresponds to the database table payment
  85 + *
  86 + * @mbggenerated
  87 + */
  88 + public List<Criteria> getOredCriteria() {
  89 + return oredCriteria;
  90 + }
  91 +
  92 + /**
  93 + * This method was generated by MyBatis Generator.
  94 + * This method corresponds to the database table payment
  95 + *
  96 + * @mbggenerated
  97 + */
  98 + public void or(Criteria criteria) {
  99 + oredCriteria.add(criteria);
  100 + }
  101 +
  102 + /**
  103 + * This method was generated by MyBatis Generator.
  104 + * This method corresponds to the database table payment
  105 + *
  106 + * @mbggenerated
  107 + */
  108 + public Criteria or() {
  109 + Criteria criteria = createCriteriaInternal();
  110 + oredCriteria.add(criteria);
  111 + return criteria;
  112 + }
  113 +
  114 + /**
  115 + * This method was generated by MyBatis Generator.
  116 + * This method corresponds to the database table payment
  117 + *
  118 + * @mbggenerated
  119 + */
  120 + public Criteria createCriteria() {
  121 + Criteria criteria = createCriteriaInternal();
  122 + if (oredCriteria.size() == 0) {
  123 + oredCriteria.add(criteria);
  124 + }
  125 + return criteria;
  126 + }
  127 +
  128 + /**
  129 + * This method was generated by MyBatis Generator.
  130 + * This method corresponds to the database table payment
  131 + *
  132 + * @mbggenerated
  133 + */
  134 + protected Criteria createCriteriaInternal() {
  135 + Criteria criteria = new Criteria();
  136 + return criteria;
  137 + }
  138 +
  139 + /**
  140 + * This method was generated by MyBatis Generator.
  141 + * This method corresponds to the database table payment
  142 + *
  143 + * @mbggenerated
  144 + */
  145 + public void clear() {
  146 + oredCriteria.clear();
  147 + orderByClause = null;
  148 + distinct = false;
  149 + }
  150 +
  151 + /**
  152 + * This class was generated by MyBatis Generator.
  153 + * This class corresponds to the database table payment
  154 + *
  155 + * @mbggenerated
  156 + */
  157 + protected abstract static class GeneratedCriteria {
  158 + protected List<Criterion> criteria;
  159 +
  160 + protected GeneratedCriteria() {
  161 + super();
  162 + criteria = new ArrayList<Criterion>();
  163 + }
  164 +
  165 + public boolean isValid() {
  166 + return criteria.size() > 0;
  167 + }
  168 +
  169 + public List<Criterion> getAllCriteria() {
  170 + return criteria;
  171 + }
  172 +
  173 + public List<Criterion> getCriteria() {
  174 + return criteria;
  175 + }
  176 +
  177 + protected void addCriterion(String condition) {
  178 + if (condition == null) {
  179 + throw new RuntimeException("Value for condition cannot be null");
  180 + }
  181 + criteria.add(new Criterion(condition));
  182 + }
  183 +
  184 + protected void addCriterion(String condition, Object value, String property) {
  185 + if (value == null) {
  186 + throw new RuntimeException("Value for " + property + " cannot be null");
  187 + }
  188 + criteria.add(new Criterion(condition, value));
  189 + }
  190 +
  191 + protected void addCriterion(String condition, Object value1, Object value2, String property) {
  192 + if (value1 == null || value2 == null) {
  193 + throw new RuntimeException("Between values for " + property + " cannot be null");
  194 + }
  195 + criteria.add(new Criterion(condition, value1, value2));
  196 + }
  197 +
  198 + public Criteria andIdIsNull() {
  199 + addCriterion("id is null");
  200 + return (Criteria) this;
  201 + }
  202 +
  203 + public Criteria andIdIsNotNull() {
  204 + addCriterion("id is not null");
  205 + return (Criteria) this;
  206 + }
  207 +
  208 + public Criteria andIdEqualTo(Long value) {
  209 + addCriterion("id =", value, "id");
  210 + return (Criteria) this;
  211 + }
  212 +
  213 + public Criteria andIdNotEqualTo(Long value) {
  214 + addCriterion("id <>", value, "id");
  215 + return (Criteria) this;
  216 + }
  217 +
  218 + public Criteria andIdGreaterThan(Long value) {
  219 + addCriterion("id >", value, "id");
  220 + return (Criteria) this;
  221 + }
  222 +
  223 + public Criteria andIdGreaterThanOrEqualTo(Long value) {
  224 + addCriterion("id >=", value, "id");
  225 + return (Criteria) this;
  226 + }
  227 +
  228 + public Criteria andIdLessThan(Long value) {
  229 + addCriterion("id <", value, "id");
  230 + return (Criteria) this;
  231 + }
  232 +
  233 + public Criteria andIdLessThanOrEqualTo(Long value) {
  234 + addCriterion("id <=", value, "id");
  235 + return (Criteria) this;
  236 + }
  237 +
  238 + public Criteria andIdIn(List<Long> values) {
  239 + addCriterion("id in", values, "id");
  240 + return (Criteria) this;
  241 + }
  242 +
  243 + public Criteria andIdNotIn(List<Long> values) {
  244 + addCriterion("id not in", values, "id");
  245 + return (Criteria) this;
  246 + }
  247 +
  248 + public Criteria andIdBetween(Long value1, Long value2) {
  249 + addCriterion("id between", value1, value2, "id");
  250 + return (Criteria) this;
  251 + }
  252 +
  253 + public Criteria andIdNotBetween(Long value1, Long value2) {
  254 + addCriterion("id not between", value1, value2, "id");
  255 + return (Criteria) this;
  256 + }
  257 +
  258 + public Criteria andCaseIdIsNull() {
  259 + addCriterion("case_id is null");
  260 + return (Criteria) this;
  261 + }
  262 +
  263 + public Criteria andCaseIdIsNotNull() {
  264 + addCriterion("case_id is not null");
  265 + return (Criteria) this;
  266 + }
  267 +
  268 + public Criteria andCaseIdEqualTo(Long value) {
  269 + addCriterion("case_id =", value, "caseId");
  270 + return (Criteria) this;
  271 + }
  272 +
  273 + public Criteria andCaseIdNotEqualTo(Long value) {
  274 + addCriterion("case_id <>", value, "caseId");
  275 + return (Criteria) this;
  276 + }
  277 +
  278 + public Criteria andCaseIdGreaterThan(Long value) {
  279 + addCriterion("case_id >", value, "caseId");
  280 + return (Criteria) this;
  281 + }
  282 +
  283 + public Criteria andCaseIdGreaterThanOrEqualTo(Long value) {
  284 + addCriterion("case_id >=", value, "caseId");
  285 + return (Criteria) this;
  286 + }
  287 +
  288 + public Criteria andCaseIdLessThan(Long value) {
  289 + addCriterion("case_id <", value, "caseId");
  290 + return (Criteria) this;
  291 + }
  292 +
  293 + public Criteria andCaseIdLessThanOrEqualTo(Long value) {
  294 + addCriterion("case_id <=", value, "caseId");
  295 + return (Criteria) this;
  296 + }
  297 +
  298 + public Criteria andCaseIdIn(List<Long> values) {
  299 + addCriterion("case_id in", values, "caseId");
  300 + return (Criteria) this;
  301 + }
  302 +
  303 + public Criteria andCaseIdNotIn(List<Long> values) {
  304 + addCriterion("case_id not in", values, "caseId");
  305 + return (Criteria) this;
  306 + }
  307 +
  308 + public Criteria andCaseIdBetween(Long value1, Long value2) {
  309 + addCriterion("case_id between", value1, value2, "caseId");
  310 + return (Criteria) this;
  311 + }
  312 +
  313 + public Criteria andCaseIdNotBetween(Long value1, Long value2) {
  314 + addCriterion("case_id not between", value1, value2, "caseId");
  315 + return (Criteria) this;
  316 + }
  317 +
  318 + public Criteria andExpenseIsNull() {
  319 + addCriterion("expense is null");
  320 + return (Criteria) this;
  321 + }
  322 +
  323 + public Criteria andExpenseIsNotNull() {
  324 + addCriterion("expense is not null");
  325 + return (Criteria) this;
  326 + }
  327 +
  328 + public Criteria andExpenseEqualTo(Long value) {
  329 + addCriterion("expense =", value, "expense");
  330 + return (Criteria) this;
  331 + }
  332 +
  333 + public Criteria andExpenseNotEqualTo(Long value) {
  334 + addCriterion("expense <>", value, "expense");
  335 + return (Criteria) this;
  336 + }
  337 +
  338 + public Criteria andExpenseGreaterThan(Long value) {
  339 + addCriterion("expense >", value, "expense");
  340 + return (Criteria) this;
  341 + }
  342 +
  343 + public Criteria andExpenseGreaterThanOrEqualTo(Long value) {
  344 + addCriterion("expense >=", value, "expense");
  345 + return (Criteria) this;
  346 + }
  347 +
  348 + public Criteria andExpenseLessThan(Long value) {
  349 + addCriterion("expense <", value, "expense");
  350 + return (Criteria) this;
  351 + }
  352 +
  353 + public Criteria andExpenseLessThanOrEqualTo(Long value) {
  354 + addCriterion("expense <=", value, "expense");
  355 + return (Criteria) this;
  356 + }
  357 +
  358 + public Criteria andExpenseIn(List<Long> values) {
  359 + addCriterion("expense in", values, "expense");
  360 + return (Criteria) this;
  361 + }
  362 +
  363 + public Criteria andExpenseNotIn(List<Long> values) {
  364 + addCriterion("expense not in", values, "expense");
  365 + return (Criteria) this;
  366 + }
  367 +
  368 + public Criteria andExpenseBetween(Long value1, Long value2) {
  369 + addCriterion("expense between", value1, value2, "expense");
  370 + return (Criteria) this;
  371 + }
  372 +
  373 + public Criteria andExpenseNotBetween(Long value1, Long value2) {
  374 + addCriterion("expense not between", value1, value2, "expense");
  375 + return (Criteria) this;
  376 + }
  377 +
  378 + public Criteria andPayTypeIsNull() {
  379 + addCriterion("pay_type is null");
  380 + return (Criteria) this;
  381 + }
  382 +
  383 + public Criteria andPayTypeIsNotNull() {
  384 + addCriterion("pay_type is not null");
  385 + return (Criteria) this;
  386 + }
  387 +
  388 + public Criteria andPayTypeEqualTo(String value) {
  389 + addCriterion("pay_type =", value, "payType");
  390 + return (Criteria) this;
  391 + }
  392 +
  393 + public Criteria andPayTypeNotEqualTo(String value) {
  394 + addCriterion("pay_type <>", value, "payType");
  395 + return (Criteria) this;
  396 + }
  397 +
  398 + public Criteria andPayTypeGreaterThan(String value) {
  399 + addCriterion("pay_type >", value, "payType");
  400 + return (Criteria) this;
  401 + }
  402 +
  403 + public Criteria andPayTypeGreaterThanOrEqualTo(String value) {
  404 + addCriterion("pay_type >=", value, "payType");
  405 + return (Criteria) this;
  406 + }
  407 +
  408 + public Criteria andPayTypeLessThan(String value) {
  409 + addCriterion("pay_type <", value, "payType");
  410 + return (Criteria) this;
  411 + }
  412 +
  413 + public Criteria andPayTypeLessThanOrEqualTo(String value) {
  414 + addCriterion("pay_type <=", value, "payType");
  415 + return (Criteria) this;
  416 + }
  417 +
  418 + public Criteria andPayTypeLike(String value) {
  419 + addCriterion("pay_type like", value, "payType");
  420 + return (Criteria) this;
  421 + }
  422 +
  423 + public Criteria andPayTypeNotLike(String value) {
  424 + addCriterion("pay_type not like", value, "payType");
  425 + return (Criteria) this;
  426 + }
  427 +
  428 + public Criteria andPayTypeIn(List<String> values) {
  429 + addCriterion("pay_type in", values, "payType");
  430 + return (Criteria) this;
  431 + }
  432 +
  433 + public Criteria andPayTypeNotIn(List<String> values) {
  434 + addCriterion("pay_type not in", values, "payType");
  435 + return (Criteria) this;
  436 + }
  437 +
  438 + public Criteria andPayTypeBetween(String value1, String value2) {
  439 + addCriterion("pay_type between", value1, value2, "payType");
  440 + return (Criteria) this;
  441 + }
  442 +
  443 + public Criteria andPayTypeNotBetween(String value1, String value2) {
  444 + addCriterion("pay_type not between", value1, value2, "payType");
  445 + return (Criteria) this;
  446 + }
  447 +
  448 + public Criteria andOrderStatusIsNull() {
  449 + addCriterion("order_status is null");
  450 + return (Criteria) this;
  451 + }
  452 +
  453 + public Criteria andOrderStatusIsNotNull() {
  454 + addCriterion("order_status is not null");
  455 + return (Criteria) this;
  456 + }
  457 +
  458 + public Criteria andOrderStatusEqualTo(String value) {
  459 + addCriterion("order_status =", value, "orderStatus");
  460 + return (Criteria) this;
  461 + }
  462 +
  463 + public Criteria andOrderStatusNotEqualTo(String value) {
  464 + addCriterion("order_status <>", value, "orderStatus");
  465 + return (Criteria) this;
  466 + }
  467 +
  468 + public Criteria andOrderStatusGreaterThan(String value) {
  469 + addCriterion("order_status >", value, "orderStatus");
  470 + return (Criteria) this;
  471 + }
  472 +
  473 + public Criteria andOrderStatusGreaterThanOrEqualTo(String value) {
  474 + addCriterion("order_status >=", value, "orderStatus");
  475 + return (Criteria) this;
  476 + }
  477 +
  478 + public Criteria andOrderStatusLessThan(String value) {
  479 + addCriterion("order_status <", value, "orderStatus");
  480 + return (Criteria) this;
  481 + }
  482 +
  483 + public Criteria andOrderStatusLessThanOrEqualTo(String value) {
  484 + addCriterion("order_status <=", value, "orderStatus");
  485 + return (Criteria) this;
  486 + }
  487 +
  488 + public Criteria andOrderStatusLike(String value) {
  489 + addCriterion("order_status like", value, "orderStatus");
  490 + return (Criteria) this;
  491 + }
  492 +
  493 + public Criteria andOrderStatusNotLike(String value) {
  494 + addCriterion("order_status not like", value, "orderStatus");
  495 + return (Criteria) this;
  496 + }
  497 +
  498 + public Criteria andOrderStatusIn(List<String> values) {
  499 + addCriterion("order_status in", values, "orderStatus");
  500 + return (Criteria) this;
  501 + }
  502 +
  503 + public Criteria andOrderStatusNotIn(List<String> values) {
  504 + addCriterion("order_status not in", values, "orderStatus");
  505 + return (Criteria) this;
  506 + }
  507 +
  508 + public Criteria andOrderStatusBetween(String value1, String value2) {
  509 + addCriterion("order_status between", value1, value2, "orderStatus");
  510 + return (Criteria) this;
  511 + }
  512 +
  513 + public Criteria andOrderStatusNotBetween(String value1, String value2) {
  514 + addCriterion("order_status not between", value1, value2, "orderStatus");
  515 + return (Criteria) this;
  516 + }
  517 +
  518 + public Criteria andMemberIdIsNull() {
  519 + addCriterion("member_id is null");
  520 + return (Criteria) this;
  521 + }
  522 +
  523 + public Criteria andMemberIdIsNotNull() {
  524 + addCriterion("member_id is not null");
  525 + return (Criteria) this;
  526 + }
  527 +
  528 + public Criteria andMemberIdEqualTo(String value) {
  529 + addCriterion("member_id =", value, "memberId");
  530 + return (Criteria) this;
  531 + }
  532 +
  533 + public Criteria andMemberIdNotEqualTo(String value) {
  534 + addCriterion("member_id <>", value, "memberId");
  535 + return (Criteria) this;
  536 + }
  537 +
  538 + public Criteria andMemberIdGreaterThan(String value) {
  539 + addCriterion("member_id >", value, "memberId");
  540 + return (Criteria) this;
  541 + }
  542 +
  543 + public Criteria andMemberIdGreaterThanOrEqualTo(String value) {
  544 + addCriterion("member_id >=", value, "memberId");
  545 + return (Criteria) this;
  546 + }
  547 +
  548 + public Criteria andMemberIdLessThan(String value) {
  549 + addCriterion("member_id <", value, "memberId");
  550 + return (Criteria) this;
  551 + }
  552 +
  553 + public Criteria andMemberIdLessThanOrEqualTo(String value) {
  554 + addCriterion("member_id <=", value, "memberId");
  555 + return (Criteria) this;
  556 + }
  557 +
  558 + public Criteria andMemberIdLike(String value) {
  559 + addCriterion("member_id like", value, "memberId");
  560 + return (Criteria) this;
  561 + }
  562 +
  563 + public Criteria andMemberIdNotLike(String value) {
  564 + addCriterion("member_id not like", value, "memberId");
  565 + return (Criteria) this;
  566 + }
  567 +
  568 + public Criteria andMemberIdIn(List<String> values) {
  569 + addCriterion("member_id in", values, "memberId");
  570 + return (Criteria) this;
  571 + }
  572 +
  573 + public Criteria andMemberIdNotIn(List<String> values) {
  574 + addCriterion("member_id not in", values, "memberId");
  575 + return (Criteria) this;
  576 + }
  577 +
  578 + public Criteria andMemberIdBetween(String value1, String value2) {
  579 + addCriterion("member_id between", value1, value2, "memberId");
  580 + return (Criteria) this;
  581 + }
  582 +
  583 + public Criteria andMemberIdNotBetween(String value1, String value2) {
  584 + addCriterion("member_id not between", value1, value2, "memberId");
  585 + return (Criteria) this;
  586 + }
  587 +
  588 + public Criteria andCreateDateIsNull() {
  589 + addCriterion("create_date is null");
  590 + return (Criteria) this;
  591 + }
  592 +
  593 + public Criteria andCreateDateIsNotNull() {
  594 + addCriterion("create_date is not null");
  595 + return (Criteria) this;
  596 + }
  597 +
  598 + public Criteria andCreateDateEqualTo(Date value) {
  599 + addCriterion("create_date =", value, "createDate");
  600 + return (Criteria) this;
  601 + }
  602 +
  603 + public Criteria andCreateDateNotEqualTo(Date value) {
  604 + addCriterion("create_date <>", value, "createDate");
  605 + return (Criteria) this;
  606 + }
  607 +
  608 + public Criteria andCreateDateGreaterThan(Date value) {
  609 + addCriterion("create_date >", value, "createDate");
  610 + return (Criteria) this;
  611 + }
  612 +
  613 + public Criteria andCreateDateGreaterThanOrEqualTo(Date value) {
  614 + addCriterion("create_date >=", value, "createDate");
  615 + return (Criteria) this;
  616 + }
  617 +
  618 + public Criteria andCreateDateLessThan(Date value) {
  619 + addCriterion("create_date <", value, "createDate");
  620 + return (Criteria) this;
  621 + }
  622 +
  623 + public Criteria andCreateDateLessThanOrEqualTo(Date value) {
  624 + addCriterion("create_date <=", value, "createDate");
  625 + return (Criteria) this;
  626 + }
  627 +
  628 + public Criteria andCreateDateIn(List<Date> values) {
  629 + addCriterion("create_date in", values, "createDate");
  630 + return (Criteria) this;
  631 + }
  632 +
  633 + public Criteria andCreateDateNotIn(List<Date> values) {
  634 + addCriterion("create_date not in", values, "createDate");
  635 + return (Criteria) this;
  636 + }
  637 +
  638 + public Criteria andCreateDateBetween(Date value1, Date value2) {
  639 + addCriterion("create_date between", value1, value2, "createDate");
  640 + return (Criteria) this;
  641 + }
  642 +
  643 + public Criteria andCreateDateNotBetween(Date value1, Date value2) {
  644 + addCriterion("create_date not between", value1, value2, "createDate");
  645 + return (Criteria) this;
  646 + }
  647 +
  648 + public Criteria andUpdateDateIsNull() {
  649 + addCriterion("update_date is null");
  650 + return (Criteria) this;
  651 + }
  652 +
  653 + public Criteria andUpdateDateIsNotNull() {
  654 + addCriterion("update_date is not null");
  655 + return (Criteria) this;
  656 + }
  657 +
  658 + public Criteria andUpdateDateEqualTo(Date value) {
  659 + addCriterion("update_date =", value, "updateDate");
  660 + return (Criteria) this;
  661 + }
  662 +
  663 + public Criteria andUpdateDateNotEqualTo(Date value) {
  664 + addCriterion("update_date <>", value, "updateDate");
  665 + return (Criteria) this;
  666 + }
  667 +
  668 + public Criteria andUpdateDateGreaterThan(Date value) {
  669 + addCriterion("update_date >", value, "updateDate");
  670 + return (Criteria) this;
  671 + }
  672 +
  673 + public Criteria andUpdateDateGreaterThanOrEqualTo(Date value) {
  674 + addCriterion("update_date >=", value, "updateDate");
  675 + return (Criteria) this;
  676 + }
  677 +
  678 + public Criteria andUpdateDateLessThan(Date value) {
  679 + addCriterion("update_date <", value, "updateDate");
  680 + return (Criteria) this;
  681 + }
  682 +
  683 + public Criteria andUpdateDateLessThanOrEqualTo(Date value) {
  684 + addCriterion("update_date <=", value, "updateDate");
  685 + return (Criteria) this;
  686 + }
  687 +
  688 + public Criteria andUpdateDateIn(List<Date> values) {
  689 + addCriterion("update_date in", values, "updateDate");
  690 + return (Criteria) this;
  691 + }
  692 +
  693 + public Criteria andUpdateDateNotIn(List<Date> values) {
  694 + addCriterion("update_date not in", values, "updateDate");
  695 + return (Criteria) this;
  696 + }
  697 +
  698 + public Criteria andUpdateDateBetween(Date value1, Date value2) {
  699 + addCriterion("update_date between", value1, value2, "updateDate");
  700 + return (Criteria) this;
  701 + }
  702 +
  703 + public Criteria andUpdateDateNotBetween(Date value1, Date value2) {
  704 + addCriterion("update_date not between", value1, value2, "updateDate");
  705 + return (Criteria) this;
  706 + }
  707 + }
  708 +
  709 + /**
  710 + * This class was generated by MyBatis Generator.
  711 + * This class corresponds to the database table payment
  712 + *
  713 + * @mbggenerated do_not_delete_during_merge
  714 + */
  715 + public static class Criteria extends GeneratedCriteria {
  716 +
  717 + protected Criteria() {
  718 + super();
  719 + }
  720 + }
  721 +
  722 + /**
  723 + * This class was generated by MyBatis Generator.
  724 + * This class corresponds to the database table payment
  725 + *
  726 + * @mbggenerated
  727 + */
  728 + public static class Criterion {
  729 + private String condition;
  730 +
  731 + private Object value;
  732 +
  733 + private Object secondValue;
  734 +
  735 + private boolean noValue;
  736 +
  737 + private boolean singleValue;
  738 +
  739 + private boolean betweenValue;
  740 +
  741 + private boolean listValue;
  742 +
  743 + private String typeHandler;
  744 +
  745 + public String getCondition() {
  746 + return condition;
  747 + }
  748 +
  749 + public Object getValue() {
  750 + return value;
  751 + }
  752 +
  753 + public Object getSecondValue() {
  754 + return secondValue;
  755 + }
  756 +
  757 + public boolean isNoValue() {
  758 + return noValue;
  759 + }
  760 +
  761 + public boolean isSingleValue() {
  762 + return singleValue;
  763 + }
  764 +
  765 + public boolean isBetweenValue() {
  766 + return betweenValue;
  767 + }
  768 +
  769 + public boolean isListValue() {
  770 + return listValue;
  771 + }
  772 +
  773 + public String getTypeHandler() {
  774 + return typeHandler;
  775 + }
  776 +
  777 + protected Criterion(String condition) {
  778 + super();
  779 + this.condition = condition;
  780 + this.typeHandler = null;
  781 + this.noValue = true;
  782 + }
  783 +
  784 + protected Criterion(String condition, Object value, String typeHandler) {
  785 + super();
  786 + this.condition = condition;
  787 + this.value = value;
  788 + this.typeHandler = typeHandler;
  789 + if (value instanceof List<?>) {
  790 + this.listValue = true;
  791 + } else {
  792 + this.singleValue = true;
  793 + }
  794 + }
  795 +
  796 + protected Criterion(String condition, Object value) {
  797 + this(condition, value, null);
  798 + }
  799 +
  800 + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
  801 + super();
  802 + this.condition = condition;
  803 + this.value = value;
  804 + this.secondValue = secondValue;
  805 + this.typeHandler = typeHandler;
  806 + this.betweenValue = true;
  807 + }
  808 +
  809 + protected Criterion(String condition, Object value, Object secondValue) {
  810 + this(condition, value, secondValue, null);
  811 + }
  812 + }
  813 +}
0 814 \ No newline at end of file
... ...
src/main/java/com/canrd/patent/service/CaseHandlingService.java
  View file @0e22c93
... ... @@ -35,7 +35,7 @@ public class CaseHandlingService {
35 35 * @param reduceTypeEnum
36 36 * @param expense
37 37 */
38   - public int saveCase(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense,String memberId){
  38 + public Casement saveCase(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense,String memberId){
39 39 Casement preCasement = findCasement(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum, expense,memberId);
40 40 if(StringUtils.isEmpty(preCasement)) {
41 41 Casement casement = new Casement();
... ... @@ -50,10 +50,14 @@ public class CaseHandlingService {
50 50 casement.setMemberId(memberId);
51 51 casement.setCreateDate(new Date());
52 52 casement.setUpdateDate(new Date());
53   - return casementMapper.insertSelective(casement);
  53 + int res = casementMapper.insertSelective(casement);
  54 + if(res>0){
  55 + return casement;
  56 + }
54 57 }else{
55   - return 0;
  58 + return preCasement;
56 59 }
  60 + return null;
57 61 }
58 62  
59 63 /***
... ... @@ -94,6 +98,7 @@ public class CaseHandlingService {
94 98 CasementExample casementExample = new CasementExample();
95 99 CasementExample.Criteria criteria = casementExample.createCriteria();
96 100 criteria.andMemberIdEqualTo(memberId);
  101 + casementExample.setOrderByClause(" create_date desc");
97 102 List<Casement> casementList = casementMapper.selectByExample(casementExample);
98 103 List<CaseOutputDto> caseOutputDtoList = Lists.newArrayList();
99 104 for(Casement casement:casementList){
... ...
src/main/java/com/canrd/patent/service/HomePatentService.java renamed to src/main/java/com/canrd/patent/service/CasementService.java
  View file @0e22c93
... ... @@ -24,7 +24,7 @@ import java.util.Map;
24 24 * Created by ouyangmao on 16/7/16.
25 25 */
26 26 @Service
27   -public class HomePatentService {
  27 +public class CasementService {
28 28 public static Map<String,Long> priceMap = Maps.newHashMap();
29 29 static{
30 30 priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),299900l);//标准+不缴纳
... ...
src/main/java/com/canrd/patent/service/PaymentService.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.service;
  2 +
  3 +import com.canrd.patent.dal.enums.OrderStatusEnum;
  4 +import com.canrd.patent.dal.mapper.PaymentMapper;
  5 +import com.canrd.patent.dal.model.Payment;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import javax.annotation.Resource;
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * Created by ouyangmao on 16/7/21.
  13 + */
  14 +@Service
  15 +public class PaymentService {
  16 + @Resource
  17 + PaymentMapper paymentMapper;
  18 + public Payment save(Long caseId,Long expense,String adress,String phone,String inName,String invoice,String memberId){
  19 + Payment payment = new Payment();
  20 + payment.setCaseId(caseId);
  21 + payment.setExpense(expense);
  22 + payment.setPayType("支付宝");
  23 + payment.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
  24 + payment.setMemberId(memberId);
  25 + payment.setCreateDate(new Date());
  26 + payment.setUpdateDate(new Date());
  27 + paymentMapper.insertSelective(payment);
  28 + return payment;
  29 + }
  30 +}
... ...
src/main/java/com/canrd/patent/web/HomePatentController.java renamed to src/main/java/com/canrd/patent/web/CasementDataController.java
  View file @0e22c93
... ... @@ -2,21 +2,18 @@ package com.canrd.patent.web;
2 2  
3 3 import com.canrd.patent.common.standard.StdJson;
4 4 import com.canrd.patent.common.utils.TextUtils;
5   -import com.canrd.patent.dal.constant.FrontConstant;
6 5 import com.canrd.patent.dal.dto.CaseInputDto;
7 6 import com.canrd.patent.dal.dto.CaseOutputDto;
8 7 import com.canrd.patent.dal.enums.CaseTypeEnum;
9 8 import com.canrd.patent.dal.enums.PaidTypeEnum;
10 9 import com.canrd.patent.dal.enums.ReduceTypeEnum;
11 10 import com.canrd.patent.dal.enums.ServiceTypeEnum;
12   -import com.canrd.patent.dal.model.Casement;
13 11 import com.canrd.patent.service.CaseHandlingService;
14   -import com.canrd.patent.service.HomePatentService;
  12 +import com.canrd.patent.service.CasementService;
15 13 import org.slf4j.Logger;
16 14 import org.slf4j.LoggerFactory;
17 15 import org.springframework.stereotype.Controller;
18 16 import org.springframework.util.Assert;
19   -import org.springframework.util.StringUtils;
20 17 import org.springframework.web.bind.annotation.RequestMapping;
21 18 import org.springframework.web.bind.annotation.ResponseBody;
22 19  
... ... @@ -28,15 +25,13 @@ import java.util.List;
28 25 * Created by ouyangmao on 16/3/28.
29 26 */
30 27 @Controller
31   -public class HomePatentController {
32   - private static final Logger logger = LoggerFactory.getLogger(HomePatentController.class);
  28 +public class CasementDataController {
  29 + private static final Logger logger = LoggerFactory.getLogger(CasementDataController.class);
33 30 @Resource
34   - private HomePatentService homePatentService;
  31 + private CasementService casementService;
35 32 @Resource
36 33 private CaseHandlingService caseHandlingService;
37 34  
38   - public static String MEMBER_ID="372e5fa0f46c42b0836d39091ebd07d0";
39   -
40 35 /***
41 36 * 计算价格
42 37 * @param caseType(不能为空)
... ... @@ -56,7 +51,7 @@ public class HomePatentController {
56 51 ServiceTypeEnum serviceTypeEnum = ServiceTypeEnum.valueOf(serviceType);
57 52 PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(paidType);
58 53 ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(reduceType) ? ReduceTypeEnum.valueOf(reduceType) : null;
59   - Long price = homePatentService.caculatePrice(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum);
  54 + Long price = casementService.caculatePrice(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum);
60 55 return StdJson.ok(price/100);
61 56 }catch (Exception e){
62 57 logger.warn("[HomePatentController][caculatePrice] caculate price error ",e);
... ... @@ -72,39 +67,23 @@ public class HomePatentController {
72 67 @RequestMapping(value="/home_patent_type_list")
73 68 public Object homePatentTypeList(){
74 69 try {
75   - return StdJson.ok(homePatentService.homePatentTypeList());
76   - }catch (Exception e){
77   - logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
78   - return StdJson.err(-1,e.getMessage());
79   - }
80   - }
81   -
82   - @ResponseBody
83   - @RequestMapping(value="/submit_case")
84   - public Object submitCase(CaseInputDto caseInputDto){
85   - try {
86   - Assert.notNull(caseInputDto.getCaseType(), "castType不能为空");
87   - Assert.notNull(caseInputDto.getServiceType(), "serviceType不能为空");
88   - Assert.notNull(caseInputDto.getPaidType(), "paidType不能为空");
89   - Assert.notNull(caseInputDto.getExpense(), "expense不能为空");
90   - CaseTypeEnum caseTypeEnum = CaseTypeEnum.valueOf(caseInputDto.getCaseType());
91   - ServiceTypeEnum serviceTypeEnum = ServiceTypeEnum.valueOf(caseInputDto.getServiceType());
92   - PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(caseInputDto.getPaidType());
93   - ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null;
94   - Long expense = Long.parseLong(caseInputDto.getExpense())*100;
95   - int res = caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,MEMBER_ID);
96   - return StdJson.ok(res==1?"添加成功":"已添加过");
  70 + return StdJson.ok(casementService.homePatentTypeList());
97 71 }catch (Exception e){
98 72 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
99 73 return StdJson.err(-1,e.getMessage());
100 74 }
101 75 }
102 76  
  77 + /***
  78 + * 查看所有列表
  79 + * @param caseInputDto
  80 + * @return
  81 + */
103 82 @ResponseBody
104 83 @RequestMapping(value="/find_case_list")
105 84 public Object findCasementList(CaseInputDto caseInputDto){
106 85 try {
107   - List<CaseOutputDto> casementList = caseHandlingService.findCasementList(MEMBER_ID);
  86 + List<CaseOutputDto> casementList = caseHandlingService.findCasementList(IndexController.MEMBER_ID);
108 87 return StdJson.ok(casementList);
109 88 }catch (Exception e){
110 89 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
... ...
src/main/java/com/canrd/patent/web/CasementPageController.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.web;
  2 +
  3 +import com.canrd.patent.common.utils.DateUtils;
  4 +import com.canrd.patent.common.utils.TextUtils;
  5 +import com.canrd.patent.dal.dto.CaseInputDto;
  6 +import com.canrd.patent.dal.enums.CaseTypeEnum;
  7 +import com.canrd.patent.dal.enums.PaidTypeEnum;
  8 +import com.canrd.patent.dal.enums.ReduceTypeEnum;
  9 +import com.canrd.patent.dal.enums.ServiceTypeEnum;
  10 +import com.canrd.patent.dal.model.Casement;
  11 +import com.canrd.patent.service.CaseHandlingService;
  12 +import com.canrd.patent.service.CasementService;
  13 +import org.slf4j.Logger;
  14 +import org.slf4j.LoggerFactory;
  15 +import org.springframework.stereotype.Controller;
  16 +import org.springframework.util.Assert;
  17 +import org.springframework.web.bind.annotation.RequestMapping;
  18 +import org.springframework.web.servlet.ModelAndView;
  19 +
  20 +import javax.annotation.Resource;
  21 +
  22 +/**
  23 + * 调试的controller
  24 + * Created by ouyangmao on 16/3/28.
  25 + */
  26 +@Controller
  27 +public class CasementPageController {
  28 + private static final Logger logger = LoggerFactory.getLogger(CasementPageController.class);
  29 + @Resource
  30 + private CasementService casementService;
  31 + @Resource
  32 + private CaseHandlingService caseHandlingService;
  33 +
  34 + @RequestMapping(value="/submit_case")
  35 + public ModelAndView submitCase(CaseInputDto caseInputDto){
  36 + ModelAndView modelAndView = new ModelAndView();
  37 + try {
  38 + Assert.notNull(caseInputDto.getCaseType(), "caseType不能为空");
  39 + Assert.notNull(caseInputDto.getServiceType(), "serviceType不能为空");
  40 + Assert.notNull(caseInputDto.getPaidType(), "paidType不能为空");
  41 + Assert.notNull(caseInputDto.getExpense(), "expense不能为空");
  42 + CaseTypeEnum caseTypeEnum = CaseTypeEnum.valueOf(caseInputDto.getCaseType());
  43 + ServiceTypeEnum serviceTypeEnum = ServiceTypeEnum.valueOf(caseInputDto.getServiceType());
  44 + PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(caseInputDto.getPaidType());
  45 + ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null;
  46 + Long expense = Long.parseLong(caseInputDto.getExpense())*100;
  47 + Casement casement = caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,IndexController.MEMBER_ID);
  48 + modelAndView.addObject("caseId", casement.getId());
  49 + modelAndView.addObject("caseType", CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
  50 + modelAndView.addObject("name", casement.getName() == null ? "暂无名称" : casement.getName());
  51 + modelAndView.addObject("caseSn", casement.getCasesn());
  52 + modelAndView.addObject("expense", casement.getExpense()/100);
  53 + modelAndView.addObject("totalExpense", casement.getExpense()/100);
  54 + modelAndView.addObject("createDate", DateUtils.format(casement.getCreateDate()));
  55 + modelAndView.setViewName("pay");
  56 + }catch (Exception e){
  57 + logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
  58 + modelAndView.setViewName("error");
  59 + }
  60 + return modelAndView;
  61 + }
  62 +}
... ...
src/main/java/com/canrd/patent/web/IndexController.java
  View file @0e22c93
... ... @@ -14,6 +14,8 @@ import javax.annotation.Resource;
14 14 */
15 15 @Controller
16 16 public class IndexController {
  17 + public static String MEMBER_ID="372e5fa0f46c42b0836d39091ebd07d0";
  18 +
17 19 @Resource
18 20 private FrontConstant frontConstant;
19 21 /***
... ...
src/main/java/com/canrd/patent/web/PaymentDataController.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.web;
  2 +
  3 +import org.springframework.stereotype.Controller;
  4 +
  5 +/**
  6 + * Created by ouyangmao on 16/7/21.
  7 + */
  8 +@Controller
  9 +public class PaymentDataController {
  10 +}
... ...
src/main/java/com/canrd/patent/web/PaymentPageController.java 0 → 100644
  View file @0e22c93
  1 +package com.canrd.patent.web;
  2 +
  3 +import com.canrd.patent.dal.model.Payment;
  4 +import com.canrd.patent.service.PaymentService;
  5 +import org.springframework.stereotype.Controller;
  6 +import org.springframework.web.bind.annotation.RequestMapping;
  7 +
  8 +import javax.annotation.Resource;
  9 +
  10 +/**
  11 + * Created by ouyangmao on 16/7/21.
  12 + */
  13 +@Controller
  14 +public class PaymentPageController {
  15 + @Resource
  16 + private PaymentService paymentService;
  17 + /***
  18 + * 返回视图
  19 + * @return
  20 + */
  21 + @RequestMapping(value="/pay")
  22 + public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice){
  23 + paymentService.save(caseId, expense*100, address, phone, inName, invoice, IndexController.MEMBER_ID);
  24 + //跳转到支付宝
  25 + }
  26 +}
... ...
src/main/resources/mapper/PaymentMapper.xml 0 → 100644
  View file @0e22c93
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  5 + <!--
  6 + WARNING - @mbggenerated
  7 + This element is automatically generated by MyBatis Generator, do not modify.
  8 + -->
  9 + <id column="id" jdbcType="BIGINT" property="id" />
  10 + <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="expense" jdbcType="BIGINT" property="expense" />
  12 + <result column="pay_type" jdbcType="VARCHAR" property="payType" />
  13 + <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  14 + <result column="member_id" jdbcType="VARCHAR" property="memberId" />
  15 + <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
  16 + <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
  17 + </resultMap>
  18 + <sql id="Example_Where_Clause">
  19 + <!--
  20 + WARNING - @mbggenerated
  21 + This element is automatically generated by MyBatis Generator, do not modify.
  22 + -->
  23 + <where>
  24 + <foreach collection="oredCriteria" item="criteria" separator="or">
  25 + <if test="criteria.valid">
  26 + <trim prefix="(" prefixOverrides="and" suffix=")">
  27 + <foreach collection="criteria.criteria" item="criterion">
  28 + <choose>
  29 + <when test="criterion.noValue">
  30 + and ${criterion.condition}
  31 + </when>
  32 + <when test="criterion.singleValue">
  33 + and ${criterion.condition} #{criterion.value}
  34 + </when>
  35 + <when test="criterion.betweenValue">
  36 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  37 + </when>
  38 + <when test="criterion.listValue">
  39 + and ${criterion.condition}
  40 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  41 + #{listItem}
  42 + </foreach>
  43 + </when>
  44 + </choose>
  45 + </foreach>
  46 + </trim>
  47 + </if>
  48 + </foreach>
  49 + </where>
  50 + </sql>
  51 + <sql id="Update_By_Example_Where_Clause">
  52 + <!--
  53 + WARNING - @mbggenerated
  54 + This element is automatically generated by MyBatis Generator, do not modify.
  55 + -->
  56 + <where>
  57 + <foreach collection="example.oredCriteria" item="criteria" separator="or">
  58 + <if test="criteria.valid">
  59 + <trim prefix="(" prefixOverrides="and" suffix=")">
  60 + <foreach collection="criteria.criteria" item="criterion">
  61 + <choose>
  62 + <when test="criterion.noValue">
  63 + and ${criterion.condition}
  64 + </when>
  65 + <when test="criterion.singleValue">
  66 + and ${criterion.condition} #{criterion.value}
  67 + </when>
  68 + <when test="criterion.betweenValue">
  69 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  70 + </when>
  71 + <when test="criterion.listValue">
  72 + and ${criterion.condition}
  73 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  74 + #{listItem}
  75 + </foreach>
  76 + </when>
  77 + </choose>
  78 + </foreach>
  79 + </trim>
  80 + </if>
  81 + </foreach>
  82 + </where>
  83 + </sql>
  84 + <sql id="Base_Column_List">
  85 + <!--
  86 + WARNING - @mbggenerated
  87 + This element is automatically generated by MyBatis Generator, do not modify.
  88 + -->
  89 + id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + </sql>
  91 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <!--
  93 + WARNING - @mbggenerated
  94 + This element is automatically generated by MyBatis Generator, do not modify.
  95 + -->
  96 + select
  97 + <if test="distinct">
  98 + distinct
  99 + </if>
  100 + <include refid="Base_Column_List" />
  101 + from payment
  102 + <if test="_parameter != null">
  103 + <include refid="Example_Where_Clause" />
  104 + </if>
  105 + <if test="orderByClause != null">
  106 + order by ${orderByClause}
  107 + </if>
  108 + </select>
  109 + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
  110 + <!--
  111 + WARNING - @mbggenerated
  112 + This element is automatically generated by MyBatis Generator, do not modify.
  113 + -->
  114 + select
  115 + <include refid="Base_Column_List" />
  116 + from payment
  117 + where id = #{id,jdbcType=BIGINT}
  118 + </select>
  119 + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
  120 + <!--
  121 + WARNING - @mbggenerated
  122 + This element is automatically generated by MyBatis Generator, do not modify.
  123 + -->
  124 + delete from payment
  125 + where id = #{id,jdbcType=BIGINT}
  126 + </delete>
  127 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <!--
  129 + WARNING - @mbggenerated
  130 + This element is automatically generated by MyBatis Generator, do not modify.
  131 + -->
  132 + delete from payment
  133 + <if test="_parameter != null">
  134 + <include refid="Example_Where_Clause" />
  135 + </if>
  136 + </delete>
  137 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <!--
  139 + WARNING - @mbggenerated
  140 + This element is automatically generated by MyBatis Generator, do not modify.
  141 + -->
  142 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  143 + SELECT LAST_INSERT_ID()
  144 + </selectKey>
  145 + insert into payment (case_id, expense, pay_type,
  146 + order_status, member_id, create_date,
  147 + update_date)
  148 + values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
  149 + #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  150 + #{updateDate,jdbcType=TIMESTAMP})
  151 + </insert>
  152 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <!--
  154 + WARNING - @mbggenerated
  155 + This element is automatically generated by MyBatis Generator, do not modify.
  156 + -->
  157 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  158 + SELECT LAST_INSERT_ID()
  159 + </selectKey>
  160 + insert into payment
  161 + <trim prefix="(" suffix=")" suffixOverrides=",">
  162 + <if test="caseId != null">
  163 + case_id,
  164 + </if>
  165 + <if test="expense != null">
  166 + expense,
  167 + </if>
  168 + <if test="payType != null">
  169 + pay_type,
  170 + </if>
  171 + <if test="orderStatus != null">
  172 + order_status,
  173 + </if>
  174 + <if test="memberId != null">
  175 + member_id,
  176 + </if>
  177 + <if test="createDate != null">
  178 + create_date,
  179 + </if>
  180 + <if test="updateDate != null">
  181 + update_date,
  182 + </if>
  183 + </trim>
  184 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  185 + <if test="caseId != null">
  186 + #{caseId,jdbcType=BIGINT},
  187 + </if>
  188 + <if test="expense != null">
  189 + #{expense,jdbcType=BIGINT},
  190 + </if>
  191 + <if test="payType != null">
  192 + #{payType,jdbcType=VARCHAR},
  193 + </if>
  194 + <if test="orderStatus != null">
  195 + #{orderStatus,jdbcType=VARCHAR},
  196 + </if>
  197 + <if test="memberId != null">
  198 + #{memberId,jdbcType=VARCHAR},
  199 + </if>
  200 + <if test="createDate != null">
  201 + #{createDate,jdbcType=TIMESTAMP},
  202 + </if>
  203 + <if test="updateDate != null">
  204 + #{updateDate,jdbcType=TIMESTAMP},
  205 + </if>
  206 + </trim>
  207 + </insert>
  208 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  209 + <!--
  210 + WARNING - @mbggenerated
  211 + This element is automatically generated by MyBatis Generator, do not modify.
  212 + -->
  213 + select count(*) from payment
  214 + <if test="_parameter != null">
  215 + <include refid="Example_Where_Clause" />
  216 + </if>
  217 + </select>
  218 + <update id="updateByExampleSelective" parameterType="map">
  219 + <!--
  220 + WARNING - @mbggenerated
  221 + This element is automatically generated by MyBatis Generator, do not modify.
  222 + -->
  223 + update payment
  224 + <set>
  225 + <if test="record.id != null">
  226 + id = #{record.id,jdbcType=BIGINT},
  227 + </if>
  228 + <if test="record.caseId != null">
  229 + case_id = #{record.caseId,jdbcType=BIGINT},
  230 + </if>
  231 + <if test="record.expense != null">
  232 + expense = #{record.expense,jdbcType=BIGINT},
  233 + </if>
  234 + <if test="record.payType != null">
  235 + pay_type = #{record.payType,jdbcType=VARCHAR},
  236 + </if>
  237 + <if test="record.orderStatus != null">
  238 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  239 + </if>
  240 + <if test="record.memberId != null">
  241 + member_id = #{record.memberId,jdbcType=VARCHAR},
  242 + </if>
  243 + <if test="record.createDate != null">
  244 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  245 + </if>
  246 + <if test="record.updateDate != null">
  247 + update_date = #{record.updateDate,jdbcType=TIMESTAMP},
  248 + </if>
  249 + </set>
  250 + <if test="_parameter != null">
  251 + <include refid="Update_By_Example_Where_Clause" />
  252 + </if>
  253 + </update>
  254 + <update id="updateByExample" parameterType="map">
  255 + <!--
  256 + WARNING - @mbggenerated
  257 + This element is automatically generated by MyBatis Generator, do not modify.
  258 + -->
  259 + update payment
  260 + set id = #{record.id,jdbcType=BIGINT},
  261 + case_id = #{record.caseId,jdbcType=BIGINT},
  262 + expense = #{record.expense,jdbcType=BIGINT},
  263 + pay_type = #{record.payType,jdbcType=VARCHAR},
  264 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  265 + member_id = #{record.memberId,jdbcType=VARCHAR},
  266 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  267 + update_date = #{record.updateDate,jdbcType=TIMESTAMP}
  268 + <if test="_parameter != null">
  269 + <include refid="Update_By_Example_Where_Clause" />
  270 + </if>
  271 + </update>
  272 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  273 + <!--
  274 + WARNING - @mbggenerated
  275 + This element is automatically generated by MyBatis Generator, do not modify.
  276 + -->
  277 + update payment
  278 + <set>
  279 + <if test="caseId != null">
  280 + case_id = #{caseId,jdbcType=BIGINT},
  281 + </if>
  282 + <if test="expense != null">
  283 + expense = #{expense,jdbcType=BIGINT},
  284 + </if>
  285 + <if test="payType != null">
  286 + pay_type = #{payType,jdbcType=VARCHAR},
  287 + </if>
  288 + <if test="orderStatus != null">
  289 + order_status = #{orderStatus,jdbcType=VARCHAR},
  290 + </if>
  291 + <if test="memberId != null">
  292 + member_id = #{memberId,jdbcType=VARCHAR},
  293 + </if>
  294 + <if test="createDate != null">
  295 + create_date = #{createDate,jdbcType=TIMESTAMP},
  296 + </if>
  297 + <if test="updateDate != null">
  298 + update_date = #{updateDate,jdbcType=TIMESTAMP},
  299 + </if>
  300 + </set>
  301 + where id = #{id,jdbcType=BIGINT}
  302 + </update>
  303 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  304 + <!--
  305 + WARNING - @mbggenerated
  306 + This element is automatically generated by MyBatis Generator, do not modify.
  307 + -->
  308 + update payment
  309 + set case_id = #{caseId,jdbcType=BIGINT},
  310 + expense = #{expense,jdbcType=BIGINT},
  311 + pay_type = #{payType,jdbcType=VARCHAR},
  312 + order_status = #{orderStatus,jdbcType=VARCHAR},
  313 + member_id = #{memberId,jdbcType=VARCHAR},
  314 + create_date = #{createDate,jdbcType=TIMESTAMP},
  315 + update_date = #{updateDate,jdbcType=TIMESTAMP}
  316 + where id = #{id,jdbcType=BIGINT}
  317 + </update>
  318 +</mapper>
0 319 \ No newline at end of file
... ...
src/main/webapp/WEB-INF/springmvc-servlet.xml
  View file @0e22c93
... ... @@ -13,7 +13,7 @@
13 13 <ctx:property-placeholder ignore-resource-not-found="true" location="classpath:props/*.properties" />
14 14 <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
15 15 <property name="prefix" value="/" />
16   - <property name="suffix" value=".html" />
  16 + <property name="suffix" value=".jsp" />
17 17 </bean>
18 18 <mvc:default-servlet-handler />
19 19 <mvc:interceptors>
... ...
src/main/webapp/error.jsp 0 → 100644
  View file @0e22c93
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <link rel="stylesheet" type="text/css" href="/css/pay.css">
  8 +</head>
  9 +
  10 +<body>
  11 +<jsp:include page="/include/header.jsp" flush="true"/>
  12 +
  13 +<div class="content">
  14 + <p>小科程序猿正在努力修复</p>
  15 +</div>
  16 +
  17 +<jsp:include page="/include/footer.jsp" flush="true"/>
  18 +</body>
  19 +</html>
... ...
src/main/webapp/home_patent.jsp
  View file @0e22c93
... ... @@ -30,17 +30,20 @@
30 30 <div class="reduce_type">
31 31 <p></p>
32 32 </div>
  33 + <%--<div>
  34 + <p>数量:<input type="text" style="width: 40px;height: 20px"></p>
  35 + </div>--%>
33 36 <div>
34 37 <span class="expense"></span>
35   - <button class="submit_case">提交案件</button>
36   - <%--<form style="display: inline" id="submit_form" method="post">
  38 + <%--<button class="submit_case">提交案件</button>--%>
  39 + <form style="display: inline" id="submit_form" method="post">
37 40 <input type="hidden" name="caseType" id="input_ct">
38 41 <input type="hidden" name="serviceType" id="input_st">
39 42 <input type="hidden" name="paidType" id="input_pt">
40 43 <input type="hidden" name="reduceType" id="input_rt">
41 44 <input type="hidden" name="expense" id="input_es">
42 45 <button class="submit_case">提交案件</button>
43   - </form>--%>
  46 + </form>
44 47 </div>
45 48 </div>
46 49 </div>
... ... @@ -271,27 +274,11 @@
271 274 });
272 275  
273 276 function submit(caseType,serviceType,paidType,reduceType,expense){
274   - /*$("input#input_ct").val(caseType);
275   - $("input#input_st").val(serviceType);
276   - $("input#input_pt").val(paidType);
277   - $("input#input_rt").val(reduceType);
278   - $("input#input_es").val(expense);
279   - /!*$("form#submit_form").attr("action","/submit_case");*!/
280   - $("form#submit_form").ajaxSubmit({
281   - url:"/submit_case",
282   - dataType:"JSON",
283   - success:function(res){
284   - alert(res.data);
285   - },
286   - error:function(err){
287   -
288   - }
289   - });*/
290   - $.ajax({
  277 + /*$.ajax({
291 278 url:"/submit_case",
292 279 type:"POST",
293 280 dataType:"JSON",
294   - async:true,
  281 + async:false,
295 282 data:{
296 283 caseType:caseType,
297 284 serviceType:serviceType,
... ... @@ -301,11 +288,18 @@
301 288 },
302 289 success:function(res){
303 290 alert(res.data);
304   - location.href = "/pay.jsp";
305 291 },
306 292 error:function(err){
307 293 alert(err);
308 294 }
309   - });
  295 + });*/
  296 + $("input#input_ct").val(caseType);
  297 + $("input#input_st").val(serviceType);
  298 + $("input#input_pt").val(paidType);
  299 + $("input#input_rt").val(reduceType);
  300 + $("input#input_es").val(expense);
  301 + $("form#submit_form").attr("action","/submit_case");
  302 + $("form#submit_form").submit();
  303 +
310 304 }
311 305 </script>
... ...
src/main/webapp/pay.jsp
  View file @0e22c93
... ... @@ -31,7 +31,18 @@
31 31 </tr>
32 32 </thead>
33 33 <tbody class="case_list_body">
34   -
  34 + <tr>
  35 + <input type="hidden" id="case_id" value="${caseId}">
  36 + <td id="case_type"><span>${caseType}</span></td>
  37 + <td id="name"><span>${name}</span></td>
  38 + <td id="case_sn"><span>${caseSn}</span></td>
  39 + <td id="expense"><span>${expense}</span></td>
  40 + </tr>
  41 + <tr class="case-list-item-bottom-tr">
  42 + <td colspan="4">
  43 + <span id="contract_sn">合同号：<span>${contractSn}</span></span><span>立案时间：<span>${createDate}</span></span>
  44 + </td>
  45 + </tr>
35 46 </tbody>
36 47 </table>
37 48 </div>
... ... @@ -51,19 +62,19 @@
51 62 <span>设为默认地址</span>
52 63 </div>--%>
53 64 <form class="">
54   - <label for="">地址&nbsp;&nbsp;</label><input type="text" value="" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
55   - <label for="">电话&nbsp;&nbsp;</label><input type="text" value="" />
  65 + <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  66 + <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/>
56 67 </form>
57 68 </div>
58 69 </form>
59   - <div class="add-info add-addr">新增其他地址</div>
  70 + <%--<div class="add-info add-addr">新增其他地址</div>--%>
60 71 </div>
61 72 <div class="invoice-info">
62 73 <h2>发票信息</h2>
63 74 <form style="padding-left: 40px">
64   - <label for="">个人&nbsp;&nbsp;</label><input type="checkbox" value="个人">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
65   - <label for="">单位&nbsp;&nbsp;</label><input type="checkbox" value="单位">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
66   - <label for="">抬头&nbsp;&nbsp;</label><input type="text" value="">
  75 + <label for="">个人&nbsp;&nbsp;</label><input id="person" type="checkbox" value="个人">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  76 + <label for="">单位&nbsp;&nbsp;</label><input id="company" type="checkbox" value="单位">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  77 + <label for="">抬头&nbsp;&nbsp;</label><input id="invoice" type="text" value="" style="width: 200px">
67 78 </form>
68 79 <%--<form class="info-form">
69 80 <div>
... ... @@ -96,12 +107,22 @@
96 107 </div>
97 108 </div>
98 109 </form>--%>
99   - <div class="add-info add-addr">新增其他地址</div>
  110 + <%--<div class="add-info add-addr">新增其他地址</div>--%>
100 111 </div>
101 112 <div class="clearing">
102   - <div>2个案件，总费用 ： ￥3800.00</div>
103   - <div class="total-wrap">应付总额：<span class="total">￥7600</span></div>
104   - <div><span class="submit-btn">去结算</span></div>
  113 + <div>1个案件，总费用 ： ￥${expense}</div>
  114 + <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
  115 + <div>
  116 + <form id="pay_form" method="post">
  117 + <input type="hidden" name="caseId" id="pay_case_id" />
  118 + <input type="hidden" name="expense" id="pay_expense" />
  119 + <input type="hidden" name="address" id="pay_address" />
  120 + <input type="hidden" name="phone" id="pay_phone" />
  121 + <input type="hidden" name="inName" id="in_name" />
  122 + <input type="hidden" name="invoice" id="pay_invoice" />
  123 + <span id="submit_pay" class="submit-btn">去结算</span>
  124 + </form>
  125 + </div>
105 126 </div>
106 127 </div>
107 128 </div>
... ... @@ -112,15 +133,78 @@
112 133 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
113 134 <script type="text/javascript" src="/js/pay.js"></script>
114 135 <script>
115   - var case_list_body=$(".case_list_body");
  136 + /***
  137 + * 校验手机号码格式
  138 + */
  139 + function checkPhone(originPhone) {
  140 + var phone = $.trim(originPhone);
  141 + if (phone == "") {
  142 + alert("手机号码不能为空！");
  143 + return false;
  144 + }
  145 + if (phone != "") {
  146 + var reg = /^\d{11}$/;
  147 + if (!reg.test(phone)) {
  148 + alert("手机号码格式不对！");
  149 + return false;
  150 + }
  151 + }
  152 + return true;
  153 + }
  154 + /**
  155 + * 监听提交
  156 + */
  157 + $("#submit_pay").click(function(){
  158 + submit_pay();
  159 + });
  160 + /***
  161 + * 提交支付
  162 + */
  163 + function submit_pay(){
  164 + var id = $("#case_id").val();
  165 + var expense = $("#expense span").text();
  166 + var address = $("#address").val();
  167 + if(address==""){
  168 + alert("地址不能为空");
  169 + $("#address").focus();
  170 + return;
  171 + }
  172 + var phone = $("#phone").val();
  173 + if(!checkPhone(phone)){
  174 + $("#phone").focus();
  175 + return;
  176 + }
  177 + var person = $("#person").val();
  178 + var company = $("#company").val();
  179 + if(person==""&&company==""){
  180 + alert("请选择是个人还是公司发票");
  181 + $("#company").focus();
  182 + return;
  183 + }
  184 + var invoice = $("#invoice").val();
  185 + if(invoice==""){
  186 + alert("发票抬头不能为空");
  187 + $("#invoice").focus();
  188 + return;
  189 + }
  190 + $("#pay_case_id").val(id);
  191 + $("#pay_expense").val(expense);
  192 + $("#pay_address").val(address);
  193 + $("#pay_phone").val(phone);
  194 + $("#in_name").val(company==null?person:company);
  195 + $("#pay_invoice").val(invoice);
  196 + $("#pay_form").attr("action","/pay");
  197 + $("#pay_form").submit();
  198 + }
  199 + /*var case_list_body=$(".case_list_body");
116 200 $.ajax({
117   - url:"/find_case_list",
  201 + url:"/find_latest_case",
118 202 type:"POST",
119 203 dataType:"JSON",
120 204 async:false,
121   - success:function(res){
122   - var data = res.data;
123   - $.each(data,function(i,casement){
  205 + success: function (res) {
  206 + var casement = res.data;
  207 + if (casement) {
124 208 var trMain = $("<tr></tr>").appendTo(case_list_body);
125 209 //类型
126 210 var tdType = $("<td></td>").appendTo(trMain);
... ... @@ -128,7 +212,7 @@
128 212  
129 213 //名称
130 214 var tdName = $("<td></td>").appendTo(trMain);
131   - var spanName = $("<span></span>").text(casement['name']).appendTo(tdName);
  215 + var spanName = $("<span></span>").text(casement['name'] == null ? "暂无" : casement['name']).appendTo(tdName);
132 216  
133 217 //编号
134 218 var tdSn = $("<td></td>").appendTo(trMain);
... ... @@ -140,12 +224,12 @@
140 224 //footer信息
141 225 var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);
142 226 var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);
143   - $("<span>合同号：<span>"+casement['caseSn']+"</span></span>").appendTo(tdFooter);
144   - $("<span>立案时间：<span>"+casement['createDate']+"</span></span>").appendTo(tdFooter);
145   - });
  227 + $("<span>合同号：<span>" + casement['caseSn'] + "</span></span>").appendTo(tdFooter);
  228 + $("<span>立案时间：<span>" + casement['createDate'] + "</span></span>").appendTo(tdFooter);
  229 + }
146 230 },
147 231 error:function(err){
148 232 alert(err);
149 233 }
150   - });
  234 + });*/
151 235 </script>
... ...
src/test/resources/mbg/generatorConfig.xml
  View file @0e22c93
... ... @@ -48,6 +48,7 @@
48 48 <!-- 要生成哪些表-->
49 49 <table schema="public" tableName="mybatis_test" domainObjectName="MybatisTest"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
50 50 <table schema="public" tableName="casement" domainObjectName="Casement"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
  51 + <table schema="public" tableName="payment" domainObjectName="Payment"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
51 52 <!-- java -jar /Users/ouyangmao/.m2/repository/org/mybatis/generator/mybatis-generator-core/1.3.2/mybatis-generator-core-1.3.2.jar -configfile src/test/resources/mbg/generatorConfig.xml -overwrite
52 53 -->
53 54 </context>
... ...
target/classes/com/canrd/patent/dal/enums/OrderStatusEnum.class
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/mapper/PaymentMapper.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/model/Payment.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/service/CaseHandlingService.class
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/service/HomePatentService.class renamed to target/classes/com/canrd/patent/service/CasementService.class
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/service/PaymentService.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/CasementDataController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/CasementPageController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/HomePatentController.class deleted 100644 → 0
View file @dc25852
No preview for this file type
target/classes/com/canrd/patent/web/IndexController.class
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/PaymentDataController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/PaymentPageController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/classes/mapper/PaymentMapper.xml 0 → 100644
  View file @0e22c93
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  5 + <!--
  6 + WARNING - @mbggenerated
  7 + This element is automatically generated by MyBatis Generator, do not modify.
  8 + -->
  9 + <id column="id" jdbcType="BIGINT" property="id" />
  10 + <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="expense" jdbcType="BIGINT" property="expense" />
  12 + <result column="pay_type" jdbcType="VARCHAR" property="payType" />
  13 + <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  14 + <result column="member_id" jdbcType="VARCHAR" property="memberId" />
  15 + <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
  16 + <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
  17 + </resultMap>
  18 + <sql id="Example_Where_Clause">
  19 + <!--
  20 + WARNING - @mbggenerated
  21 + This element is automatically generated by MyBatis Generator, do not modify.
  22 + -->
  23 + <where>
  24 + <foreach collection="oredCriteria" item="criteria" separator="or">
  25 + <if test="criteria.valid">
  26 + <trim prefix="(" prefixOverrides="and" suffix=")">
  27 + <foreach collection="criteria.criteria" item="criterion">
  28 + <choose>
  29 + <when test="criterion.noValue">
  30 + and ${criterion.condition}
  31 + </when>
  32 + <when test="criterion.singleValue">
  33 + and ${criterion.condition} #{criterion.value}
  34 + </when>
  35 + <when test="criterion.betweenValue">
  36 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  37 + </when>
  38 + <when test="criterion.listValue">
  39 + and ${criterion.condition}
  40 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  41 + #{listItem}
  42 + </foreach>
  43 + </when>
  44 + </choose>
  45 + </foreach>
  46 + </trim>
  47 + </if>
  48 + </foreach>
  49 + </where>
  50 + </sql>
  51 + <sql id="Update_By_Example_Where_Clause">
  52 + <!--
  53 + WARNING - @mbggenerated
  54 + This element is automatically generated by MyBatis Generator, do not modify.
  55 + -->
  56 + <where>
  57 + <foreach collection="example.oredCriteria" item="criteria" separator="or">
  58 + <if test="criteria.valid">
  59 + <trim prefix="(" prefixOverrides="and" suffix=")">
  60 + <foreach collection="criteria.criteria" item="criterion">
  61 + <choose>
  62 + <when test="criterion.noValue">
  63 + and ${criterion.condition}
  64 + </when>
  65 + <when test="criterion.singleValue">
  66 + and ${criterion.condition} #{criterion.value}
  67 + </when>
  68 + <when test="criterion.betweenValue">
  69 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  70 + </when>
  71 + <when test="criterion.listValue">
  72 + and ${criterion.condition}
  73 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  74 + #{listItem}
  75 + </foreach>
  76 + </when>
  77 + </choose>
  78 + </foreach>
  79 + </trim>
  80 + </if>
  81 + </foreach>
  82 + </where>
  83 + </sql>
  84 + <sql id="Base_Column_List">
  85 + <!--
  86 + WARNING - @mbggenerated
  87 + This element is automatically generated by MyBatis Generator, do not modify.
  88 + -->
  89 + id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + </sql>
  91 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <!--
  93 + WARNING - @mbggenerated
  94 + This element is automatically generated by MyBatis Generator, do not modify.
  95 + -->
  96 + select
  97 + <if test="distinct">
  98 + distinct
  99 + </if>
  100 + <include refid="Base_Column_List" />
  101 + from payment
  102 + <if test="_parameter != null">
  103 + <include refid="Example_Where_Clause" />
  104 + </if>
  105 + <if test="orderByClause != null">
  106 + order by ${orderByClause}
  107 + </if>
  108 + </select>
  109 + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
  110 + <!--
  111 + WARNING - @mbggenerated
  112 + This element is automatically generated by MyBatis Generator, do not modify.
  113 + -->
  114 + select
  115 + <include refid="Base_Column_List" />
  116 + from payment
  117 + where id = #{id,jdbcType=BIGINT}
  118 + </select>
  119 + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
  120 + <!--
  121 + WARNING - @mbggenerated
  122 + This element is automatically generated by MyBatis Generator, do not modify.
  123 + -->
  124 + delete from payment
  125 + where id = #{id,jdbcType=BIGINT}
  126 + </delete>
  127 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <!--
  129 + WARNING - @mbggenerated
  130 + This element is automatically generated by MyBatis Generator, do not modify.
  131 + -->
  132 + delete from payment
  133 + <if test="_parameter != null">
  134 + <include refid="Example_Where_Clause" />
  135 + </if>
  136 + </delete>
  137 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <!--
  139 + WARNING - @mbggenerated
  140 + This element is automatically generated by MyBatis Generator, do not modify.
  141 + -->
  142 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  143 + SELECT LAST_INSERT_ID()
  144 + </selectKey>
  145 + insert into payment (case_id, expense, pay_type,
  146 + order_status, member_id, create_date,
  147 + update_date)
  148 + values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
  149 + #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  150 + #{updateDate,jdbcType=TIMESTAMP})
  151 + </insert>
  152 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <!--
  154 + WARNING - @mbggenerated
  155 + This element is automatically generated by MyBatis Generator, do not modify.
  156 + -->
  157 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  158 + SELECT LAST_INSERT_ID()
  159 + </selectKey>
  160 + insert into payment
  161 + <trim prefix="(" suffix=")" suffixOverrides=",">
  162 + <if test="caseId != null">
  163 + case_id,
  164 + </if>
  165 + <if test="expense != null">
  166 + expense,
  167 + </if>
  168 + <if test="payType != null">
  169 + pay_type,
  170 + </if>
  171 + <if test="orderStatus != null">
  172 + order_status,
  173 + </if>
  174 + <if test="memberId != null">
  175 + member_id,
  176 + </if>
  177 + <if test="createDate != null">
  178 + create_date,
  179 + </if>
  180 + <if test="updateDate != null">
  181 + update_date,
  182 + </if>
  183 + </trim>
  184 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  185 + <if test="caseId != null">
  186 + #{caseId,jdbcType=BIGINT},
  187 + </if>
  188 + <if test="expense != null">
  189 + #{expense,jdbcType=BIGINT},
  190 + </if>
  191 + <if test="payType != null">
  192 + #{payType,jdbcType=VARCHAR},
  193 + </if>
  194 + <if test="orderStatus != null">
  195 + #{orderStatus,jdbcType=VARCHAR},
  196 + </if>
  197 + <if test="memberId != null">
  198 + #{memberId,jdbcType=VARCHAR},
  199 + </if>
  200 + <if test="createDate != null">
  201 + #{createDate,jdbcType=TIMESTAMP},
  202 + </if>
  203 + <if test="updateDate != null">
  204 + #{updateDate,jdbcType=TIMESTAMP},
  205 + </if>
  206 + </trim>
  207 + </insert>
  208 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  209 + <!--
  210 + WARNING - @mbggenerated
  211 + This element is automatically generated by MyBatis Generator, do not modify.
  212 + -->
  213 + select count(*) from payment
  214 + <if test="_parameter != null">
  215 + <include refid="Example_Where_Clause" />
  216 + </if>
  217 + </select>
  218 + <update id="updateByExampleSelective" parameterType="map">
  219 + <!--
  220 + WARNING - @mbggenerated
  221 + This element is automatically generated by MyBatis Generator, do not modify.
  222 + -->
  223 + update payment
  224 + <set>
  225 + <if test="record.id != null">
  226 + id = #{record.id,jdbcType=BIGINT},
  227 + </if>
  228 + <if test="record.caseId != null">
  229 + case_id = #{record.caseId,jdbcType=BIGINT},
  230 + </if>
  231 + <if test="record.expense != null">
  232 + expense = #{record.expense,jdbcType=BIGINT},
  233 + </if>
  234 + <if test="record.payType != null">
  235 + pay_type = #{record.payType,jdbcType=VARCHAR},
  236 + </if>
  237 + <if test="record.orderStatus != null">
  238 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  239 + </if>
  240 + <if test="record.memberId != null">
  241 + member_id = #{record.memberId,jdbcType=VARCHAR},
  242 + </if>
  243 + <if test="record.createDate != null">
  244 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  245 + </if>
  246 + <if test="record.updateDate != null">
  247 + update_date = #{record.updateDate,jdbcType=TIMESTAMP},
  248 + </if>
  249 + </set>
  250 + <if test="_parameter != null">
  251 + <include refid="Update_By_Example_Where_Clause" />
  252 + </if>
  253 + </update>
  254 + <update id="updateByExample" parameterType="map">
  255 + <!--
  256 + WARNING - @mbggenerated
  257 + This element is automatically generated by MyBatis Generator, do not modify.
  258 + -->
  259 + update payment
  260 + set id = #{record.id,jdbcType=BIGINT},
  261 + case_id = #{record.caseId,jdbcType=BIGINT},
  262 + expense = #{record.expense,jdbcType=BIGINT},
  263 + pay_type = #{record.payType,jdbcType=VARCHAR},
  264 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  265 + member_id = #{record.memberId,jdbcType=VARCHAR},
  266 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  267 + update_date = #{record.updateDate,jdbcType=TIMESTAMP}
  268 + <if test="_parameter != null">
  269 + <include refid="Update_By_Example_Where_Clause" />
  270 + </if>
  271 + </update>
  272 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  273 + <!--
  274 + WARNING - @mbggenerated
  275 + This element is automatically generated by MyBatis Generator, do not modify.
  276 + -->
  277 + update payment
  278 + <set>
  279 + <if test="caseId != null">
  280 + case_id = #{caseId,jdbcType=BIGINT},
  281 + </if>
  282 + <if test="expense != null">
  283 + expense = #{expense,jdbcType=BIGINT},
  284 + </if>
  285 + <if test="payType != null">
  286 + pay_type = #{payType,jdbcType=VARCHAR},
  287 + </if>
  288 + <if test="orderStatus != null">
  289 + order_status = #{orderStatus,jdbcType=VARCHAR},
  290 + </if>
  291 + <if test="memberId != null">
  292 + member_id = #{memberId,jdbcType=VARCHAR},
  293 + </if>
  294 + <if test="createDate != null">
  295 + create_date = #{createDate,jdbcType=TIMESTAMP},
  296 + </if>
  297 + <if test="updateDate != null">
  298 + update_date = #{updateDate,jdbcType=TIMESTAMP},
  299 + </if>
  300 + </set>
  301 + where id = #{id,jdbcType=BIGINT}
  302 + </update>
  303 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  304 + <!--
  305 + WARNING - @mbggenerated
  306 + This element is automatically generated by MyBatis Generator, do not modify.
  307 + -->
  308 + update payment
  309 + set case_id = #{caseId,jdbcType=BIGINT},
  310 + expense = #{expense,jdbcType=BIGINT},
  311 + pay_type = #{payType,jdbcType=VARCHAR},
  312 + order_status = #{orderStatus,jdbcType=VARCHAR},
  313 + member_id = #{memberId,jdbcType=VARCHAR},
  314 + create_date = #{createDate,jdbcType=TIMESTAMP},
  315 + update_date = #{updateDate,jdbcType=TIMESTAMP}
  316 + where id = #{id,jdbcType=BIGINT}
  317 + </update>
  318 +</mapper>
0 319 \ No newline at end of file
... ...
target/patent/WEB-INF/classes/com/canrd/patent/dal/enums/OrderStatusEnum.class
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/PaymentMapper.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Payment.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/HomePatentService.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/PaymentService.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/CasementDataController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class deleted 100644 → 0
View file @dc25852
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentDataController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentPageController.class 0 → 100644
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/mapper/PaymentMapper.xml 0 → 100644
  View file @0e22c93
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  5 + <!--
  6 + WARNING - @mbggenerated
  7 + This element is automatically generated by MyBatis Generator, do not modify.
  8 + -->
  9 + <id column="id" jdbcType="BIGINT" property="id" />
  10 + <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="expense" jdbcType="BIGINT" property="expense" />
  12 + <result column="pay_type" jdbcType="VARCHAR" property="payType" />
  13 + <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
  14 + <result column="member_id" jdbcType="VARCHAR" property="memberId" />
  15 + <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
  16 + <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
  17 + </resultMap>
  18 + <sql id="Example_Where_Clause">
  19 + <!--
  20 + WARNING - @mbggenerated
  21 + This element is automatically generated by MyBatis Generator, do not modify.
  22 + -->
  23 + <where>
  24 + <foreach collection="oredCriteria" item="criteria" separator="or">
  25 + <if test="criteria.valid">
  26 + <trim prefix="(" prefixOverrides="and" suffix=")">
  27 + <foreach collection="criteria.criteria" item="criterion">
  28 + <choose>
  29 + <when test="criterion.noValue">
  30 + and ${criterion.condition}
  31 + </when>
  32 + <when test="criterion.singleValue">
  33 + and ${criterion.condition} #{criterion.value}
  34 + </when>
  35 + <when test="criterion.betweenValue">
  36 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  37 + </when>
  38 + <when test="criterion.listValue">
  39 + and ${criterion.condition}
  40 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  41 + #{listItem}
  42 + </foreach>
  43 + </when>
  44 + </choose>
  45 + </foreach>
  46 + </trim>
  47 + </if>
  48 + </foreach>
  49 + </where>
  50 + </sql>
  51 + <sql id="Update_By_Example_Where_Clause">
  52 + <!--
  53 + WARNING - @mbggenerated
  54 + This element is automatically generated by MyBatis Generator, do not modify.
  55 + -->
  56 + <where>
  57 + <foreach collection="example.oredCriteria" item="criteria" separator="or">
  58 + <if test="criteria.valid">
  59 + <trim prefix="(" prefixOverrides="and" suffix=")">
  60 + <foreach collection="criteria.criteria" item="criterion">
  61 + <choose>
  62 + <when test="criterion.noValue">
  63 + and ${criterion.condition}
  64 + </when>
  65 + <when test="criterion.singleValue">
  66 + and ${criterion.condition} #{criterion.value}
  67 + </when>
  68 + <when test="criterion.betweenValue">
  69 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
  70 + </when>
  71 + <when test="criterion.listValue">
  72 + and ${criterion.condition}
  73 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
  74 + #{listItem}
  75 + </foreach>
  76 + </when>
  77 + </choose>
  78 + </foreach>
  79 + </trim>
  80 + </if>
  81 + </foreach>
  82 + </where>
  83 + </sql>
  84 + <sql id="Base_Column_List">
  85 + <!--
  86 + WARNING - @mbggenerated
  87 + This element is automatically generated by MyBatis Generator, do not modify.
  88 + -->
  89 + id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + </sql>
  91 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <!--
  93 + WARNING - @mbggenerated
  94 + This element is automatically generated by MyBatis Generator, do not modify.
  95 + -->
  96 + select
  97 + <if test="distinct">
  98 + distinct
  99 + </if>
  100 + <include refid="Base_Column_List" />
  101 + from payment
  102 + <if test="_parameter != null">
  103 + <include refid="Example_Where_Clause" />
  104 + </if>
  105 + <if test="orderByClause != null">
  106 + order by ${orderByClause}
  107 + </if>
  108 + </select>
  109 + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
  110 + <!--
  111 + WARNING - @mbggenerated
  112 + This element is automatically generated by MyBatis Generator, do not modify.
  113 + -->
  114 + select
  115 + <include refid="Base_Column_List" />
  116 + from payment
  117 + where id = #{id,jdbcType=BIGINT}
  118 + </select>
  119 + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
  120 + <!--
  121 + WARNING - @mbggenerated
  122 + This element is automatically generated by MyBatis Generator, do not modify.
  123 + -->
  124 + delete from payment
  125 + where id = #{id,jdbcType=BIGINT}
  126 + </delete>
  127 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <!--
  129 + WARNING - @mbggenerated
  130 + This element is automatically generated by MyBatis Generator, do not modify.
  131 + -->
  132 + delete from payment
  133 + <if test="_parameter != null">
  134 + <include refid="Example_Where_Clause" />
  135 + </if>
  136 + </delete>
  137 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <!--
  139 + WARNING - @mbggenerated
  140 + This element is automatically generated by MyBatis Generator, do not modify.
  141 + -->
  142 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  143 + SELECT LAST_INSERT_ID()
  144 + </selectKey>
  145 + insert into payment (case_id, expense, pay_type,
  146 + order_status, member_id, create_date,
  147 + update_date)
  148 + values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
  149 + #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  150 + #{updateDate,jdbcType=TIMESTAMP})
  151 + </insert>
  152 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <!--
  154 + WARNING - @mbggenerated
  155 + This element is automatically generated by MyBatis Generator, do not modify.
  156 + -->
  157 + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
  158 + SELECT LAST_INSERT_ID()
  159 + </selectKey>
  160 + insert into payment
  161 + <trim prefix="(" suffix=")" suffixOverrides=",">
  162 + <if test="caseId != null">
  163 + case_id,
  164 + </if>
  165 + <if test="expense != null">
  166 + expense,
  167 + </if>
  168 + <if test="payType != null">
  169 + pay_type,
  170 + </if>
  171 + <if test="orderStatus != null">
  172 + order_status,
  173 + </if>
  174 + <if test="memberId != null">
  175 + member_id,
  176 + </if>
  177 + <if test="createDate != null">
  178 + create_date,
  179 + </if>
  180 + <if test="updateDate != null">
  181 + update_date,
  182 + </if>
  183 + </trim>
  184 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  185 + <if test="caseId != null">
  186 + #{caseId,jdbcType=BIGINT},
  187 + </if>
  188 + <if test="expense != null">
  189 + #{expense,jdbcType=BIGINT},
  190 + </if>
  191 + <if test="payType != null">
  192 + #{payType,jdbcType=VARCHAR},
  193 + </if>
  194 + <if test="orderStatus != null">
  195 + #{orderStatus,jdbcType=VARCHAR},
  196 + </if>
  197 + <if test="memberId != null">
  198 + #{memberId,jdbcType=VARCHAR},
  199 + </if>
  200 + <if test="createDate != null">
  201 + #{createDate,jdbcType=TIMESTAMP},
  202 + </if>
  203 + <if test="updateDate != null">
  204 + #{updateDate,jdbcType=TIMESTAMP},
  205 + </if>
  206 + </trim>
  207 + </insert>
  208 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  209 + <!--
  210 + WARNING - @mbggenerated
  211 + This element is automatically generated by MyBatis Generator, do not modify.
  212 + -->
  213 + select count(*) from payment
  214 + <if test="_parameter != null">
  215 + <include refid="Example_Where_Clause" />
  216 + </if>
  217 + </select>
  218 + <update id="updateByExampleSelective" parameterType="map">
  219 + <!--
  220 + WARNING - @mbggenerated
  221 + This element is automatically generated by MyBatis Generator, do not modify.
  222 + -->
  223 + update payment
  224 + <set>
  225 + <if test="record.id != null">
  226 + id = #{record.id,jdbcType=BIGINT},
  227 + </if>
  228 + <if test="record.caseId != null">
  229 + case_id = #{record.caseId,jdbcType=BIGINT},
  230 + </if>
  231 + <if test="record.expense != null">
  232 + expense = #{record.expense,jdbcType=BIGINT},
  233 + </if>
  234 + <if test="record.payType != null">
  235 + pay_type = #{record.payType,jdbcType=VARCHAR},
  236 + </if>
  237 + <if test="record.orderStatus != null">
  238 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  239 + </if>
  240 + <if test="record.memberId != null">
  241 + member_id = #{record.memberId,jdbcType=VARCHAR},
  242 + </if>
  243 + <if test="record.createDate != null">
  244 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  245 + </if>
  246 + <if test="record.updateDate != null">
  247 + update_date = #{record.updateDate,jdbcType=TIMESTAMP},
  248 + </if>
  249 + </set>
  250 + <if test="_parameter != null">
  251 + <include refid="Update_By_Example_Where_Clause" />
  252 + </if>
  253 + </update>
  254 + <update id="updateByExample" parameterType="map">
  255 + <!--
  256 + WARNING - @mbggenerated
  257 + This element is automatically generated by MyBatis Generator, do not modify.
  258 + -->
  259 + update payment
  260 + set id = #{record.id,jdbcType=BIGINT},
  261 + case_id = #{record.caseId,jdbcType=BIGINT},
  262 + expense = #{record.expense,jdbcType=BIGINT},
  263 + pay_type = #{record.payType,jdbcType=VARCHAR},
  264 + order_status = #{record.orderStatus,jdbcType=VARCHAR},
  265 + member_id = #{record.memberId,jdbcType=VARCHAR},
  266 + create_date = #{record.createDate,jdbcType=TIMESTAMP},
  267 + update_date = #{record.updateDate,jdbcType=TIMESTAMP}
  268 + <if test="_parameter != null">
  269 + <include refid="Update_By_Example_Where_Clause" />
  270 + </if>
  271 + </update>
  272 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  273 + <!--
  274 + WARNING - @mbggenerated
  275 + This element is automatically generated by MyBatis Generator, do not modify.
  276 + -->
  277 + update payment
  278 + <set>
  279 + <if test="caseId != null">
  280 + case_id = #{caseId,jdbcType=BIGINT},
  281 + </if>
  282 + <if test="expense != null">
  283 + expense = #{expense,jdbcType=BIGINT},
  284 + </if>
  285 + <if test="payType != null">
  286 + pay_type = #{payType,jdbcType=VARCHAR},
  287 + </if>
  288 + <if test="orderStatus != null">
  289 + order_status = #{orderStatus,jdbcType=VARCHAR},
  290 + </if>
  291 + <if test="memberId != null">
  292 + member_id = #{memberId,jdbcType=VARCHAR},
  293 + </if>
  294 + <if test="createDate != null">
  295 + create_date = #{createDate,jdbcType=TIMESTAMP},
  296 + </if>
  297 + <if test="updateDate != null">
  298 + update_date = #{updateDate,jdbcType=TIMESTAMP},
  299 + </if>
  300 + </set>
  301 + where id = #{id,jdbcType=BIGINT}
  302 + </update>
  303 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  304 + <!--
  305 + WARNING - @mbggenerated
  306 + This element is automatically generated by MyBatis Generator, do not modify.
  307 + -->
  308 + update payment
  309 + set case_id = #{caseId,jdbcType=BIGINT},
  310 + expense = #{expense,jdbcType=BIGINT},
  311 + pay_type = #{payType,jdbcType=VARCHAR},
  312 + order_status = #{orderStatus,jdbcType=VARCHAR},
  313 + member_id = #{memberId,jdbcType=VARCHAR},
  314 + create_date = #{createDate,jdbcType=TIMESTAMP},
  315 + update_date = #{updateDate,jdbcType=TIMESTAMP}
  316 + where id = #{id,jdbcType=BIGINT}
  317 + </update>
  318 +</mapper>
0 319 \ No newline at end of file
... ...
target/patent/WEB-INF/springmvc-servlet.xml
  View file @0e22c93
... ... @@ -13,7 +13,7 @@
13 13 <ctx:property-placeholder ignore-resource-not-found="true" location="classpath:props/*.properties" />
14 14 <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
15 15 <property name="prefix" value="/" />
16   - <property name="suffix" value=".html" />
  16 + <property name="suffix" value=".jsp" />
17 17 </bean>
18 18 <mvc:default-servlet-handler />
19 19 <mvc:interceptors>
... ...
target/patent/error.jsp 0 → 100644
  View file @0e22c93
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <link rel="stylesheet" type="text/css" href="/css/pay.css">
  8 +</head>
  9 +
  10 +<body>
  11 +<jsp:include page="/include/header.jsp" flush="true"/>
  12 +
  13 +<div class="content">
  14 + <p>小科程序猿正在努力修复</p>
  15 +</div>
  16 +
  17 +<jsp:include page="/include/footer.jsp" flush="true"/>
  18 +</body>
  19 +</html>
... ...
target/patent/home_patent.jsp
  View file @0e22c93
... ... @@ -30,17 +30,20 @@
30 30 <div class="reduce_type">
31 31 <p></p>
32 32 </div>
  33 + <%--<div>
  34 + <p>数量:<input type="text" style="width: 40px;height: 20px"></p>
  35 + </div>--%>
33 36 <div>
34 37 <span class="expense"></span>
35   - <button class="submit_case">提交案件</button>
36   - <%--<form style="display: inline" id="submit_form" method="post">
  38 + <%--<button class="submit_case">提交案件</button>--%>
  39 + <form style="display: inline" id="submit_form" method="post">
37 40 <input type="hidden" name="caseType" id="input_ct">
38 41 <input type="hidden" name="serviceType" id="input_st">
39 42 <input type="hidden" name="paidType" id="input_pt">
40 43 <input type="hidden" name="reduceType" id="input_rt">
41 44 <input type="hidden" name="expense" id="input_es">
42 45 <button class="submit_case">提交案件</button>
43   - </form>--%>
  46 + </form>
44 47 </div>
45 48 </div>
46 49 </div>
... ... @@ -271,27 +274,11 @@
271 274 });
272 275  
273 276 function submit(caseType,serviceType,paidType,reduceType,expense){
274   - /*$("input#input_ct").val(caseType);
275   - $("input#input_st").val(serviceType);
276   - $("input#input_pt").val(paidType);
277   - $("input#input_rt").val(reduceType);
278   - $("input#input_es").val(expense);
279   - /!*$("form#submit_form").attr("action","/submit_case");*!/
280   - $("form#submit_form").ajaxSubmit({
281   - url:"/submit_case",
282   - dataType:"JSON",
283   - success:function(res){
284   - alert(res.data);
285   - },
286   - error:function(err){
287   -
288   - }
289   - });*/
290   - $.ajax({
  277 + /*$.ajax({
291 278 url:"/submit_case",
292 279 type:"POST",
293 280 dataType:"JSON",
294   - async:true,
  281 + async:false,
295 282 data:{
296 283 caseType:caseType,
297 284 serviceType:serviceType,
... ... @@ -301,11 +288,18 @@
301 288 },
302 289 success:function(res){
303 290 alert(res.data);
304   - location.href = "/pay.jsp";
305 291 },
306 292 error:function(err){
307 293 alert(err);
308 294 }
309   - });
  295 + });*/
  296 + $("input#input_ct").val(caseType);
  297 + $("input#input_st").val(serviceType);
  298 + $("input#input_pt").val(paidType);
  299 + $("input#input_rt").val(reduceType);
  300 + $("input#input_es").val(expense);
  301 + $("form#submit_form").attr("action","/submit_case");
  302 + $("form#submit_form").submit();
  303 +
310 304 }
311 305 </script>
... ...
target/patent/pay.jsp
  View file @0e22c93
... ... @@ -31,7 +31,18 @@
31 31 </tr>
32 32 </thead>
33 33 <tbody class="case_list_body">
34   -
  34 + <tr>
  35 + <input type="hidden" id="case_id" value="${caseId}">
  36 + <td id="case_type"><span>${caseType}</span></td>
  37 + <td id="name"><span>${name}</span></td>
  38 + <td id="case_sn"><span>${caseSn}</span></td>
  39 + <td id="expense"><span>${expense}</span></td>
  40 + </tr>
  41 + <tr class="case-list-item-bottom-tr">
  42 + <td colspan="4">
  43 + <span id="contract_sn">合同号：<span>${contractSn}</span></span><span>立案时间：<span>${createDate}</span></span>
  44 + </td>
  45 + </tr>
35 46 </tbody>
36 47 </table>
37 48 </div>
... ... @@ -51,19 +62,19 @@
51 62 <span>设为默认地址</span>
52 63 </div>--%>
53 64 <form class="">
54   - <label for="">地址&nbsp;&nbsp;</label><input type="text" value="" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
55   - <label for="">电话&nbsp;&nbsp;</label><input type="text" value="" />
  65 + <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  66 + <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/>
56 67 </form>
57 68 </div>
58 69 </form>
59   - <div class="add-info add-addr">新增其他地址</div>
  70 + <%--<div class="add-info add-addr">新增其他地址</div>--%>
60 71 </div>
61 72 <div class="invoice-info">
62 73 <h2>发票信息</h2>
63 74 <form style="padding-left: 40px">
64   - <label for="">个人&nbsp;&nbsp;</label><input type="checkbox" value="个人">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
65   - <label for="">单位&nbsp;&nbsp;</label><input type="checkbox" value="单位">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
66   - <label for="">抬头&nbsp;&nbsp;</label><input type="text" value="">
  75 + <label for="">个人&nbsp;&nbsp;</label><input id="person" type="checkbox" value="个人">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  76 + <label for="">单位&nbsp;&nbsp;</label><input id="company" type="checkbox" value="单位">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  77 + <label for="">抬头&nbsp;&nbsp;</label><input id="invoice" type="text" value="" style="width: 200px">
67 78 </form>
68 79 <%--<form class="info-form">
69 80 <div>
... ... @@ -96,12 +107,22 @@
96 107 </div>
97 108 </div>
98 109 </form>--%>
99   - <div class="add-info add-addr">新增其他地址</div>
  110 + <%--<div class="add-info add-addr">新增其他地址</div>--%>
100 111 </div>
101 112 <div class="clearing">
102   - <div>2个案件，总费用 ： ￥3800.00</div>
103   - <div class="total-wrap">应付总额：<span class="total">￥7600</span></div>
104   - <div><span class="submit-btn">去结算</span></div>
  113 + <div>1个案件，总费用 ： ￥${expense}</div>
  114 + <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
  115 + <div>
  116 + <form id="pay_form" method="post">
  117 + <input type="hidden" name="caseId" id="pay_case_id" />
  118 + <input type="hidden" name="expense" id="pay_expense" />
  119 + <input type="hidden" name="address" id="pay_address" />
  120 + <input type="hidden" name="phone" id="pay_phone" />
  121 + <input type="hidden" name="inName" id="in_name" />
  122 + <input type="hidden" name="invoice" id="pay_invoice" />
  123 + <span id="submit_pay" class="submit-btn">去结算</span>
  124 + </form>
  125 + </div>
105 126 </div>
106 127 </div>
107 128 </div>
... ... @@ -112,15 +133,78 @@
112 133 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
113 134 <script type="text/javascript" src="/js/pay.js"></script>
114 135 <script>
115   - var case_list_body=$(".case_list_body");
  136 + /***
  137 + * 校验手机号码格式
  138 + */
  139 + function checkPhone(originPhone) {
  140 + var phone = $.trim(originPhone);
  141 + if (phone == "") {
  142 + alert("手机号码不能为空！");
  143 + return false;
  144 + }
  145 + if (phone != "") {
  146 + var reg = /^\d{11}$/;
  147 + if (!reg.test(phone)) {
  148 + alert("手机号码格式不对！");
  149 + return false;
  150 + }
  151 + }
  152 + return true;
  153 + }
  154 + /**
  155 + * 监听提交
  156 + */
  157 + $("#submit_pay").click(function(){
  158 + submit_pay();
  159 + });
  160 + /***
  161 + * 提交支付
  162 + */
  163 + function submit_pay(){
  164 + var id = $("#case_id").val();
  165 + var expense = $("#expense span").text();
  166 + var address = $("#address").val();
  167 + if(address==""){
  168 + alert("地址不能为空");
  169 + $("#address").focus();
  170 + return;
  171 + }
  172 + var phone = $("#phone").val();
  173 + if(!checkPhone(phone)){
  174 + $("#phone").focus();
  175 + return;
  176 + }
  177 + var person = $("#person").val();
  178 + var company = $("#company").val();
  179 + if(person==""&&company==""){
  180 + alert("请选择是个人还是公司发票");
  181 + $("#company").focus();
  182 + return;
  183 + }
  184 + var invoice = $("#invoice").val();
  185 + if(invoice==""){
  186 + alert("发票抬头不能为空");
  187 + $("#invoice").focus();
  188 + return;
  189 + }
  190 + $("#pay_case_id").val(id);
  191 + $("#pay_expense").val(expense);
  192 + $("#pay_address").val(address);
  193 + $("#pay_phone").val(phone);
  194 + $("#in_name").val(company==null?person:company);
  195 + $("#pay_invoice").val(invoice);
  196 + $("#pay_form").attr("action","/pay");
  197 + $("#pay_form").submit();
  198 + }
  199 + /*var case_list_body=$(".case_list_body");
116 200 $.ajax({
117   - url:"/find_case_list",
  201 + url:"/find_latest_case",
118 202 type:"POST",
119 203 dataType:"JSON",
120 204 async:false,
121   - success:function(res){
122   - var data = res.data;
123   - $.each(data,function(i,casement){
  205 + success: function (res) {
  206 + var casement = res.data;
  207 + if (casement) {
124 208 var trMain = $("<tr></tr>").appendTo(case_list_body);
125 209 //类型
126 210 var tdType = $("<td></td>").appendTo(trMain);
... ... @@ -128,7 +212,7 @@
128 212  
129 213 //名称
130 214 var tdName = $("<td></td>").appendTo(trMain);
131   - var spanName = $("<span></span>").text(casement['name']).appendTo(tdName);
  215 + var spanName = $("<span></span>").text(casement['name'] == null ? "暂无" : casement['name']).appendTo(tdName);
132 216  
133 217 //编号
134 218 var tdSn = $("<td></td>").appendTo(trMain);
... ... @@ -140,12 +224,12 @@
140 224 //footer信息
141 225 var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);
142 226 var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);
143   - $("<span>合同号：<span>"+casement['caseSn']+"</span></span>").appendTo(tdFooter);
144   - $("<span>立案时间：<span>"+casement['createDate']+"</span></span>").appendTo(tdFooter);
145   - });
  227 + $("<span>合同号：<span>" + casement['caseSn'] + "</span></span>").appendTo(tdFooter);
  228 + $("<span>立案时间：<span>" + casement['createDate'] + "</span></span>").appendTo(tdFooter);
  229 + }
146 230 },
147 231 error:function(err){
148 232 alert(err);
149 233 }
150   - });
  234 + });*/
151 235 </script>
... ...
target/test-classes/mbg/generatorConfig.xml 100644 → 100755
  View file @0e22c93
... ... @@ -48,6 +48,7 @@
48 48 <!-- 要生成哪些表-->
49 49 <table schema="public" tableName="mybatis_test" domainObjectName="MybatisTest"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
50 50 <table schema="public" tableName="casement" domainObjectName="Casement"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
  51 + <table schema="public" tableName="payment" domainObjectName="Payment"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
51 52 <!-- java -jar /Users/ouyangmao/.m2/repository/org/mybatis/generator/mybatis-generator-core/1.3.2/mybatis-generator-core-1.3.2.jar -configfile src/test/resources/mbg/generatorConfig.xml -overwrite
52 53 -->
53 54 </context>
... ...