kelude / canrd-patent · Commits

Commit 6a13fa7597e8064fcd6f9bb73276ad3ed826feba

Authored by maoyangou
1 parent 01a7d9c3
build: skipped

整体运转流程

Inline Side-by-side
Showing 49 changed files with 1150 additions and 1385 deletions
.idea/workspace.xml
  View file @6a13fa7
... ... @@ -2,13 +2,11 @@
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/OrderListOutputDto.java" />
6   - <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="" />
7   - <change type="DELETED" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="" />
8   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-detail.jsp" afterPath="" />
9   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-manage.jsp" afterPath="" />
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
10 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" />
11 7 <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" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" />
12 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" />
13 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" />
14 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />
... ... @@ -17,8 +15,8 @@
17 15 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />
18 16 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />
19 17 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />
20   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CasementService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CasementService.class" />
21   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CasementService.class" />
  18 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" />
  19 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" />
22 20 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" />
23 21 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" />
24 22 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />
... ... @@ -32,26 +30,24 @@
32 30 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" />
33 31 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" />
34 32 <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" />
  33 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
35 34 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
36 35 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
37 36 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" />
38 37 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" />
39 38 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" />
40   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
  39 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
41 40 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" />
42 41 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" />
  42 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
43 43 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" />
44 44 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" />
45 45 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" />
46 46 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
47 47 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
48 48 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
49   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/sql/ddl.sql" afterPath="$PROJECT_DIR$/doc/sql/ddl.sql" />
50   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />
51   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />
52   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
53   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay_result.jsp" afterPath="$PROJECT_DIR$/target/patent/pay_result.jsp" />
54   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
  49 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  50 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" />
55 51 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
56 52 </list>
57 53 <ignored path="patent.iws" />
... ... @@ -79,48 +75,58 @@
79 75 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
80 76 <provider selected="true" editor-type-id="text-editor">
81 77 <state vertical-scroll-proportion="0.0">
82   - <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
  78 + <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" />
83 79 <folding />
84 80 </state>
85 81 </provider>
86 82 </entry>
87 83 </file>
88   - <file leaf-file-name="Casement.java" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
  84 + <file leaf-file-name="OrderListOutputDto.java" pinned="false" current-in-tab="false">
  85 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
90 86 <provider selected="true" editor-type-id="text-editor">
91 87 <state vertical-scroll-proportion="0.0">
92   - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
93   - <folding />
  88 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
  89 + <folding>
  90 + <element signature="e#415#416#0" expanded="true" />
  91 + <element signature="e#465#466#0" expanded="true" />
  92 + </folding>
94 93 </state>
95 94 </provider>
96 95 </entry>
97 96 </file>
98   - <file leaf-file-name="CasementDataController.java" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
  97 + <file leaf-file-name="CaseOutputDto.java" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
100 99 <provider selected="true" editor-type-id="text-editor">
101 100 <state vertical-scroll-proportion="0.0">
102   - <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
103   - <folding />
  101 + <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
  102 + <folding>
  103 + <element signature="imports" expanded="true" />
  104 + </folding>
104 105 </state>
105 106 </provider>
106 107 </entry>
107 108 </file>
108   - <file leaf-file-name="CasementPageController.java" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
  109 + <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="true">
  110 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
110 111 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0">
112   - <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
  112 + <state vertical-scroll-proportion="1.2269231">
  113 + <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
113 114 <folding />
114 115 </state>
115 116 </provider>
116 117 </entry>
117 118 </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">
  119 + <file leaf-file-name="OrderOutputDto.java" pinned="false" current-in-tab="false">
  120 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java">
120 121 <provider selected="true" editor-type-id="text-editor">
121 122 <state vertical-scroll-proportion="0.0">
122   - <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
123   - <folding />
  123 + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
  124 + <folding>
  125 + <element signature="e#257#258#0" expanded="true" />
  126 + <element signature="e#293#294#0" expanded="true" />
  127 + <element signature="e#358#359#0" expanded="true" />
  128 + <element signature="e#408#409#0" expanded="true" />
  129 + </folding>
124 130 </state>
125 131 </provider>
126 132 </entry>
... ... @@ -128,48 +134,28 @@
128 134 <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">
129 135 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
130 136 <provider selected="true" editor-type-id="text-editor">
131   - <state vertical-scroll-proportion="-0.0">
132   - <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
  137 + <state vertical-scroll-proportion="-31.041666">
  138 + <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" />
133 139 <folding />
134 140 </state>
135 141 </provider>
136 142 </entry>
137 143 </file>
138   - <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="true">
139   - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
  144 + <file leaf-file-name="case_detail.jsp" pinned="false" current-in-tab="false">
  145 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
140 146 <provider selected="true" editor-type-id="text-editor">
141   - <state vertical-scroll-proportion="0.0">
  147 + <state vertical-scroll-proportion="80.0">
142 148 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
143 149 <folding />
144 150 </state>
145 151 </provider>
146 152 </entry>
147 153 </file>
148   - <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
149   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
150   - <provider selected="true" editor-type-id="text-editor">
151   - <state vertical-scroll-proportion="0.0">
152   - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
153   - <folding />
154   - </state>
155   - </provider>
156   - </entry>
157   - </file>
158   - <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
159   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
160   - <provider selected="true" editor-type-id="text-editor">
161   - <state vertical-scroll-proportion="0.0">
162   - <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
163   - <folding />
164   - </state>
165   - </provider>
166   - </entry>
167   - </file>
168   - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
169   - <entry file="file://$PROJECT_DIR$/pom.xml">
  154 + <file leaf-file-name="ReduceTypeEnum.java" pinned="false" current-in-tab="false">
  155 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
170 156 <provider selected="true" editor-type-id="text-editor">
171 157 <state vertical-scroll-proportion="0.0">
172   - <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
  158 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
173 159 <folding />
174 160 </state>
175 161 </provider>
... ... @@ -199,6 +185,7 @@
199 185 <component name="IdeDocumentHistory">
200 186 <option name="CHANGED_PATHS">
201 187 <list>
  188 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" />
202 189 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" />
203 190 <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
204 191 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
... ... @@ -214,12 +201,10 @@
214 201 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />
215 202 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
216 203 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
217   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
218 204 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" />
219 205 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" />
220 206 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" />
221 207 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
222   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
223 208 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
224 209 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
225 210 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
... ... @@ -231,25 +216,26 @@
231 216 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
232 217 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
233 218 <option value="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" />
234   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
235 219 <option value="$PROJECT_DIR$/src/main/webapp/pay-result.jsp" />
236 220 <option value="$PROJECT_DIR$/src/main/webapp/error.jsp" />
237 221 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
238 222 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
239   - <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
240 223 <option value="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
241 224 <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
242 225 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
243 226 <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
244 227 <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
245   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
246   - <option value="$PROJECT_DIR$/pom.xml" />
247   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
248   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
249   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
250 228 <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  229 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
  230 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
  231 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
  232 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
  233 + <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
251 234 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
  235 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
252 236 <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
  237 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
  238 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
253 239 </list>
254 240 </option>
255 241 </component>
... ... @@ -332,10 +318,9 @@
332 318 <order />
333 319 </component>
334 320 <component name="ProjectFrameBounds">
335   - <option name="x" value="1280" />
336 321 <option name="y" value="23" />
337   - <option name="width" value="1920" />
338   - <option name="height" value="1057" />
  322 + <option name="width" value="1280" />
  323 + <option name="height" value="732" />
339 324 </component>
340 325 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
341 326 <OptionsSetting value="true" id="Add" />
... ... @@ -361,7 +346,6 @@
361 346 </navigator>
362 347 <panes>
363 348 <pane id="Scope" />
364   - <pane id="PackagesPane" />
365 349 <pane id="Scratches" />
366 350 <pane id="ProjectPane">
367 351 <subPane>
... ... @@ -394,14 +378,6 @@
394 378 <option name="myItemId" value="src" />
395 379 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
396 380 </PATH_ELEMENT>
397   - <PATH_ELEMENT>
398   - <option name="myItemId" value="test" />
399   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
400   - </PATH_ELEMENT>
401   - <PATH_ELEMENT>
402   - <option name="myItemId" value="resources" />
403   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
404   - </PATH_ELEMENT>
405 381 </PATH>
406 382 <PATH>
407 383 <PATH_ELEMENT>
... ... @@ -417,84 +393,13 @@
417 393 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
418 394 </PATH_ELEMENT>
419 395 <PATH_ELEMENT>
420   - <option name="myItemId" value="test" />
421   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
422   - </PATH_ELEMENT>
423   - <PATH_ELEMENT>
424   - <option name="myItemId" value="resources" />
425   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
426   - </PATH_ELEMENT>
427   - <PATH_ELEMENT>
428   - <option name="myItemId" value="mbg" />
429   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
430   - </PATH_ELEMENT>
431   - </PATH>
432   - <PATH>
433   - <PATH_ELEMENT>
434   - <option name="myItemId" value="patent" />
435   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
436   - </PATH_ELEMENT>
437   - <PATH_ELEMENT>
438   - <option name="myItemId" value="canrd-patent" />
439   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440   - </PATH_ELEMENT>
441   - <PATH_ELEMENT>
442   - <option name="myItemId" value="src" />
443   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
444   - </PATH_ELEMENT>
445   - <PATH_ELEMENT>
446   - <option name="myItemId" value="test" />
447   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
448   - </PATH_ELEMENT>
449   - </PATH>
450   - <PATH>
451   - <PATH_ELEMENT>
452   - <option name="myItemId" value="patent" />
453   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
454   - </PATH_ELEMENT>
455   - <PATH_ELEMENT>
456   - <option name="myItemId" value="canrd-patent" />
457   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
458   - </PATH_ELEMENT>
459   - <PATH_ELEMENT>
460   - <option name="myItemId" value="src" />
461   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
462   - </PATH_ELEMENT>
463   - </PATH>
464   - <PATH>
465   - <PATH_ELEMENT>
466   - <option name="myItemId" value="patent" />
467   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
468   - </PATH_ELEMENT>
469   - <PATH_ELEMENT>
470   - <option name="myItemId" value="canrd-patent" />
471   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
472   - </PATH_ELEMENT>
473   - <PATH_ELEMENT>
474   - <option name="myItemId" value="doc" />
475   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
476   - </PATH_ELEMENT>
477   - </PATH>
478   - <PATH>
479   - <PATH_ELEMENT>
480   - <option name="myItemId" value="patent" />
481   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
482   - </PATH_ELEMENT>
483   - <PATH_ELEMENT>
484   - <option name="myItemId" value="canrd-patent" />
485   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
486   - </PATH_ELEMENT>
487   - <PATH_ELEMENT>
488   - <option name="myItemId" value="doc" />
489   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
490   - </PATH_ELEMENT>
491   - <PATH_ELEMENT>
492   - <option name="myItemId" value="sql" />
  396 + <option name="myItemId" value="main" />
493 397 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
494 398 </PATH_ELEMENT>
495 399 </PATH>
496 400 </subPane>
497 401 </pane>
  402 + <pane id="PackagesPane" />
498 403 </panes>
499 404 </component>
500 405 <component name="PropertiesComponent">
... ... @@ -981,42 +886,42 @@
981 886 <workItem from="1469026864774" duration="4528000" />
982 887 <workItem from="1469112269396" duration="6881000" />
983 888 <workItem from="1469242140776" duration="1637000" />
984   - <workItem from="1469243959439" duration="8023000" />
985   - <workItem from="1469259852751" duration="117000" />
  889 + <workItem from="1469243959439" duration="3683000" />
  890 + <workItem from="1469260205882" duration="7362000" />
986 891 </task>
987 892 <servers />
988 893 </component>
989 894 <component name="TimeTrackingManager">
990   - <option name="totallyTimeSpent" value="85995000" />
  895 + <option name="totallyTimeSpent" value="88900000" />
991 896 </component>
992 897 <component name="ToolWindowManager">
993   - <frame x="1280" y="23" width="1920" height="1057" extended-state="0" />
994   - <editor active="true" />
  898 + <frame x="0" y="23" width="1280" height="732" extended-state="6" />
  899 + <editor active="false" />
995 900 <layout>
996 901 <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" />
997 902 <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" />
998 903 <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" />
999   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46943006" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  904 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.375" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1000 905 <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" />
1001   - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  906 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  907 + <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" />
1002 908 <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" />
1003 909 <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" />
  910 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5125" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1004 911 <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" />
1005 912 <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" />
1006 913 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  914 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44974095" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1007 915 <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" />
1008 916 <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" />
1009 917 <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" />
1010   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.10915868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  918 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.11793215" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1011 919 <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" />
1012   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13951011" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
1013   - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  920 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24151857" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
1014 921 <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" />
  922 + <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" />
1015 923 <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" />
1016 924 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
1017   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32435232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1018   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46735752" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1019   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36580312" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1020 925 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
1021 926 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
1022 927 </layout>
... ... @@ -1062,16 +967,9 @@
1062 967 </component>
1063 968 <component name="XDebuggerManager">
1064 969 <breakpoint-manager>
1065   - <option name="time" value="23" />
  970 + <option name="time" value="32" />
1066 971 </breakpoint-manager>
1067   - <watches-manager>
1068   - <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
1069   - <watch expression="ReduceTypeEnum.valueOf(reduceType)" language="JAVA" custom="" />
1070   - <watch expression="TextUtils.isNotEmpty(reduceType)" language="JAVA" custom="" />
1071   - <watch expression="caseTypeEnum.name()+serviceTypeEnum.name()+paidTypeEnum.name()+reduceTypeEnum.name()" language="JAVA" custom="" />
1072   - <watch expression="CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name()" language="JAVA" custom="" />
1073   - </configuration>
1074   - </watches-manager>
  972 + <watches-manager />
1075 973 </component>
1076 974 <component name="antWorkspaceConfiguration">
1077 975 <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
... ... @@ -1125,17 +1023,11 @@
1125 1023 </state>
1126 1024 </provider>
1127 1025 </entry>
1128   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1129   - <provider selected="true" editor-type-id="text-editor">
1130   - <state vertical-scroll-proportion="0.0">
1131   - <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
1132   - </state>
1133   - </provider>
1134   - </entry>
1135 1026 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
1136 1027 <provider selected="true" editor-type-id="text-editor">
1137 1028 <state vertical-scroll-proportion="0.22900763">
1138 1029 <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
  1030 + <folding />
1139 1031 </state>
1140 1032 </provider>
1141 1033 </entry>
... ... @@ -1153,13 +1045,6 @@
1153 1045 </state>
1154 1046 </provider>
1155 1047 </entry>
1156   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1157   - <provider selected="true" editor-type-id="text-editor">
1158   - <state vertical-scroll-proportion="0.61496353">
1159   - <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
1160   - </state>
1161   - </provider>
1162   - </entry>
1163 1048 <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1164 1049 <provider selected="true" editor-type-id="text-editor">
1165 1050 <state vertical-scroll-proportion="-12.5">
... ... @@ -1196,10 +1081,17 @@
1196 1081 </state>
1197 1082 </provider>
1198 1083 </entry>
1199   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
  1084 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
1200 1085 <provider selected="true" editor-type-id="text-editor">
1201 1086 <state vertical-scroll-proportion="0.0">
1202   - <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
  1087 + <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
  1088 + </state>
  1089 + </provider>
  1090 + </entry>
  1091 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
  1092 + <provider selected="true" editor-type-id="text-editor">
  1093 + <state vertical-scroll-proportion="0.0">
  1094 + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
1203 1095 </state>
1204 1096 </provider>
1205 1097 </entry>
... ... @@ -1231,6 +1123,14 @@
1231 1123 </state>
1232 1124 </provider>
1233 1125 </entry>
  1126 + <entry file="file://$PROJECT_DIR$/pom.xml">
  1127 + <provider selected="true" editor-type-id="text-editor">
  1128 + <state vertical-scroll-proportion="0.0">
  1129 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1130 + <folding />
  1131 + </state>
  1132 + </provider>
  1133 + </entry>
1234 1134 <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">
1235 1135 <provider selected="true" editor-type-id="text-editor">
1236 1136 <state vertical-scroll-proportion="0.0">
... ... @@ -1243,6 +1143,7 @@
1243 1143 <provider selected="true" editor-type-id="text-editor">
1244 1144 <state vertical-scroll-proportion="0.0">
1245 1145 <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
  1146 + <folding />
1246 1147 </state>
1247 1148 </provider>
1248 1149 </entry>
... ... @@ -1250,6 +1151,7 @@
1250 1151 <provider selected="true" editor-type-id="text-editor">
1251 1152 <state vertical-scroll-proportion="0.0">
1252 1153 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1154 + <folding />
1253 1155 </state>
1254 1156 </provider>
1255 1157 </entry>
... ... @@ -1257,6 +1159,7 @@
1257 1159 <provider selected="true" editor-type-id="text-editor">
1258 1160 <state vertical-scroll-proportion="1.2162921">
1259 1161 <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" />
  1162 + <folding />
1260 1163 </state>
1261 1164 </provider>
1262 1165 </entry>
... ... @@ -1279,6 +1182,7 @@
1279 1182 <provider selected="true" editor-type-id="text-editor">
1280 1183 <state vertical-scroll-proportion="0.0">
1281 1184 <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
  1185 + <folding />
1282 1186 </state>
1283 1187 </provider>
1284 1188 </entry>
... ... @@ -1286,34 +1190,23 @@
1286 1190 <provider selected="true" editor-type-id="text-editor">
1287 1191 <state vertical-scroll-proportion="0.0">
1288 1192 <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
1289   - </state>
1290   - </provider>
1291   - </entry>
1292   - <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1293   - <provider selected="true" editor-type-id="text-editor">
1294   - <state vertical-scroll-proportion="-16.25">
1295   - <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1296   - </state>
1297   - </provider>
1298   - </entry>
1299   - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
1300   - <provider selected="true" editor-type-id="text-editor">
1301   - <state vertical-scroll-proportion="-4.9562936">
1302   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1193 + <folding />
1303 1194 </state>
1304 1195 </provider>
1305 1196 </entry>
1306 1197 <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
1307 1198 <provider selected="true" editor-type-id="text-editor">
1308   - <state vertical-scroll-proportion="-3.75">
  1199 + <state vertical-scroll-proportion="0.0">
1309 1200 <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
  1201 + <folding />
1310 1202 </state>
1311 1203 </provider>
1312 1204 </entry>
1313 1205 <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
1314 1206 <provider selected="true" editor-type-id="text-editor">
1315   - <state vertical-scroll-proportion="-16.875">
  1207 + <state vertical-scroll-proportion="0.0">
1316 1208 <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
  1209 + <folding />
1317 1210 </state>
1318 1211 </provider>
1319 1212 </entry>
... ... @@ -1321,149 +1214,211 @@
1321 1214 <provider selected="true" editor-type-id="text-editor">
1322 1215 <state vertical-scroll-proportion="0.0">
1323 1216 <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
  1217 + <folding />
1324 1218 </state>
1325 1219 </provider>
1326 1220 </entry>
1327   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  1221 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1328 1222 <provider selected="true" editor-type-id="text-editor">
1329 1223 <state vertical-scroll-proportion="0.0">
1330   - <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  1224 + <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
1331 1225 <folding />
1332 1226 </state>
1333 1227 </provider>
1334 1228 </entry>
1335   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java">
  1229 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java">
1336 1230 <provider selected="true" editor-type-id="text-editor">
1337 1231 <state vertical-scroll-proportion="0.0">
1338   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1232 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
  1233 + <folding />
1339 1234 </state>
1340 1235 </provider>
1341 1236 </entry>
1342   - <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/jstl/1.2/jstl-1.2.jar!/META-INF/c.tld">
  1237 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java">
1343 1238 <provider selected="true" editor-type-id="text-editor">
1344 1239 <state vertical-scroll-proportion="0.0">
1345   - <caret line="108" column="16" selection-start-line="108" selection-start-column="16" selection-end-line="108" selection-end-column="16" />
  1240 + <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
1346 1241 <folding />
1347 1242 </state>
1348 1243 </provider>
1349 1244 </entry>
1350   - <entry file="file://$PROJECT_DIR$/pom.xml">
  1245 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
1351 1246 <provider selected="true" editor-type-id="text-editor">
1352 1247 <state vertical-scroll-proportion="0.0">
1353   - <caret line="108" column="21" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
  1248 + <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
1354 1249 <folding />
1355 1250 </state>
1356 1251 </provider>
1357 1252 </entry>
1358   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
  1253 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
1359 1254 <provider selected="true" editor-type-id="text-editor">
1360 1255 <state vertical-scroll-proportion="0.0">
1361   - <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
1362   - <folding>
1363   - <element signature="imports" expanded="true" />
1364   - <element signature="e#325#326#0" expanded="true" />
1365   - <element signature="e#375#376#0" expanded="true" />
1366   - <element signature="e#415#416#0" expanded="true" />
1367   - </folding>
  1256 + <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  1257 + <folding />
1368 1258 </state>
1369 1259 </provider>
1370 1260 </entry>
1371   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
  1261 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
1372 1262 <provider selected="true" editor-type-id="text-editor">
1373 1263 <state vertical-scroll-proportion="0.0">
1374   - <caret line="162" column="21" selection-start-line="162" selection-start-column="21" selection-end-line="162" selection-end-column="21" />
1375   - <folding>
1376   - <element signature="e#10630#10631#0" expanded="true" />
1377   - <element signature="e#10690#10691#0" expanded="true" />
1378   - </folding>
  1264 + <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
  1265 + <folding />
1379 1266 </state>
1380 1267 </provider>
1381 1268 </entry>
1382   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1269 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  1270 + <provider selected="true" editor-type-id="text-editor">
  1271 + <state vertical-scroll-proportion="-16.083334">
  1272 + <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
  1273 + <folding />
  1274 + </state>
  1275 + </provider>
  1276 + </entry>
  1277 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  1278 + <provider selected="true" editor-type-id="text-editor">
  1279 + <state vertical-scroll-proportion="-6.27451">
  1280 + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
  1281 + <folding />
  1282 + </state>
  1283 + </provider>
  1284 + </entry>
  1285 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1383 1286 <provider selected="true" editor-type-id="text-editor">
1384 1287 <state vertical-scroll-proportion="0.0">
1385   - <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
  1288 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
1386 1289 <folding />
1387 1290 </state>
1388 1291 </provider>
1389 1292 </entry>
1390 1293 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
1391 1294 <provider selected="true" editor-type-id="text-editor">
1392   - <state vertical-scroll-proportion="0.0">
1393   - <caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
  1295 + <state vertical-scroll-proportion="-6.148148">
  1296 + <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
1394 1297 <folding>
1395 1298 <element signature="imports" expanded="true" />
  1299 + <element signature="e#2300#2301#0" expanded="true" />
  1300 + <element signature="e#2362#2363#0" expanded="true" />
1396 1301 </folding>
1397 1302 </state>
1398 1303 </provider>
1399 1304 </entry>
1400   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  1305 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1401 1306 <provider selected="true" editor-type-id="text-editor">
1402   - <state vertical-scroll-proportion="-19.75">
1403   - <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
  1307 + <state vertical-scroll-proportion="0.0">
  1308 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
  1309 + <folding>
  1310 + <element signature="e#2712#2713#0" expanded="true" />
  1311 + <element signature="e#2737#2738#0" expanded="true" />
  1312 + <element signature="e#2989#2990#0" expanded="true" />
  1313 + <element signature="e#3017#3018#0" expanded="true" />
  1314 + <element signature="e#3270#3271#0" expanded="true" />
  1315 + <element signature="e#3297#3298#0" expanded="true" />
  1316 + <element signature="e#3561#3562#0" expanded="true" />
  1317 + <element signature="e#3622#3623#0" expanded="true" />
  1318 + <element signature="e#3883#3884#0" expanded="true" />
  1319 + <element signature="e#3912#3913#0" expanded="true" />
  1320 + <element signature="e#4188#4189#0" expanded="true" />
  1321 + <element signature="e#4255#4256#0" expanded="true" />
  1322 + <element signature="e#4522#4523#0" expanded="true" />
  1323 + <element signature="e#4553#4554#0" expanded="true" />
  1324 + <element signature="e#4839#4840#0" expanded="true" />
  1325 + <element signature="e#4912#4913#0" expanded="true" />
  1326 + <element signature="e#5188#5189#0" expanded="true" />
  1327 + <element signature="e#5222#5223#0" expanded="true" />
  1328 + <element signature="e#5872#5873#0" expanded="true" />
  1329 + <element signature="e#5903#5904#0" expanded="true" />
  1330 + <element signature="e#6189#6190#0" expanded="true" />
  1331 + <element signature="e#6262#6263#0" expanded="true" />
  1332 + <element signature="e#6535#6536#0" expanded="true" />
  1333 + <element signature="e#6568#6569#0" expanded="true" />
  1334 + <element signature="e#6864#6865#0" expanded="true" />
  1335 + <element signature="e#6943#6944#0" expanded="true" />
  1336 + <element signature="e#7203#7204#0" expanded="true" />
  1337 + <element signature="e#7233#7234#0" expanded="true" />
  1338 + <element signature="e#7510#7511#0" expanded="true" />
  1339 + <element signature="e#7548#7549#0" expanded="true" />
  1340 + <element signature="e#7821#7822#0" expanded="true" />
  1341 + <element signature="e#7854#7855#0" expanded="true" />
  1342 + <element signature="e#8150#8151#0" expanded="true" />
  1343 + <element signature="e#8229#8230#0" expanded="true" />
  1344 + <element signature="e#9157#9158#0" expanded="true" />
  1345 + <element signature="e#9190#9191#0" expanded="true" />
  1346 + <element signature="e#9484#9485#0" expanded="true" />
  1347 + <element signature="e#9528#9529#0" expanded="true" />
  1348 + </folding>
1404 1349 </state>
1405 1350 </provider>
1406 1351 </entry>
1407   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  1352 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1408 1353 <provider selected="true" editor-type-id="text-editor">
1409 1354 <state vertical-scroll-proportion="0.0">
1410   - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
  1355 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
1411 1356 <folding />
1412 1357 </state>
1413 1358 </provider>
1414 1359 </entry>
1415   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
  1360 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1416 1361 <provider selected="true" editor-type-id="text-editor">
1417 1362 <state vertical-scroll-proportion="0.0">
1418   - <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
1419   - <folding />
  1363 + <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
  1364 + <folding>
  1365 + <element signature="imports" expanded="true" />
  1366 + </folding>
1420 1367 </state>
1421 1368 </provider>
1422 1369 </entry>
1423   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
  1370 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java">
1424 1371 <provider selected="true" editor-type-id="text-editor">
1425 1372 <state vertical-scroll-proportion="0.0">
1426   - <caret line="46" column="56" selection-start-line="46" selection-start-column="56" selection-end-line="46" selection-end-column="56" />
1427   - <folding />
  1373 + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
  1374 + <folding>
  1375 + <element signature="e#257#258#0" expanded="true" />
  1376 + <element signature="e#293#294#0" expanded="true" />
  1377 + <element signature="e#358#359#0" expanded="true" />
  1378 + <element signature="e#408#409#0" expanded="true" />
  1379 + </folding>
1428 1380 </state>
1429 1381 </provider>
1430 1382 </entry>
1431   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  1383 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
1432 1384 <provider selected="true" editor-type-id="text-editor">
1433   - <state vertical-scroll-proportion="0.0">
1434   - <caret line="46" column="52" selection-start-line="46" selection-start-column="52" selection-end-line="46" selection-end-column="52" />
  1385 + <state vertical-scroll-proportion="-31.041666">
  1386 + <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" />
1435 1387 <folding />
1436 1388 </state>
1437 1389 </provider>
1438 1390 </entry>
1439   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
  1391 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
1440 1392 <provider selected="true" editor-type-id="text-editor">
1441   - <state vertical-scroll-proportion="0.0">
1442   - <caret line="86" column="18" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
  1393 + <state vertical-scroll-proportion="80.0">
  1394 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1443 1395 <folding />
1444 1396 </state>
1445 1397 </provider>
1446 1398 </entry>
1447   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
  1399 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
1448 1400 <provider selected="true" editor-type-id="text-editor">
1449 1401 <state vertical-scroll-proportion="0.0">
1450   - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1451   - <folding />
  1402 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
  1403 + <folding>
  1404 + <element signature="e#415#416#0" expanded="true" />
  1405 + <element signature="e#465#466#0" expanded="true" />
  1406 + </folding>
1452 1407 </state>
1453 1408 </provider>
1454 1409 </entry>
1455   - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
  1410 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
1456 1411 <provider selected="true" editor-type-id="text-editor">
1457 1412 <state vertical-scroll-proportion="0.0">
1458   - <caret line="123" column="65" selection-start-line="123" selection-start-column="65" selection-end-line="123" selection-end-column="65" />
  1413 + <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" />
1459 1414 <folding />
1460 1415 </state>
1461 1416 </provider>
1462 1417 </entry>
1463   - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
  1418 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1464 1419 <provider selected="true" editor-type-id="text-editor">
1465   - <state vertical-scroll-proportion="0.0">
1466   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1420 + <state vertical-scroll-proportion="1.2269231">
  1421 + <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1467 1422 <folding />
1468 1423 </state>
1469 1424 </provider>
... ...
doc/patent.mwb 0 → 100644
View file @6a13fa7
No preview for this file type
doc/patent.mwb.bak 0 → 100644
View file @6a13fa7
No preview for this file type
src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java
  View file @6a13fa7
1 1 package com.canrd.patent.dal.dto;
2 2  
  3 +import com.canrd.patent.dal.model.Casement;
  4 +
3 5 import java.util.Date;
4 6  
5 7 /**
6 8 * Created by ouyangmao on 16/7/20.
7 9 */
8   -public class CaseOutputDto {
9   - private Long id;
10   - private String name;
11   - private String caseSn;
  10 +public class CaseOutputDto extends Casement{
12 11 private String contractNum;
13   - private String caseType;
14   - private Long expense;
15   - private String createDate;
16   -
17   - public Long getId() {
18   - return id;
19   - }
  12 + private String caseTypeTitle;
  13 + private String serviceTypeTitle;
  14 + private String paidTypeTitle;
  15 + private String reduceTypeTitle;
  16 + private String caseStatusTitle;
20 17  
21   - public void setId(Long id) {
22   - this.id = id;
23   - }
24   -
25   - public String getName() {
26   - return name;
  18 + public String getContractNum() {
  19 + return contractNum;
27 20 }
28 21  
29   - public void setName(String name) {
30   - this.name = name;
  22 + public void setContractNum(String contractNum) {
  23 + this.contractNum = contractNum;
31 24 }
32 25  
33   - public String getCaseSn() {
34   - return caseSn;
  26 + public String getCaseTypeTitle() {
  27 + return caseTypeTitle;
35 28 }
36 29  
37   - public void setCaseSn(String caseSn) {
38   - this.caseSn = caseSn;
  30 + public void setCaseTypeTitle(String caseTypeTitle) {
  31 + this.caseTypeTitle = caseTypeTitle;
39 32 }
40 33  
41   - public String getContractNum() {
42   - return contractNum;
  34 + public String getServiceTypeTitle() {
  35 + return serviceTypeTitle;
43 36 }
44 37  
45   - public void setContractNum(String contractNum) {
46   - this.contractNum = contractNum;
  38 + public void setServiceTypeTitle(String serviceTypeTitle) {
  39 + this.serviceTypeTitle = serviceTypeTitle;
47 40 }
48 41  
49   - public String getCaseType() {
50   - return caseType;
  42 + public String getPaidTypeTitle() {
  43 + return paidTypeTitle;
51 44 }
52 45  
53   - public void setCaseType(String caseType) {
54   - this.caseType = caseType;
  46 + public void setPaidTypeTitle(String paidTypeTitle) {
  47 + this.paidTypeTitle = paidTypeTitle;
55 48 }
56 49  
57   - public Long getExpense() {
58   - return expense;
  50 + public String getReduceTypeTitle() {
  51 + return reduceTypeTitle;
59 52 }
60 53  
61   - public void setExpense(Long expense) {
62   - this.expense = expense;
  54 + public void setReduceTypeTitle(String reduceTypeTitle) {
  55 + this.reduceTypeTitle = reduceTypeTitle;
63 56 }
64 57  
65   - public String getCreateDate() {
66   - return createDate;
  58 + public String getCaseStatusTitle() {
  59 + return caseStatusTitle;
67 60 }
68 61  
69   - public void setCreateDate(String createDate) {
70   - this.createDate = createDate;
  62 + public void setCaseStatusTitle(String caseStatusTitle) {
  63 + this.caseStatusTitle = caseStatusTitle;
71 64 }
72 65 }
... ...
src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java
  View file @6a13fa7
... ... @@ -9,13 +9,13 @@ import java.util.List;
9 9 * Created by ouyangmao on 16/7/23.
10 10 */
11 11 public class OrderListOutputDto extends Order{
12   - Casement casement;
  12 + CaseOutputDto caseOutputDto;
13 13  
14   - public Casement getCasement() {
15   - return casement;
  14 + public CaseOutputDto getCaseOutputDto() {
  15 + return caseOutputDto;
16 16 }
17 17  
18   - public void setCasement(Casement casement) {
19   - this.casement = casement;
  18 + public void setCaseOutputDto(CaseOutputDto caseOutputDto) {
  19 + this.caseOutputDto = caseOutputDto;
20 20 }
21 21 }
... ...
src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java 0 → 100644
  View file @6a13fa7
  1 +package com.canrd.patent.dal.dto;
  2 +
  3 +import com.canrd.patent.dal.model.Casement;
  4 +
  5 +/**
  6 + * Created by ouyangmao on 16/7/24.
  7 + */
  8 +public class OrderOutputDto extends Casement{
  9 +
  10 + private CaseOutputDto caseOutputDto;
  11 +
  12 + public CaseOutputDto getCaseOutputDto() {
  13 + return caseOutputDto;
  14 + }
  15 +
  16 + public void setCaseOutputDto(CaseOutputDto caseOutputDto) {
  17 + this.caseOutputDto = caseOutputDto;
  18 + }
  19 +}
... ...
src/main/java/com/canrd/patent/dal/model/Casement.java
  View file @6a13fa7
... ... @@ -21,11 +21,11 @@ public class Casement {
21 21  
22 22 /**
23 23 * This field was generated by MyBatis Generator.
24   - * This field corresponds to the database column casement.caseSn
  24 + * This field corresponds to the database column casement.case_sn
25 25 *
26 26 * @mbggenerated
27 27 */
28   - private String casesn;
  28 + private String caseSn;
29 29  
30 30 /**
31 31 * This field was generated by MyBatis Generator.
... ... @@ -37,14 +37,6 @@ public class Casement {
37 37  
38 38 /**
39 39 * This field was generated by MyBatis Generator.
40   - * This field corresponds to the database column casement.case_type_title
41   - *
42   - * @mbggenerated
43   - */
44   - private String caseTypeTitle;
45   -
46   - /**
47   - * This field was generated by MyBatis Generator.
48 40 * This field corresponds to the database column casement.service_type
49 41 *
50 42 * @mbggenerated
... ... @@ -53,14 +45,6 @@ public class Casement {
53 45  
54 46 /**
55 47 * This field was generated by MyBatis Generator.
56   - * This field corresponds to the database column casement.service_type_title
57   - *
58   - * @mbggenerated
59   - */
60   - private String serviceTypeTitle;
61   -
62   - /**
63   - * This field was generated by MyBatis Generator.
64 48 * This field corresponds to the database column casement.paid_type
65 49 *
66 50 * @mbggenerated
... ... @@ -69,14 +53,6 @@ public class Casement {
69 53  
70 54 /**
71 55 * This field was generated by MyBatis Generator.
72   - * This field corresponds to the database column casement.paid_type_title
73   - *
74   - * @mbggenerated
75   - */
76   - private String paidTypeTitle;
77   -
78   - /**
79   - * This field was generated by MyBatis Generator.
80 56 * This field corresponds to the database column casement.reduce_type
81 57 *
82 58 * @mbggenerated
... ... @@ -85,14 +61,6 @@ public class Casement {
85 61  
86 62 /**
87 63 * This field was generated by MyBatis Generator.
88   - * This field corresponds to the database column casement.reduce_type_title
89   - *
90   - * @mbggenerated
91   - */
92   - private String reduceTypeTitle;
93   -
94   - /**
95   - * This field was generated by MyBatis Generator.
96 64 * This field corresponds to the database column casement.expense
97 65 *
98 66 * @mbggenerated
... ... @@ -101,14 +69,6 @@ public class Casement {
101 69  
102 70 /**
103 71 * This field was generated by MyBatis Generator.
104   - * This field corresponds to the database column casement.order_status
105   - *
106   - * @mbggenerated
107   - */
108   - private String orderStatus;
109   -
110   - /**
111   - * This field was generated by MyBatis Generator.
112 72 * This field corresponds to the database column casement.case_status
113 73 *
114 74 * @mbggenerated
... ... @@ -189,26 +149,26 @@ public class Casement {
189 149  
190 150 /**
191 151 * This method was generated by MyBatis Generator.
192   - * This method returns the value of the database column casement.caseSn
  152 + * This method returns the value of the database column casement.case_sn
193 153 *
194   - * @return the value of casement.caseSn
  154 + * @return the value of casement.case_sn
195 155 *
196 156 * @mbggenerated
197 157 */
198   - public String getCasesn() {
199   - return casesn;
  158 + public String getCaseSn() {
  159 + return caseSn;
200 160 }
201 161  
202 162 /**
203 163 * This method was generated by MyBatis Generator.
204   - * This method sets the value of the database column casement.caseSn
  164 + * This method sets the value of the database column casement.case_sn
205 165 *
206   - * @param casesn the value for casement.caseSn
  166 + * @param caseSn the value for casement.case_sn
207 167 *
208 168 * @mbggenerated
209 169 */
210   - public void setCasesn(String casesn) {
211   - this.casesn = casesn == null ? null : casesn.trim();
  170 + public void setCaseSn(String caseSn) {
  171 + this.caseSn = caseSn == null ? null : caseSn.trim();
212 172 }
213 173  
214 174 /**
... ... @@ -237,30 +197,6 @@ public class Casement {
237 197  
238 198 /**
239 199 * This method was generated by MyBatis Generator.
240   - * This method returns the value of the database column casement.case_type_title
241   - *
242   - * @return the value of casement.case_type_title
243   - *
244   - * @mbggenerated
245   - */
246   - public String getCaseTypeTitle() {
247   - return caseTypeTitle;
248   - }
249   -
250   - /**
251   - * This method was generated by MyBatis Generator.
252   - * This method sets the value of the database column casement.case_type_title
253   - *
254   - * @param caseTypeTitle the value for casement.case_type_title
255   - *
256   - * @mbggenerated
257   - */
258   - public void setCaseTypeTitle(String caseTypeTitle) {
259   - this.caseTypeTitle = caseTypeTitle == null ? null : caseTypeTitle.trim();
260   - }
261   -
262   - /**
263   - * This method was generated by MyBatis Generator.
264 200 * This method returns the value of the database column casement.service_type
265 201 *
266 202 * @return the value of casement.service_type
... ... @@ -285,30 +221,6 @@ public class Casement {
285 221  
286 222 /**
287 223 * This method was generated by MyBatis Generator.
288   - * This method returns the value of the database column casement.service_type_title
289   - *
290   - * @return the value of casement.service_type_title
291   - *
292   - * @mbggenerated
293   - */
294   - public String getServiceTypeTitle() {
295   - return serviceTypeTitle;
296   - }
297   -
298   - /**
299   - * This method was generated by MyBatis Generator.
300   - * This method sets the value of the database column casement.service_type_title
301   - *
302   - * @param serviceTypeTitle the value for casement.service_type_title
303   - *
304   - * @mbggenerated
305   - */
306   - public void setServiceTypeTitle(String serviceTypeTitle) {
307   - this.serviceTypeTitle = serviceTypeTitle == null ? null : serviceTypeTitle.trim();
308   - }
309   -
310   - /**
311   - * This method was generated by MyBatis Generator.
312 224 * This method returns the value of the database column casement.paid_type
313 225 *
314 226 * @return the value of casement.paid_type
... ... @@ -333,30 +245,6 @@ public class Casement {
333 245  
334 246 /**
335 247 * This method was generated by MyBatis Generator.
336   - * This method returns the value of the database column casement.paid_type_title
337   - *
338   - * @return the value of casement.paid_type_title
339   - *
340   - * @mbggenerated
341   - */
342   - public String getPaidTypeTitle() {
343   - return paidTypeTitle;
344   - }
345   -
346   - /**
347   - * This method was generated by MyBatis Generator.
348   - * This method sets the value of the database column casement.paid_type_title
349   - *
350   - * @param paidTypeTitle the value for casement.paid_type_title
351   - *
352   - * @mbggenerated
353   - */
354   - public void setPaidTypeTitle(String paidTypeTitle) {
355   - this.paidTypeTitle = paidTypeTitle == null ? null : paidTypeTitle.trim();
356   - }
357   -
358   - /**
359   - * This method was generated by MyBatis Generator.
360 248 * This method returns the value of the database column casement.reduce_type
361 249 *
362 250 * @return the value of casement.reduce_type
... ... @@ -381,30 +269,6 @@ public class Casement {
381 269  
382 270 /**
383 271 * This method was generated by MyBatis Generator.
384   - * This method returns the value of the database column casement.reduce_type_title
385   - *
386   - * @return the value of casement.reduce_type_title
387   - *
388   - * @mbggenerated
389   - */
390   - public String getReduceTypeTitle() {
391   - return reduceTypeTitle;
392   - }
393   -
394   - /**
395   - * This method was generated by MyBatis Generator.
396   - * This method sets the value of the database column casement.reduce_type_title
397   - *
398   - * @param reduceTypeTitle the value for casement.reduce_type_title
399   - *
400   - * @mbggenerated
401   - */
402   - public void setReduceTypeTitle(String reduceTypeTitle) {
403   - this.reduceTypeTitle = reduceTypeTitle == null ? null : reduceTypeTitle.trim();
404   - }
405   -
406   - /**
407   - * This method was generated by MyBatis Generator.
408 272 * This method returns the value of the database column casement.expense
409 273 *
410 274 * @return the value of casement.expense
... ... @@ -429,30 +293,6 @@ public class Casement {
429 293  
430 294 /**
431 295 * This method was generated by MyBatis Generator.
432   - * This method returns the value of the database column casement.order_status
433   - *
434   - * @return the value of casement.order_status
435   - *
436   - * @mbggenerated
437   - */
438   - public String getOrderStatus() {
439   - return orderStatus;
440   - }
441   -
442   - /**
443   - * This method was generated by MyBatis Generator.
444   - * This method sets the value of the database column casement.order_status
445   - *
446   - * @param orderStatus the value for casement.order_status
447   - *
448   - * @mbggenerated
449   - */
450   - public void setOrderStatus(String orderStatus) {
451   - this.orderStatus = orderStatus == null ? null : orderStatus.trim();
452   - }
453   -
454   - /**
455   - * This method was generated by MyBatis Generator.
456 296 * This method returns the value of the database column casement.case_status
457 297 *
458 298 * @return the value of casement.case_status
... ...
src/main/java/com/canrd/patent/dal/model/CasementExample.java
  View file @6a13fa7
... ... @@ -325,73 +325,73 @@ public class CasementExample {
325 325 return (Criteria) this;
326 326 }
327 327  
328   - public Criteria andCasesnIsNull() {
329   - addCriterion("caseSn is null");
  328 + public Criteria andCaseSnIsNull() {
  329 + addCriterion("case_sn is null");
330 330 return (Criteria) this;
331 331 }
332 332  
333   - public Criteria andCasesnIsNotNull() {
334   - addCriterion("caseSn is not null");
  333 + public Criteria andCaseSnIsNotNull() {
  334 + addCriterion("case_sn is not null");
335 335 return (Criteria) this;
336 336 }
337 337  
338   - public Criteria andCasesnEqualTo(String value) {
339   - addCriterion("caseSn =", value, "casesn");
  338 + public Criteria andCaseSnEqualTo(String value) {
  339 + addCriterion("case_sn =", value, "caseSn");
340 340 return (Criteria) this;
341 341 }
342 342  
343   - public Criteria andCasesnNotEqualTo(String value) {
344   - addCriterion("caseSn <>", value, "casesn");
  343 + public Criteria andCaseSnNotEqualTo(String value) {
  344 + addCriterion("case_sn <>", value, "caseSn");
345 345 return (Criteria) this;
346 346 }
347 347  
348   - public Criteria andCasesnGreaterThan(String value) {
349   - addCriterion("caseSn >", value, "casesn");
  348 + public Criteria andCaseSnGreaterThan(String value) {
  349 + addCriterion("case_sn >", value, "caseSn");
350 350 return (Criteria) this;
351 351 }
352 352  
353   - public Criteria andCasesnGreaterThanOrEqualTo(String value) {
354   - addCriterion("caseSn >=", value, "casesn");
  353 + public Criteria andCaseSnGreaterThanOrEqualTo(String value) {
  354 + addCriterion("case_sn >=", value, "caseSn");
355 355 return (Criteria) this;
356 356 }
357 357  
358   - public Criteria andCasesnLessThan(String value) {
359   - addCriterion("caseSn <", value, "casesn");
  358 + public Criteria andCaseSnLessThan(String value) {
  359 + addCriterion("case_sn <", value, "caseSn");
360 360 return (Criteria) this;
361 361 }
362 362  
363   - public Criteria andCasesnLessThanOrEqualTo(String value) {
364   - addCriterion("caseSn <=", value, "casesn");
  363 + public Criteria andCaseSnLessThanOrEqualTo(String value) {
  364 + addCriterion("case_sn <=", value, "caseSn");
365 365 return (Criteria) this;
366 366 }
367 367  
368   - public Criteria andCasesnLike(String value) {
369   - addCriterion("caseSn like", value, "casesn");
  368 + public Criteria andCaseSnLike(String value) {
  369 + addCriterion("case_sn like", value, "caseSn");
370 370 return (Criteria) this;
371 371 }
372 372  
373   - public Criteria andCasesnNotLike(String value) {
374   - addCriterion("caseSn not like", value, "casesn");
  373 + public Criteria andCaseSnNotLike(String value) {
  374 + addCriterion("case_sn not like", value, "caseSn");
375 375 return (Criteria) this;
376 376 }
377 377  
378   - public Criteria andCasesnIn(List<String> values) {
379   - addCriterion("caseSn in", values, "casesn");
  378 + public Criteria andCaseSnIn(List<String> values) {
  379 + addCriterion("case_sn in", values, "caseSn");
380 380 return (Criteria) this;
381 381 }
382 382  
383   - public Criteria andCasesnNotIn(List<String> values) {
384   - addCriterion("caseSn not in", values, "casesn");
  383 + public Criteria andCaseSnNotIn(List<String> values) {
  384 + addCriterion("case_sn not in", values, "caseSn");
385 385 return (Criteria) this;
386 386 }
387 387  
388   - public Criteria andCasesnBetween(String value1, String value2) {
389   - addCriterion("caseSn between", value1, value2, "casesn");
  388 + public Criteria andCaseSnBetween(String value1, String value2) {
  389 + addCriterion("case_sn between", value1, value2, "caseSn");
390 390 return (Criteria) this;
391 391 }
392 392  
393   - public Criteria andCasesnNotBetween(String value1, String value2) {
394   - addCriterion("caseSn not between", value1, value2, "casesn");
  393 + public Criteria andCaseSnNotBetween(String value1, String value2) {
  394 + addCriterion("case_sn not between", value1, value2, "caseSn");
395 395 return (Criteria) this;
396 396 }
397 397  
... ... @@ -465,76 +465,6 @@ public class CasementExample {
465 465 return (Criteria) this;
466 466 }
467 467  
468   - public Criteria andCaseTypeTitleIsNull() {
469   - addCriterion("case_type_title is null");
470   - return (Criteria) this;
471   - }
472   -
473   - public Criteria andCaseTypeTitleIsNotNull() {
474   - addCriterion("case_type_title is not null");
475   - return (Criteria) this;
476   - }
477   -
478   - public Criteria andCaseTypeTitleEqualTo(String value) {
479   - addCriterion("case_type_title =", value, "caseTypeTitle");
480   - return (Criteria) this;
481   - }
482   -
483   - public Criteria andCaseTypeTitleNotEqualTo(String value) {
484   - addCriterion("case_type_title <>", value, "caseTypeTitle");
485   - return (Criteria) this;
486   - }
487   -
488   - public Criteria andCaseTypeTitleGreaterThan(String value) {
489   - addCriterion("case_type_title >", value, "caseTypeTitle");
490   - return (Criteria) this;
491   - }
492   -
493   - public Criteria andCaseTypeTitleGreaterThanOrEqualTo(String value) {
494   - addCriterion("case_type_title >=", value, "caseTypeTitle");
495   - return (Criteria) this;
496   - }
497   -
498   - public Criteria andCaseTypeTitleLessThan(String value) {
499   - addCriterion("case_type_title <", value, "caseTypeTitle");
500   - return (Criteria) this;
501   - }
502   -
503   - public Criteria andCaseTypeTitleLessThanOrEqualTo(String value) {
504   - addCriterion("case_type_title <=", value, "caseTypeTitle");
505   - return (Criteria) this;
506   - }
507   -
508   - public Criteria andCaseTypeTitleLike(String value) {
509   - addCriterion("case_type_title like", value, "caseTypeTitle");
510   - return (Criteria) this;
511   - }
512   -
513   - public Criteria andCaseTypeTitleNotLike(String value) {
514   - addCriterion("case_type_title not like", value, "caseTypeTitle");
515   - return (Criteria) this;
516   - }
517   -
518   - public Criteria andCaseTypeTitleIn(List<String> values) {
519   - addCriterion("case_type_title in", values, "caseTypeTitle");
520   - return (Criteria) this;
521   - }
522   -
523   - public Criteria andCaseTypeTitleNotIn(List<String> values) {
524   - addCriterion("case_type_title not in", values, "caseTypeTitle");
525   - return (Criteria) this;
526   - }
527   -
528   - public Criteria andCaseTypeTitleBetween(String value1, String value2) {
529   - addCriterion("case_type_title between", value1, value2, "caseTypeTitle");
530   - return (Criteria) this;
531   - }
532   -
533   - public Criteria andCaseTypeTitleNotBetween(String value1, String value2) {
534   - addCriterion("case_type_title not between", value1, value2, "caseTypeTitle");
535   - return (Criteria) this;
536   - }
537   -
538 468 public Criteria andServiceTypeIsNull() {
539 469 addCriterion("service_type is null");
540 470 return (Criteria) this;
... ... @@ -605,76 +535,6 @@ public class CasementExample {
605 535 return (Criteria) this;
606 536 }
607 537  
608   - public Criteria andServiceTypeTitleIsNull() {
609   - addCriterion("service_type_title is null");
610   - return (Criteria) this;
611   - }
612   -
613   - public Criteria andServiceTypeTitleIsNotNull() {
614   - addCriterion("service_type_title is not null");
615   - return (Criteria) this;
616   - }
617   -
618   - public Criteria andServiceTypeTitleEqualTo(String value) {
619   - addCriterion("service_type_title =", value, "serviceTypeTitle");
620   - return (Criteria) this;
621   - }
622   -
623   - public Criteria andServiceTypeTitleNotEqualTo(String value) {
624   - addCriterion("service_type_title <>", value, "serviceTypeTitle");
625   - return (Criteria) this;
626   - }
627   -
628   - public Criteria andServiceTypeTitleGreaterThan(String value) {
629   - addCriterion("service_type_title >", value, "serviceTypeTitle");
630   - return (Criteria) this;
631   - }
632   -
633   - public Criteria andServiceTypeTitleGreaterThanOrEqualTo(String value) {
634   - addCriterion("service_type_title >=", value, "serviceTypeTitle");
635   - return (Criteria) this;
636   - }
637   -
638   - public Criteria andServiceTypeTitleLessThan(String value) {
639   - addCriterion("service_type_title <", value, "serviceTypeTitle");
640   - return (Criteria) this;
641   - }
642   -
643   - public Criteria andServiceTypeTitleLessThanOrEqualTo(String value) {
644   - addCriterion("service_type_title <=", value, "serviceTypeTitle");
645   - return (Criteria) this;
646   - }
647   -
648   - public Criteria andServiceTypeTitleLike(String value) {
649   - addCriterion("service_type_title like", value, "serviceTypeTitle");
650   - return (Criteria) this;
651   - }
652   -
653   - public Criteria andServiceTypeTitleNotLike(String value) {
654   - addCriterion("service_type_title not like", value, "serviceTypeTitle");
655   - return (Criteria) this;
656   - }
657   -
658   - public Criteria andServiceTypeTitleIn(List<String> values) {
659   - addCriterion("service_type_title in", values, "serviceTypeTitle");
660   - return (Criteria) this;
661   - }
662   -
663   - public Criteria andServiceTypeTitleNotIn(List<String> values) {
664   - addCriterion("service_type_title not in", values, "serviceTypeTitle");
665   - return (Criteria) this;
666   - }
667   -
668   - public Criteria andServiceTypeTitleBetween(String value1, String value2) {
669   - addCriterion("service_type_title between", value1, value2, "serviceTypeTitle");
670   - return (Criteria) this;
671   - }
672   -
673   - public Criteria andServiceTypeTitleNotBetween(String value1, String value2) {
674   - addCriterion("service_type_title not between", value1, value2, "serviceTypeTitle");
675   - return (Criteria) this;
676   - }
677   -
678 538 public Criteria andPaidTypeIsNull() {
679 539 addCriterion("paid_type is null");
680 540 return (Criteria) this;
... ... @@ -745,76 +605,6 @@ public class CasementExample {
745 605 return (Criteria) this;
746 606 }
747 607  
748   - public Criteria andPaidTypeTitleIsNull() {
749   - addCriterion("paid_type_title is null");
750   - return (Criteria) this;
751   - }
752   -
753   - public Criteria andPaidTypeTitleIsNotNull() {
754   - addCriterion("paid_type_title is not null");
755   - return (Criteria) this;
756   - }
757   -
758   - public Criteria andPaidTypeTitleEqualTo(String value) {
759   - addCriterion("paid_type_title =", value, "paidTypeTitle");
760   - return (Criteria) this;
761   - }
762   -
763   - public Criteria andPaidTypeTitleNotEqualTo(String value) {
764   - addCriterion("paid_type_title <>", value, "paidTypeTitle");
765   - return (Criteria) this;
766   - }
767   -
768   - public Criteria andPaidTypeTitleGreaterThan(String value) {
769   - addCriterion("paid_type_title >", value, "paidTypeTitle");
770   - return (Criteria) this;
771   - }
772   -
773   - public Criteria andPaidTypeTitleGreaterThanOrEqualTo(String value) {
774   - addCriterion("paid_type_title >=", value, "paidTypeTitle");
775   - return (Criteria) this;
776   - }
777   -
778   - public Criteria andPaidTypeTitleLessThan(String value) {
779   - addCriterion("paid_type_title <", value, "paidTypeTitle");
780   - return (Criteria) this;
781   - }
782   -
783   - public Criteria andPaidTypeTitleLessThanOrEqualTo(String value) {
784   - addCriterion("paid_type_title <=", value, "paidTypeTitle");
785   - return (Criteria) this;
786   - }
787   -
788   - public Criteria andPaidTypeTitleLike(String value) {
789   - addCriterion("paid_type_title like", value, "paidTypeTitle");
790   - return (Criteria) this;
791   - }
792   -
793   - public Criteria andPaidTypeTitleNotLike(String value) {
794   - addCriterion("paid_type_title not like", value, "paidTypeTitle");
795   - return (Criteria) this;
796   - }
797   -
798   - public Criteria andPaidTypeTitleIn(List<String> values) {
799   - addCriterion("paid_type_title in", values, "paidTypeTitle");
800   - return (Criteria) this;
801   - }
802   -
803   - public Criteria andPaidTypeTitleNotIn(List<String> values) {
804   - addCriterion("paid_type_title not in", values, "paidTypeTitle");
805   - return (Criteria) this;
806   - }
807   -
808   - public Criteria andPaidTypeTitleBetween(String value1, String value2) {
809   - addCriterion("paid_type_title between", value1, value2, "paidTypeTitle");
810   - return (Criteria) this;
811   - }
812   -
813   - public Criteria andPaidTypeTitleNotBetween(String value1, String value2) {
814   - addCriterion("paid_type_title not between", value1, value2, "paidTypeTitle");
815   - return (Criteria) this;
816   - }
817   -
818 608 public Criteria andReduceTypeIsNull() {
819 609 addCriterion("reduce_type is null");
820 610 return (Criteria) this;
... ... @@ -885,76 +675,6 @@ public class CasementExample {
885 675 return (Criteria) this;
886 676 }
887 677  
888   - public Criteria andReduceTypeTitleIsNull() {
889   - addCriterion("reduce_type_title is null");
890   - return (Criteria) this;
891   - }
892   -
893   - public Criteria andReduceTypeTitleIsNotNull() {
894   - addCriterion("reduce_type_title is not null");
895   - return (Criteria) this;
896   - }
897   -
898   - public Criteria andReduceTypeTitleEqualTo(String value) {
899   - addCriterion("reduce_type_title =", value, "reduceTypeTitle");
900   - return (Criteria) this;
901   - }
902   -
903   - public Criteria andReduceTypeTitleNotEqualTo(String value) {
904   - addCriterion("reduce_type_title <>", value, "reduceTypeTitle");
905   - return (Criteria) this;
906   - }
907   -
908   - public Criteria andReduceTypeTitleGreaterThan(String value) {
909   - addCriterion("reduce_type_title >", value, "reduceTypeTitle");
910   - return (Criteria) this;
911   - }
912   -
913   - public Criteria andReduceTypeTitleGreaterThanOrEqualTo(String value) {
914   - addCriterion("reduce_type_title >=", value, "reduceTypeTitle");
915   - return (Criteria) this;
916   - }
917   -
918   - public Criteria andReduceTypeTitleLessThan(String value) {
919   - addCriterion("reduce_type_title <", value, "reduceTypeTitle");
920   - return (Criteria) this;
921   - }
922   -
923   - public Criteria andReduceTypeTitleLessThanOrEqualTo(String value) {
924   - addCriterion("reduce_type_title <=", value, "reduceTypeTitle");
925   - return (Criteria) this;
926   - }
927   -
928   - public Criteria andReduceTypeTitleLike(String value) {
929   - addCriterion("reduce_type_title like", value, "reduceTypeTitle");
930   - return (Criteria) this;
931   - }
932   -
933   - public Criteria andReduceTypeTitleNotLike(String value) {
934   - addCriterion("reduce_type_title not like", value, "reduceTypeTitle");
935   - return (Criteria) this;
936   - }
937   -
938   - public Criteria andReduceTypeTitleIn(List<String> values) {
939   - addCriterion("reduce_type_title in", values, "reduceTypeTitle");
940   - return (Criteria) this;
941   - }
942   -
943   - public Criteria andReduceTypeTitleNotIn(List<String> values) {
944   - addCriterion("reduce_type_title not in", values, "reduceTypeTitle");
945   - return (Criteria) this;
946   - }
947   -
948   - public Criteria andReduceTypeTitleBetween(String value1, String value2) {
949   - addCriterion("reduce_type_title between", value1, value2, "reduceTypeTitle");
950   - return (Criteria) this;
951   - }
952   -
953   - public Criteria andReduceTypeTitleNotBetween(String value1, String value2) {
954   - addCriterion("reduce_type_title not between", value1, value2, "reduceTypeTitle");
955   - return (Criteria) this;
956   - }
957   -
958 678 public Criteria andExpenseIsNull() {
959 679 addCriterion("expense is null");
960 680 return (Criteria) this;
... ... @@ -1015,76 +735,6 @@ public class CasementExample {
1015 735 return (Criteria) this;
1016 736 }
1017 737  
1018   - public Criteria andOrderStatusIsNull() {
1019   - addCriterion("order_status is null");
1020   - return (Criteria) this;
1021   - }
1022   -
1023   - public Criteria andOrderStatusIsNotNull() {
1024   - addCriterion("order_status is not null");
1025   - return (Criteria) this;
1026   - }
1027   -
1028   - public Criteria andOrderStatusEqualTo(String value) {
1029   - addCriterion("order_status =", value, "orderStatus");
1030   - return (Criteria) this;
1031   - }
1032   -
1033   - public Criteria andOrderStatusNotEqualTo(String value) {
1034   - addCriterion("order_status <>", value, "orderStatus");
1035   - return (Criteria) this;
1036   - }
1037   -
1038   - public Criteria andOrderStatusGreaterThan(String value) {
1039   - addCriterion("order_status >", value, "orderStatus");
1040   - return (Criteria) this;
1041   - }
1042   -
1043   - public Criteria andOrderStatusGreaterThanOrEqualTo(String value) {
1044   - addCriterion("order_status >=", value, "orderStatus");
1045   - return (Criteria) this;
1046   - }
1047   -
1048   - public Criteria andOrderStatusLessThan(String value) {
1049   - addCriterion("order_status <", value, "orderStatus");
1050   - return (Criteria) this;
1051   - }
1052   -
1053   - public Criteria andOrderStatusLessThanOrEqualTo(String value) {
1054   - addCriterion("order_status <=", value, "orderStatus");
1055   - return (Criteria) this;
1056   - }
1057   -
1058   - public Criteria andOrderStatusLike(String value) {
1059   - addCriterion("order_status like", value, "orderStatus");
1060   - return (Criteria) this;
1061   - }
1062   -
1063   - public Criteria andOrderStatusNotLike(String value) {
1064   - addCriterion("order_status not like", value, "orderStatus");
1065   - return (Criteria) this;
1066   - }
1067   -
1068   - public Criteria andOrderStatusIn(List<String> values) {
1069   - addCriterion("order_status in", values, "orderStatus");
1070   - return (Criteria) this;
1071   - }
1072   -
1073   - public Criteria andOrderStatusNotIn(List<String> values) {
1074   - addCriterion("order_status not in", values, "orderStatus");
1075   - return (Criteria) this;
1076   - }
1077   -
1078   - public Criteria andOrderStatusBetween(String value1, String value2) {
1079   - addCriterion("order_status between", value1, value2, "orderStatus");
1080   - return (Criteria) this;
1081   - }
1082   -
1083   - public Criteria andOrderStatusNotBetween(String value1, String value2) {
1084   - addCriterion("order_status not between", value1, value2, "orderStatus");
1085   - return (Criteria) this;
1086   - }
1087   -
1088 738 public Criteria andCaseStatusIsNull() {
1089 739 addCriterion("case_status is null");
1090 740 return (Criteria) this;
... ...
src/main/java/com/canrd/patent/dal/model/Order.java
  View file @6a13fa7
... ... @@ -53,11 +53,43 @@ public class Order {
53 53  
54 54 /**
55 55 * This field was generated by MyBatis Generator.
56   - * This field corresponds to the database column orders.isCanceled
  56 + * This field corresponds to the database column orders.address
57 57 *
58 58 * @mbggenerated
59 59 */
60   - private Boolean iscanceled;
  60 + private String address;
  61 +
  62 + /**
  63 + * This field was generated by MyBatis Generator.
  64 + * This field corresponds to the database column orders.phone
  65 + *
  66 + * @mbggenerated
  67 + */
  68 + private String phone;
  69 +
  70 + /**
  71 + * This field was generated by MyBatis Generator.
  72 + * This field corresponds to the database column orders.in_name
  73 + *
  74 + * @mbggenerated
  75 + */
  76 + private String inName;
  77 +
  78 + /**
  79 + * This field was generated by MyBatis Generator.
  80 + * This field corresponds to the database column orders.invoice
  81 + *
  82 + * @mbggenerated
  83 + */
  84 + private String invoice;
  85 +
  86 + /**
  87 + * This field was generated by MyBatis Generator.
  88 + * This field corresponds to the database column orders.is_canceled
  89 + *
  90 + * @mbggenerated
  91 + */
  92 + private Boolean isCanceled;
61 93  
62 94 /**
63 95 * This field was generated by MyBatis Generator.
... ... @@ -229,26 +261,122 @@ public class Order {
229 261  
230 262 /**
231 263 * This method was generated by MyBatis Generator.
232   - * This method returns the value of the database column orders.isCanceled
  264 + * This method returns the value of the database column orders.address
  265 + *
  266 + * @return the value of orders.address
  267 + *
  268 + * @mbggenerated
  269 + */
  270 + public String getAddress() {
  271 + return address;
  272 + }
  273 +
  274 + /**
  275 + * This method was generated by MyBatis Generator.
  276 + * This method sets the value of the database column orders.address
  277 + *
  278 + * @param address the value for orders.address
  279 + *
  280 + * @mbggenerated
  281 + */
  282 + public void setAddress(String address) {
  283 + this.address = address == null ? null : address.trim();
  284 + }
  285 +
  286 + /**
  287 + * This method was generated by MyBatis Generator.
  288 + * This method returns the value of the database column orders.phone
  289 + *
  290 + * @return the value of orders.phone
  291 + *
  292 + * @mbggenerated
  293 + */
  294 + public String getPhone() {
  295 + return phone;
  296 + }
  297 +
  298 + /**
  299 + * This method was generated by MyBatis Generator.
  300 + * This method sets the value of the database column orders.phone
  301 + *
  302 + * @param phone the value for orders.phone
  303 + *
  304 + * @mbggenerated
  305 + */
  306 + public void setPhone(String phone) {
  307 + this.phone = phone == null ? null : phone.trim();
  308 + }
  309 +
  310 + /**
  311 + * This method was generated by MyBatis Generator.
  312 + * This method returns the value of the database column orders.in_name
  313 + *
  314 + * @return the value of orders.in_name
  315 + *
  316 + * @mbggenerated
  317 + */
  318 + public String getInName() {
  319 + return inName;
  320 + }
  321 +
  322 + /**
  323 + * This method was generated by MyBatis Generator.
  324 + * This method sets the value of the database column orders.in_name
  325 + *
  326 + * @param inName the value for orders.in_name
  327 + *
  328 + * @mbggenerated
  329 + */
  330 + public void setInName(String inName) {
  331 + this.inName = inName == null ? null : inName.trim();
  332 + }
  333 +
  334 + /**
  335 + * This method was generated by MyBatis Generator.
  336 + * This method returns the value of the database column orders.invoice
  337 + *
  338 + * @return the value of orders.invoice
  339 + *
  340 + * @mbggenerated
  341 + */
  342 + public String getInvoice() {
  343 + return invoice;
  344 + }
  345 +
  346 + /**
  347 + * This method was generated by MyBatis Generator.
  348 + * This method sets the value of the database column orders.invoice
  349 + *
  350 + * @param invoice the value for orders.invoice
  351 + *
  352 + * @mbggenerated
  353 + */
  354 + public void setInvoice(String invoice) {
  355 + this.invoice = invoice == null ? null : invoice.trim();
  356 + }
  357 +
  358 + /**
  359 + * This method was generated by MyBatis Generator.
  360 + * This method returns the value of the database column orders.is_canceled
233 361 *
234   - * @return the value of orders.isCanceled
  362 + * @return the value of orders.is_canceled
235 363 *
236 364 * @mbggenerated
237 365 */
238   - public Boolean getIscanceled() {
239   - return iscanceled;
  366 + public Boolean getIsCanceled() {
  367 + return isCanceled;
240 368 }
241 369  
242 370 /**
243 371 * This method was generated by MyBatis Generator.
244   - * This method sets the value of the database column orders.isCanceled
  372 + * This method sets the value of the database column orders.is_canceled
245 373 *
246   - * @param iscanceled the value for orders.isCanceled
  374 + * @param isCanceled the value for orders.is_canceled
247 375 *
248 376 * @mbggenerated
249 377 */
250   - public void setIscanceled(Boolean iscanceled) {
251   - this.iscanceled = iscanceled;
  378 + public void setIsCanceled(Boolean isCanceled) {
  379 + this.isCanceled = isCanceled;
252 380 }
253 381  
254 382 /**
... ...
src/main/java/com/canrd/patent/dal/model/OrderExample.java
  View file @6a13fa7
... ... @@ -575,63 +575,343 @@ public class OrderExample {
575 575 return (Criteria) this;
576 576 }
577 577  
578   - public Criteria andIscanceledIsNull() {
579   - addCriterion("isCanceled is null");
  578 + public Criteria andAddressIsNull() {
  579 + addCriterion("address is null");
580 580 return (Criteria) this;
581 581 }
582 582  
583   - public Criteria andIscanceledIsNotNull() {
584   - addCriterion("isCanceled is not null");
  583 + public Criteria andAddressIsNotNull() {
  584 + addCriterion("address is not null");
585 585 return (Criteria) this;
586 586 }
587 587  
588   - public Criteria andIscanceledEqualTo(Boolean value) {
589   - addCriterion("isCanceled =", value, "iscanceled");
  588 + public Criteria andAddressEqualTo(String value) {
  589 + addCriterion("address =", value, "address");
590 590 return (Criteria) this;
591 591 }
592 592  
593   - public Criteria andIscanceledNotEqualTo(Boolean value) {
594   - addCriterion("isCanceled <>", value, "iscanceled");
  593 + public Criteria andAddressNotEqualTo(String value) {
  594 + addCriterion("address <>", value, "address");
595 595 return (Criteria) this;
596 596 }
597 597  
598   - public Criteria andIscanceledGreaterThan(Boolean value) {
599   - addCriterion("isCanceled >", value, "iscanceled");
  598 + public Criteria andAddressGreaterThan(String value) {
  599 + addCriterion("address >", value, "address");
600 600 return (Criteria) this;
601 601 }
602 602  
603   - public Criteria andIscanceledGreaterThanOrEqualTo(Boolean value) {
604   - addCriterion("isCanceled >=", value, "iscanceled");
  603 + public Criteria andAddressGreaterThanOrEqualTo(String value) {
  604 + addCriterion("address >=", value, "address");
605 605 return (Criteria) this;
606 606 }
607 607  
608   - public Criteria andIscanceledLessThan(Boolean value) {
609   - addCriterion("isCanceled <", value, "iscanceled");
  608 + public Criteria andAddressLessThan(String value) {
  609 + addCriterion("address <", value, "address");
610 610 return (Criteria) this;
611 611 }
612 612  
613   - public Criteria andIscanceledLessThanOrEqualTo(Boolean value) {
614   - addCriterion("isCanceled <=", value, "iscanceled");
  613 + public Criteria andAddressLessThanOrEqualTo(String value) {
  614 + addCriterion("address <=", value, "address");
615 615 return (Criteria) this;
616 616 }
617 617  
618   - public Criteria andIscanceledIn(List<Boolean> values) {
619   - addCriterion("isCanceled in", values, "iscanceled");
  618 + public Criteria andAddressLike(String value) {
  619 + addCriterion("address like", value, "address");
620 620 return (Criteria) this;
621 621 }
622 622  
623   - public Criteria andIscanceledNotIn(List<Boolean> values) {
624   - addCriterion("isCanceled not in", values, "iscanceled");
  623 + public Criteria andAddressNotLike(String value) {
  624 + addCriterion("address not like", value, "address");
625 625 return (Criteria) this;
626 626 }
627 627  
628   - public Criteria andIscanceledBetween(Boolean value1, Boolean value2) {
629   - addCriterion("isCanceled between", value1, value2, "iscanceled");
  628 + public Criteria andAddressIn(List<String> values) {
  629 + addCriterion("address in", values, "address");
630 630 return (Criteria) this;
631 631 }
632 632  
633   - public Criteria andIscanceledNotBetween(Boolean value1, Boolean value2) {
634   - addCriterion("isCanceled not between", value1, value2, "iscanceled");
  633 + public Criteria andAddressNotIn(List<String> values) {
  634 + addCriterion("address not in", values, "address");
  635 + return (Criteria) this;
  636 + }
  637 +
  638 + public Criteria andAddressBetween(String value1, String value2) {
  639 + addCriterion("address between", value1, value2, "address");
  640 + return (Criteria) this;
  641 + }
  642 +
  643 + public Criteria andAddressNotBetween(String value1, String value2) {
  644 + addCriterion("address not between", value1, value2, "address");
  645 + return (Criteria) this;
  646 + }
  647 +
  648 + public Criteria andPhoneIsNull() {
  649 + addCriterion("phone is null");
  650 + return (Criteria) this;
  651 + }
  652 +
  653 + public Criteria andPhoneIsNotNull() {
  654 + addCriterion("phone is not null");
  655 + return (Criteria) this;
  656 + }
  657 +
  658 + public Criteria andPhoneEqualTo(String value) {
  659 + addCriterion("phone =", value, "phone");
  660 + return (Criteria) this;
  661 + }
  662 +
  663 + public Criteria andPhoneNotEqualTo(String value) {
  664 + addCriterion("phone <>", value, "phone");
  665 + return (Criteria) this;
  666 + }
  667 +
  668 + public Criteria andPhoneGreaterThan(String value) {
  669 + addCriterion("phone >", value, "phone");
  670 + return (Criteria) this;
  671 + }
  672 +
  673 + public Criteria andPhoneGreaterThanOrEqualTo(String value) {
  674 + addCriterion("phone >=", value, "phone");
  675 + return (Criteria) this;
  676 + }
  677 +
  678 + public Criteria andPhoneLessThan(String value) {
  679 + addCriterion("phone <", value, "phone");
  680 + return (Criteria) this;
  681 + }
  682 +
  683 + public Criteria andPhoneLessThanOrEqualTo(String value) {
  684 + addCriterion("phone <=", value, "phone");
  685 + return (Criteria) this;
  686 + }
  687 +
  688 + public Criteria andPhoneLike(String value) {
  689 + addCriterion("phone like", value, "phone");
  690 + return (Criteria) this;
  691 + }
  692 +
  693 + public Criteria andPhoneNotLike(String value) {
  694 + addCriterion("phone not like", value, "phone");
  695 + return (Criteria) this;
  696 + }
  697 +
  698 + public Criteria andPhoneIn(List<String> values) {
  699 + addCriterion("phone in", values, "phone");
  700 + return (Criteria) this;
  701 + }
  702 +
  703 + public Criteria andPhoneNotIn(List<String> values) {
  704 + addCriterion("phone not in", values, "phone");
  705 + return (Criteria) this;
  706 + }
  707 +
  708 + public Criteria andPhoneBetween(String value1, String value2) {
  709 + addCriterion("phone between", value1, value2, "phone");
  710 + return (Criteria) this;
  711 + }
  712 +
  713 + public Criteria andPhoneNotBetween(String value1, String value2) {
  714 + addCriterion("phone not between", value1, value2, "phone");
  715 + return (Criteria) this;
  716 + }
  717 +
  718 + public Criteria andInNameIsNull() {
  719 + addCriterion("in_name is null");
  720 + return (Criteria) this;
  721 + }
  722 +
  723 + public Criteria andInNameIsNotNull() {
  724 + addCriterion("in_name is not null");
  725 + return (Criteria) this;
  726 + }
  727 +
  728 + public Criteria andInNameEqualTo(String value) {
  729 + addCriterion("in_name =", value, "inName");
  730 + return (Criteria) this;
  731 + }
  732 +
  733 + public Criteria andInNameNotEqualTo(String value) {
  734 + addCriterion("in_name <>", value, "inName");
  735 + return (Criteria) this;
  736 + }
  737 +
  738 + public Criteria andInNameGreaterThan(String value) {
  739 + addCriterion("in_name >", value, "inName");
  740 + return (Criteria) this;
  741 + }
  742 +
  743 + public Criteria andInNameGreaterThanOrEqualTo(String value) {
  744 + addCriterion("in_name >=", value, "inName");
  745 + return (Criteria) this;
  746 + }
  747 +
  748 + public Criteria andInNameLessThan(String value) {
  749 + addCriterion("in_name <", value, "inName");
  750 + return (Criteria) this;
  751 + }
  752 +
  753 + public Criteria andInNameLessThanOrEqualTo(String value) {
  754 + addCriterion("in_name <=", value, "inName");
  755 + return (Criteria) this;
  756 + }
  757 +
  758 + public Criteria andInNameLike(String value) {
  759 + addCriterion("in_name like", value, "inName");
  760 + return (Criteria) this;
  761 + }
  762 +
  763 + public Criteria andInNameNotLike(String value) {
  764 + addCriterion("in_name not like", value, "inName");
  765 + return (Criteria) this;
  766 + }
  767 +
  768 + public Criteria andInNameIn(List<String> values) {
  769 + addCriterion("in_name in", values, "inName");
  770 + return (Criteria) this;
  771 + }
  772 +
  773 + public Criteria andInNameNotIn(List<String> values) {
  774 + addCriterion("in_name not in", values, "inName");
  775 + return (Criteria) this;
  776 + }
  777 +
  778 + public Criteria andInNameBetween(String value1, String value2) {
  779 + addCriterion("in_name between", value1, value2, "inName");
  780 + return (Criteria) this;
  781 + }
  782 +
  783 + public Criteria andInNameNotBetween(String value1, String value2) {
  784 + addCriterion("in_name not between", value1, value2, "inName");
  785 + return (Criteria) this;
  786 + }
  787 +
  788 + public Criteria andInvoiceIsNull() {
  789 + addCriterion("invoice is null");
  790 + return (Criteria) this;
  791 + }
  792 +
  793 + public Criteria andInvoiceIsNotNull() {
  794 + addCriterion("invoice is not null");
  795 + return (Criteria) this;
  796 + }
  797 +
  798 + public Criteria andInvoiceEqualTo(String value) {
  799 + addCriterion("invoice =", value, "invoice");
  800 + return (Criteria) this;
  801 + }
  802 +
  803 + public Criteria andInvoiceNotEqualTo(String value) {
  804 + addCriterion("invoice <>", value, "invoice");
  805 + return (Criteria) this;
  806 + }
  807 +
  808 + public Criteria andInvoiceGreaterThan(String value) {
  809 + addCriterion("invoice >", value, "invoice");
  810 + return (Criteria) this;
  811 + }
  812 +
  813 + public Criteria andInvoiceGreaterThanOrEqualTo(String value) {
  814 + addCriterion("invoice >=", value, "invoice");
  815 + return (Criteria) this;
  816 + }
  817 +
  818 + public Criteria andInvoiceLessThan(String value) {
  819 + addCriterion("invoice <", value, "invoice");
  820 + return (Criteria) this;
  821 + }
  822 +
  823 + public Criteria andInvoiceLessThanOrEqualTo(String value) {
  824 + addCriterion("invoice <=", value, "invoice");
  825 + return (Criteria) this;
  826 + }
  827 +
  828 + public Criteria andInvoiceLike(String value) {
  829 + addCriterion("invoice like", value, "invoice");
  830 + return (Criteria) this;
  831 + }
  832 +
  833 + public Criteria andInvoiceNotLike(String value) {
  834 + addCriterion("invoice not like", value, "invoice");
  835 + return (Criteria) this;
  836 + }
  837 +
  838 + public Criteria andInvoiceIn(List<String> values) {
  839 + addCriterion("invoice in", values, "invoice");
  840 + return (Criteria) this;
  841 + }
  842 +
  843 + public Criteria andInvoiceNotIn(List<String> values) {
  844 + addCriterion("invoice not in", values, "invoice");
  845 + return (Criteria) this;
  846 + }
  847 +
  848 + public Criteria andInvoiceBetween(String value1, String value2) {
  849 + addCriterion("invoice between", value1, value2, "invoice");
  850 + return (Criteria) this;
  851 + }
  852 +
  853 + public Criteria andInvoiceNotBetween(String value1, String value2) {
  854 + addCriterion("invoice not between", value1, value2, "invoice");
  855 + return (Criteria) this;
  856 + }
  857 +
  858 + public Criteria andIsCanceledIsNull() {
  859 + addCriterion("is_canceled is null");
  860 + return (Criteria) this;
  861 + }
  862 +
  863 + public Criteria andIsCanceledIsNotNull() {
  864 + addCriterion("is_canceled is not null");
  865 + return (Criteria) this;
  866 + }
  867 +
  868 + public Criteria andIsCanceledEqualTo(Boolean value) {
  869 + addCriterion("is_canceled =", value, "isCanceled");
  870 + return (Criteria) this;
  871 + }
  872 +
  873 + public Criteria andIsCanceledNotEqualTo(Boolean value) {
  874 + addCriterion("is_canceled <>", value, "isCanceled");
  875 + return (Criteria) this;
  876 + }
  877 +
  878 + public Criteria andIsCanceledGreaterThan(Boolean value) {
  879 + addCriterion("is_canceled >", value, "isCanceled");
  880 + return (Criteria) this;
  881 + }
  882 +
  883 + public Criteria andIsCanceledGreaterThanOrEqualTo(Boolean value) {
  884 + addCriterion("is_canceled >=", value, "isCanceled");
  885 + return (Criteria) this;
  886 + }
  887 +
  888 + public Criteria andIsCanceledLessThan(Boolean value) {
  889 + addCriterion("is_canceled <", value, "isCanceled");
  890 + return (Criteria) this;
  891 + }
  892 +
  893 + public Criteria andIsCanceledLessThanOrEqualTo(Boolean value) {
  894 + addCriterion("is_canceled <=", value, "isCanceled");
  895 + return (Criteria) this;
  896 + }
  897 +
  898 + public Criteria andIsCanceledIn(List<Boolean> values) {
  899 + addCriterion("is_canceled in", values, "isCanceled");
  900 + return (Criteria) this;
  901 + }
  902 +
  903 + public Criteria andIsCanceledNotIn(List<Boolean> values) {
  904 + addCriterion("is_canceled not in", values, "isCanceled");
  905 + return (Criteria) this;
  906 + }
  907 +
  908 + public Criteria andIsCanceledBetween(Boolean value1, Boolean value2) {
  909 + addCriterion("is_canceled between", value1, value2, "isCanceled");
  910 + return (Criteria) this;
  911 + }
  912 +
  913 + public Criteria andIsCanceledNotBetween(Boolean value1, Boolean value2) {
  914 + addCriterion("is_canceled not between", value1, value2, "isCanceled");
635 915 return (Criteria) this;
636 916 }
637 917  
... ...
src/main/java/com/canrd/patent/service/CaseHandlingService.java
  View file @6a13fa7
... ... @@ -40,16 +40,11 @@ public class CaseHandlingService {
40 40 if(StringUtils.isEmpty(preCasement)) {
41 41 Casement casement = new Casement();
42 42 casement.setCaseType(caseTypeEnum.name());
43   - casement.setCaseTypeTitle(caseTypeEnum.getTitle());
44   - casement.setCasesn(generatorCaseSn());
  43 + casement.setCaseSn(generatorCaseSn());
45 44 casement.setServiceType(serviceTypeEnum.name());
46   - casement.setServiceTypeTitle(serviceTypeEnum.getTitle());
47 45 casement.setPaidType(paidTypeEnum.name());
48   - casement.setPaidTypeTitle(paidTypeEnum.getTitle());
49 46 casement.setReduceType(reduceTypeEnum != null ? reduceTypeEnum.name() : null);
50   - casement.setReduceTypeTitle(reduceTypeEnum != null ? reduceTypeEnum.getTitle() : null);
51 47 casement.setExpense(expense);
52   - casement.setOrderStatus(OrderStatusEnum.SUBMITED.name());
53 48 casement.setCaseStatus(CaseStatusEnum.INIT.name());
54 49 casement.setMemberId(memberId);
55 50 casement.setCreateDate(new Date());
... ... @@ -110,10 +105,10 @@ public class CaseHandlingService {
110 105 caseOutputDto.setId(casement.getId());
111 106 caseOutputDto.setName(casement.getName());
112 107 caseOutputDto.setCaseType(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
113   - caseOutputDto.setCaseSn(casement.getCasesn());
114   - caseOutputDto.setContractNum(casement.getCasesn());
  108 + caseOutputDto.setCaseSn(casement.getCaseSn());
  109 + caseOutputDto.setContractNum(casement.getCaseSn());
115 110 caseOutputDto.setExpense(casement.getExpense()/100);
116   - caseOutputDto.setCreateDate(DateUtils.format(casement.getCreateDate()));
  111 + caseOutputDto.setCreateDate(casement.getCreateDate());
117 112 caseOutputDtoList.add(caseOutputDto);
118 113 }
119 114 return caseOutputDtoList;
... ... @@ -126,10 +121,10 @@ public class CaseHandlingService {
126 121 @Transactional(isolation= Isolation.SERIALIZABLE,propagation = Propagation.REQUIRED,noRollbackFor = RuntimeException.class)
127 122 private String generatorCaseSn(){
128 123 CasementExample casementExample = new CasementExample();
129   - casementExample.setOrderByClause("caseSn desc limit 1");
  124 + casementExample.setOrderByClause("case_sn desc limit 1");
130 125 List<Casement> casementList = casementMapper.selectByExample(casementExample);
131 126 if(!CollectionUtils.isEmpty(casementList)){
132   - String caseSn = casementList.get(0).getCasesn();
  127 + String caseSn = casementList.get(0).getCaseSn();
133 128 int sn = Integer.parseInt(caseSn.substring(2, caseSn.length()));
134 129 return caseSn.substring(0,2)+(sn+1);
135 130 }else {
... ...
src/main/java/com/canrd/patent/service/OrderService.java
  View file @6a13fa7
... ... @@ -19,25 +19,42 @@ public class OrderService {
19 19 OrderMapper orderMapper;
20 20  
21 21 /***
22   - * 保存订单
23   - * @param caseId
24   - * @param quantity
25   - * @param expense
  22 + * 更新订单
  23 + * @param orderId
26 24 * @param adress
27 25 * @param phone
28 26 * @param inName
29 27 * @param invoice
  28 + * @return
  29 + */
  30 + public Order updateOrder(Long orderId,String adress,String phone,String inName,String invoice){
  31 + Order order = findByOrderId(orderId);
  32 + order.setAddress(adress);
  33 + order.setPhone(phone);
  34 + order.setInName(inName);
  35 + order.setInvoice(invoice);
  36 + order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
  37 + order.setUpdateDate(new Date());
  38 + orderMapper.updateByPrimaryKey(order);
  39 + return order;
  40 + }
  41 +
  42 + /***
  43 + * 保存订单
  44 + * @param caseId
  45 + * @param quantity
  46 + * @param expense
30 47 * @param memberId
31 48 * @return
32 49 */
33   - public Order save(Long caseId,Long quantity,Long expense,String adress,String phone,String inName,String invoice,String memberId){
  50 + public Order saveOrder(Long caseId, Long quantity, Long expense, String memberId){
34 51 Order order = new Order();
35 52 order.setCaseId(caseId);
36 53 order.setQuantity(quantity);
37 54 order.setExpense(expense);
38 55 order.setPayType("支付宝");
39   - order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
40   - order.setIscanceled(false);
  56 + order.setOrderStatus(OrderStatusEnum.SUBMITED.name());
  57 + order.setIsCanceled(false);
41 58 order.setMemberId(memberId);
42 59 order.setCreateDate(new Date());
43 60 order.setUpdateDate(new Date());
... ... @@ -78,7 +95,7 @@ public class OrderService {
78 95 OrderExample orderExample = new OrderExample();
79 96 OrderExample.Criteria criteria = orderExample.createCriteria();
80 97 criteria.andMemberIdEqualTo(memberId);
81   - criteria.andIscanceledEqualTo(false);
  98 + criteria.andIsCanceledEqualTo(false);
82 99 return orderMapper.selectByExample(orderExample);
83 100 }
84 101 }
... ...
src/main/java/com/canrd/patent/web/CasementPageController.java
  View file @6a13fa7
... ... @@ -3,13 +3,12 @@ package com.canrd.patent.web;
3 3 import com.canrd.patent.common.utils.DateUtils;
4 4 import com.canrd.patent.common.utils.TextUtils;
5 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;
  6 +import com.canrd.patent.dal.enums.*;
10 7 import com.canrd.patent.dal.model.Casement;
  8 +import com.canrd.patent.dal.model.Order;
11 9 import com.canrd.patent.service.CaseHandlingService;
12 10 import com.canrd.patent.service.CasementService;
  11 +import com.canrd.patent.service.OrderService;
13 12 import org.slf4j.Logger;
14 13 import org.slf4j.LoggerFactory;
15 14 import org.springframework.stereotype.Controller;
... ... @@ -30,6 +29,8 @@ public class CasementPageController {
30 29 private CasementService casementService;
31 30 @Resource
32 31 private CaseHandlingService caseHandlingService;
  32 + @Resource
  33 + private OrderService orderService;
33 34  
34 35 @RequestMapping(value="/submit_case")
35 36 public ModelAndView submitCase(CaseInputDto caseInputDto){
... ... @@ -45,11 +46,15 @@ public class CasementPageController {
45 46 ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null;
46 47 Long expense = Long.parseLong(caseInputDto.getExpense())*100;
47 48 Casement casement = caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,IndexController.MEMBER_ID);
  49 +
  50 + Order order = orderService.saveOrder(casement.getId(), 1l, expense, IndexController.MEMBER_ID);
  51 +
48 52 modelAndView.addObject("caseId", casement.getId());
  53 + modelAndView.addObject("orderId", order.getId());
49 54 modelAndView.addObject("caseType", CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
50 55 modelAndView.addObject("name", casement.getName() == null ? "暂无名称" : casement.getName());
51   - modelAndView.addObject("caseSn", casement.getCasesn());
52   - modelAndView.addObject("contractSn", casement.getCasesn());
  56 + modelAndView.addObject("caseSn", casement.getCaseSn());
  57 + modelAndView.addObject("contractSn", casement.getCaseSn());
53 58 modelAndView.addObject("expense", casement.getExpense()/100);
54 59 modelAndView.addObject("totalExpense", casement.getExpense()/100);
55 60 modelAndView.addObject("createDate", DateUtils.format(casement.getCreateDate()));
... ...
src/main/java/com/canrd/patent/web/OrderPageController.java
  View file @6a13fa7
1 1 package com.canrd.patent.web;
2 2  
  3 +import com.canrd.patent.dal.dto.CaseOutputDto;
3 4 import com.canrd.patent.dal.dto.OrderListOutputDto;
4   -import com.canrd.patent.dal.enums.OrderStatusEnum;
  5 +import com.canrd.patent.dal.dto.OrderOutputDto;
  6 +import com.canrd.patent.dal.enums.*;
5 7 import com.canrd.patent.dal.model.Casement;
6 8 import com.canrd.patent.dal.model.Order;
7 9 import com.canrd.patent.service.CasementService;
... ... @@ -31,12 +33,12 @@ public class OrderPageController {
31 33 * @return
32 34 */
33 35 @RequestMapping(value="/save_order")
34   - public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
  36 + public void pay(Long orderId,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
35 37 //判断是否已经存在同样的订单，如果存在，则提醒用户并且数量+1即可
36   - Order order = orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
  38 + Order order = orderService.updateOrder(orderId, address, phone, inName, invoice);
37 39 //跳转到支付宝
38 40 //暂时直接跳转到支付成功的页面
39   - response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+expense);
  41 + response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+order.getExpense());
40 42 }
41 43  
42 44 @RequestMapping(value="/notify_result")
... ... @@ -69,7 +71,27 @@ public class OrderPageController {
69 71 Assert.notNull(orderId);
70 72 ModelAndView modelAndView = new ModelAndView();
71 73 Order order = orderService.findByOrderId(orderId);
72   - modelAndView.addObject("order",order);
  74 + Casement casement = casementService.findById(order.getCaseId());
  75 + CaseOutputDto caseOutputDto = new CaseOutputDto();
  76 + caseOutputDto.setId(casement.getId());
  77 + caseOutputDto.setName(casement.getName());
  78 + caseOutputDto.setCaseSn(casement.getCaseSn());
  79 + caseOutputDto.setCaseType(casement.getCaseType());
  80 + caseOutputDto.setCaseTypeTitle(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
  81 + caseOutputDto.setServiceType(casement.getServiceType());
  82 + caseOutputDto.setServiceTypeTitle(ServiceTypeEnum.valueOf(casement.getServiceType()).getTitle());
  83 + caseOutputDto.setPaidType(casement.getPaidType());
  84 + caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());
  85 + caseOutputDto.setReduceType(casement.getReduceType());
  86 + caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);
  87 + caseOutputDto.setContractNum(casement.getCaseSn());
  88 + caseOutputDto.setCaseStatus(casement.getCaseStatus());
  89 + caseOutputDto.setMemberId(casement.getMemberId());
  90 + caseOutputDto.setCreateDate(casement.getCreateDate());
  91 + caseOutputDto.setUpdateDate(casement.getUpdateDate());
  92 + OrderOutputDto orderOutputDto = new OrderOutputDto();
  93 + orderOutputDto.setCaseOutputDto(caseOutputDto);
  94 + modelAndView.addObject("order",orderOutputDto);
73 95 modelAndView.setViewName("/order_detail");
74 96 return modelAndView;
75 97 }
... ... @@ -85,7 +107,24 @@ public class OrderPageController {
85 107 for(Order order:orderList){
86 108 OrderListOutputDto orderListOutputDto = new OrderListOutputDto();
87 109 Casement casement = casementService.findById(order.getCaseId());
88   - orderListOutputDto.setCasement(casement);
  110 + CaseOutputDto caseOutputDto = new CaseOutputDto();
  111 + caseOutputDto.setId(casement.getId());
  112 + caseOutputDto.setName(casement.getName());
  113 + caseOutputDto.setCaseSn(casement.getCaseSn());
  114 + caseOutputDto.setCaseType(casement.getCaseType());
  115 + caseOutputDto.setCaseTypeTitle(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
  116 + caseOutputDto.setServiceType(casement.getServiceType());
  117 + caseOutputDto.setServiceTypeTitle(ServiceTypeEnum.valueOf(casement.getServiceType()).getTitle());
  118 + caseOutputDto.setPaidType(casement.getPaidType());
  119 + caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());
  120 + caseOutputDto.setReduceType(casement.getReduceType());
  121 + caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);
  122 + caseOutputDto.setContractNum(casement.getCaseSn());
  123 + caseOutputDto.setCaseStatus(casement.getCaseStatus());
  124 + caseOutputDto.setMemberId(casement.getMemberId());
  125 + caseOutputDto.setCreateDate(casement.getCreateDate());
  126 + caseOutputDto.setUpdateDate(casement.getUpdateDate());
  127 + orderListOutputDto.setCaseOutputDto(caseOutputDto);
89 128 orderListOutputDtoList.add(orderListOutputDto);
90 129 }
91 130 ModelAndView modelAndView = new ModelAndView();
... ...
src/main/resources/mapper/CasementMapper.xml
  View file @6a13fa7
... ... @@ -8,17 +8,12 @@
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11   - <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
  11 + <result column="case_sn" jdbcType="VARCHAR" property="caseSn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
13   - <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
14 13 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
15   - <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
16 14 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
17   - <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
18 15 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
19   - <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
20 16 <result column="expense" jdbcType="BIGINT" property="expense" />
21   - <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
22 17 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
23 18 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
24 19 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
... ... @@ -95,8 +90,7 @@
95 90 WARNING - @mbggenerated
96 91 This element is automatically generated by MyBatis Generator, do not modify.
97 92 -->
98   - id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
99   - paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  93 + id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status,
100 94 member_id, create_date, update_date
101 95 </sql>
102 96 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
... ... @@ -153,18 +147,14 @@
153 147 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
154 148 SELECT LAST_INSERT_ID()
155 149 </selectKey>
156   - insert into casement (name, caseSn, case_type,
157   - case_type_title, service_type, service_type_title,
158   - paid_type, paid_type_title, reduce_type,
159   - reduce_type_title, expense, order_status,
160   - case_status, member_id, create_date,
161   - update_date)
162   - values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
163   - #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
164   - #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
165   - #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
166   - #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
167   - #{updateDate,jdbcType=TIMESTAMP})
  150 + insert into casement (name, case_sn, case_type,
  151 + service_type, paid_type, reduce_type,
  152 + expense, case_status, member_id,
  153 + create_date, update_date)
  154 + values (#{name,jdbcType=VARCHAR}, #{caseSn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
  155 + #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  156 + #{expense,jdbcType=BIGINT}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  157 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
168 158 </insert>
169 159 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
170 160 <!--
... ... @@ -179,39 +169,24 @@
179 169 <if test="name != null">
180 170 name,
181 171 </if>
182   - <if test="casesn != null">
183   - caseSn,
  172 + <if test="caseSn != null">
  173 + case_sn,
184 174 </if>
185 175 <if test="caseType != null">
186 176 case_type,
187 177 </if>
188   - <if test="caseTypeTitle != null">
189   - case_type_title,
190   - </if>
191 178 <if test="serviceType != null">
192 179 service_type,
193 180 </if>
194   - <if test="serviceTypeTitle != null">
195   - service_type_title,
196   - </if>
197 181 <if test="paidType != null">
198 182 paid_type,
199 183 </if>
200   - <if test="paidTypeTitle != null">
201   - paid_type_title,
202   - </if>
203 184 <if test="reduceType != null">
204 185 reduce_type,
205 186 </if>
206   - <if test="reduceTypeTitle != null">
207   - reduce_type_title,
208   - </if>
209 187 <if test="expense != null">
210 188 expense,
211 189 </if>
212   - <if test="orderStatus != null">
213   - order_status,
214   - </if>
215 190 <if test="caseStatus != null">
216 191 case_status,
217 192 </if>
... ... @@ -229,39 +204,24 @@
229 204 <if test="name != null">
230 205 #{name,jdbcType=VARCHAR},
231 206 </if>
232   - <if test="casesn != null">
233   - #{casesn,jdbcType=VARCHAR},
  207 + <if test="caseSn != null">
  208 + #{caseSn,jdbcType=VARCHAR},
234 209 </if>
235 210 <if test="caseType != null">
236 211 #{caseType,jdbcType=VARCHAR},
237 212 </if>
238   - <if test="caseTypeTitle != null">
239   - #{caseTypeTitle,jdbcType=VARCHAR},
240   - </if>
241 213 <if test="serviceType != null">
242 214 #{serviceType,jdbcType=VARCHAR},
243 215 </if>
244   - <if test="serviceTypeTitle != null">
245   - #{serviceTypeTitle,jdbcType=VARCHAR},
246   - </if>
247 216 <if test="paidType != null">
248 217 #{paidType,jdbcType=VARCHAR},
249 218 </if>
250   - <if test="paidTypeTitle != null">
251   - #{paidTypeTitle,jdbcType=VARCHAR},
252   - </if>
253 219 <if test="reduceType != null">
254 220 #{reduceType,jdbcType=VARCHAR},
255 221 </if>
256   - <if test="reduceTypeTitle != null">
257   - #{reduceTypeTitle,jdbcType=VARCHAR},
258   - </if>
259 222 <if test="expense != null">
260 223 #{expense,jdbcType=BIGINT},
261 224 </if>
262   - <if test="orderStatus != null">
263   - #{orderStatus,jdbcType=VARCHAR},
264   - </if>
265 225 <if test="caseStatus != null">
266 226 #{caseStatus,jdbcType=VARCHAR},
267 227 </if>
... ... @@ -299,39 +259,24 @@
299 259 <if test="record.name != null">
300 260 name = #{record.name,jdbcType=VARCHAR},
301 261 </if>
302   - <if test="record.casesn != null">
303   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  262 + <if test="record.caseSn != null">
  263 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
304 264 </if>
305 265 <if test="record.caseType != null">
306 266 case_type = #{record.caseType,jdbcType=VARCHAR},
307 267 </if>
308   - <if test="record.caseTypeTitle != null">
309   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
310   - </if>
311 268 <if test="record.serviceType != null">
312 269 service_type = #{record.serviceType,jdbcType=VARCHAR},
313 270 </if>
314   - <if test="record.serviceTypeTitle != null">
315   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
316   - </if>
317 271 <if test="record.paidType != null">
318 272 paid_type = #{record.paidType,jdbcType=VARCHAR},
319 273 </if>
320   - <if test="record.paidTypeTitle != null">
321   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
322   - </if>
323 274 <if test="record.reduceType != null">
324 275 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
325 276 </if>
326   - <if test="record.reduceTypeTitle != null">
327   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
328   - </if>
329 277 <if test="record.expense != null">
330 278 expense = #{record.expense,jdbcType=BIGINT},
331 279 </if>
332   - <if test="record.orderStatus != null">
333   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
334   - </if>
335 280 <if test="record.caseStatus != null">
336 281 case_status = #{record.caseStatus,jdbcType=VARCHAR},
337 282 </if>
... ... @@ -357,17 +302,12 @@
357 302 update casement
358 303 set id = #{record.id,jdbcType=BIGINT},
359 304 name = #{record.name,jdbcType=VARCHAR},
360   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  305 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
361 306 case_type = #{record.caseType,jdbcType=VARCHAR},
362   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
363 307 service_type = #{record.serviceType,jdbcType=VARCHAR},
364   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
365 308 paid_type = #{record.paidType,jdbcType=VARCHAR},
366   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
367 309 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
368   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
369 310 expense = #{record.expense,jdbcType=BIGINT},
370   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
371 311 case_status = #{record.caseStatus,jdbcType=VARCHAR},
372 312 member_id = #{record.memberId,jdbcType=VARCHAR},
373 313 create_date = #{record.createDate,jdbcType=TIMESTAMP},
... ... @@ -386,39 +326,24 @@
386 326 <if test="name != null">
387 327 name = #{name,jdbcType=VARCHAR},
388 328 </if>
389   - <if test="casesn != null">
390   - caseSn = #{casesn,jdbcType=VARCHAR},
  329 + <if test="caseSn != null">
  330 + case_sn = #{caseSn,jdbcType=VARCHAR},
391 331 </if>
392 332 <if test="caseType != null">
393 333 case_type = #{caseType,jdbcType=VARCHAR},
394 334 </if>
395   - <if test="caseTypeTitle != null">
396   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
397   - </if>
398 335 <if test="serviceType != null">
399 336 service_type = #{serviceType,jdbcType=VARCHAR},
400 337 </if>
401   - <if test="serviceTypeTitle != null">
402   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
403   - </if>
404 338 <if test="paidType != null">
405 339 paid_type = #{paidType,jdbcType=VARCHAR},
406 340 </if>
407   - <if test="paidTypeTitle != null">
408   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
409   - </if>
410 341 <if test="reduceType != null">
411 342 reduce_type = #{reduceType,jdbcType=VARCHAR},
412 343 </if>
413   - <if test="reduceTypeTitle != null">
414   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
415   - </if>
416 344 <if test="expense != null">
417 345 expense = #{expense,jdbcType=BIGINT},
418 346 </if>
419   - <if test="orderStatus != null">
420   - order_status = #{orderStatus,jdbcType=VARCHAR},
421   - </if>
422 347 <if test="caseStatus != null">
423 348 case_status = #{caseStatus,jdbcType=VARCHAR},
424 349 </if>
... ... @@ -441,17 +366,12 @@
441 366 -->
442 367 update casement
443 368 set name = #{name,jdbcType=VARCHAR},
444   - caseSn = #{casesn,jdbcType=VARCHAR},
  369 + case_sn = #{caseSn,jdbcType=VARCHAR},
445 370 case_type = #{caseType,jdbcType=VARCHAR},
446   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
447 371 service_type = #{serviceType,jdbcType=VARCHAR},
448   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
449 372 paid_type = #{paidType,jdbcType=VARCHAR},
450   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
451 373 reduce_type = #{reduceType,jdbcType=VARCHAR},
452   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
453 374 expense = #{expense,jdbcType=BIGINT},
454   - order_status = #{orderStatus,jdbcType=VARCHAR},
455 375 case_status = #{caseStatus,jdbcType=VARCHAR},
456 376 member_id = #{memberId,jdbcType=VARCHAR},
457 377 create_date = #{createDate,jdbcType=TIMESTAMP},
... ...
src/main/resources/mapper/OrderMapper.xml
  View file @6a13fa7
... ... @@ -12,7 +12,11 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
15   - <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
  15 + <result column="address" jdbcType="VARCHAR" property="address" />
  16 + <result column="phone" jdbcType="VARCHAR" property="phone" />
  17 + <result column="in_name" jdbcType="VARCHAR" property="inName" />
  18 + <result column="invoice" jdbcType="VARCHAR" property="invoice" />
  19 + <result column="is_canceled" jdbcType="BIT" property="isCanceled" />
16 20 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
17 21 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
18 22 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -88,8 +92,8 @@
88 92 WARNING - @mbggenerated
89 93 This element is automatically generated by MyBatis Generator, do not modify.
90 94 -->
91   - id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
92   - update_date
  95 + id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name,
  96 + invoice, is_canceled, member_id, create_date, update_date
93 97 </sql>
94 98 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
95 99 <!--
... ... @@ -146,13 +150,15 @@
146 150 SELECT LAST_INSERT_ID()
147 151 </selectKey>
148 152 insert into orders (case_id, quantity, expense,
149   - pay_type, order_status, isCanceled,
150   - member_id, create_date, update_date
151   - )
  153 + pay_type, order_status, address,
  154 + phone, in_name, invoice,
  155 + is_canceled, member_id, create_date,
  156 + update_date)
152 157 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
153   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
154   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
155   - )
  158 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
  159 + #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,jdbcType=VARCHAR},
  160 + #{isCanceled,jdbcType=BIT}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  161 + #{updateDate,jdbcType=TIMESTAMP})
156 162 </insert>
157 163 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
158 164 <!--
... ... @@ -179,8 +185,20 @@
179 185 <if test="orderStatus != null">
180 186 order_status,
181 187 </if>
182   - <if test="iscanceled != null">
183   - isCanceled,
  188 + <if test="address != null">
  189 + address,
  190 + </if>
  191 + <if test="phone != null">
  192 + phone,
  193 + </if>
  194 + <if test="inName != null">
  195 + in_name,
  196 + </if>
  197 + <if test="invoice != null">
  198 + invoice,
  199 + </if>
  200 + <if test="isCanceled != null">
  201 + is_canceled,
184 202 </if>
185 203 <if test="memberId != null">
186 204 member_id,
... ... @@ -208,8 +226,20 @@
208 226 <if test="orderStatus != null">
209 227 #{orderStatus,jdbcType=VARCHAR},
210 228 </if>
211   - <if test="iscanceled != null">
212   - #{iscanceled,jdbcType=BIT},
  229 + <if test="address != null">
  230 + #{address,jdbcType=VARCHAR},
  231 + </if>
  232 + <if test="phone != null">
  233 + #{phone,jdbcType=VARCHAR},
  234 + </if>
  235 + <if test="inName != null">
  236 + #{inName,jdbcType=VARCHAR},
  237 + </if>
  238 + <if test="invoice != null">
  239 + #{invoice,jdbcType=VARCHAR},
  240 + </if>
  241 + <if test="isCanceled != null">
  242 + #{isCanceled,jdbcType=BIT},
213 243 </if>
214 244 <if test="memberId != null">
215 245 #{memberId,jdbcType=VARCHAR},
... ... @@ -257,8 +287,20 @@
257 287 <if test="record.orderStatus != null">
258 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
259 289 </if>
260   - <if test="record.iscanceled != null">
261   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  290 + <if test="record.address != null">
  291 + address = #{record.address,jdbcType=VARCHAR},
  292 + </if>
  293 + <if test="record.phone != null">
  294 + phone = #{record.phone,jdbcType=VARCHAR},
  295 + </if>
  296 + <if test="record.inName != null">
  297 + in_name = #{record.inName,jdbcType=VARCHAR},
  298 + </if>
  299 + <if test="record.invoice != null">
  300 + invoice = #{record.invoice,jdbcType=VARCHAR},
  301 + </if>
  302 + <if test="record.isCanceled != null">
  303 + is_canceled = #{record.isCanceled,jdbcType=BIT},
262 304 </if>
263 305 <if test="record.memberId != null">
264 306 member_id = #{record.memberId,jdbcType=VARCHAR},
... ... @@ -286,7 +328,11 @@
286 328 expense = #{record.expense,jdbcType=BIGINT},
287 329 pay_type = #{record.payType,jdbcType=VARCHAR},
288 330 order_status = #{record.orderStatus,jdbcType=VARCHAR},
289   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  331 + address = #{record.address,jdbcType=VARCHAR},
  332 + phone = #{record.phone,jdbcType=VARCHAR},
  333 + in_name = #{record.inName,jdbcType=VARCHAR},
  334 + invoice = #{record.invoice,jdbcType=VARCHAR},
  335 + is_canceled = #{record.isCanceled,jdbcType=BIT},
290 336 member_id = #{record.memberId,jdbcType=VARCHAR},
291 337 create_date = #{record.createDate,jdbcType=TIMESTAMP},
292 338 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -316,8 +362,20 @@
316 362 <if test="orderStatus != null">
317 363 order_status = #{orderStatus,jdbcType=VARCHAR},
318 364 </if>
319   - <if test="iscanceled != null">
320   - isCanceled = #{iscanceled,jdbcType=BIT},
  365 + <if test="address != null">
  366 + address = #{address,jdbcType=VARCHAR},
  367 + </if>
  368 + <if test="phone != null">
  369 + phone = #{phone,jdbcType=VARCHAR},
  370 + </if>
  371 + <if test="inName != null">
  372 + in_name = #{inName,jdbcType=VARCHAR},
  373 + </if>
  374 + <if test="invoice != null">
  375 + invoice = #{invoice,jdbcType=VARCHAR},
  376 + </if>
  377 + <if test="isCanceled != null">
  378 + is_canceled = #{isCanceled,jdbcType=BIT},
321 379 </if>
322 380 <if test="memberId != null">
323 381 member_id = #{memberId,jdbcType=VARCHAR},
... ... @@ -342,7 +400,11 @@
342 400 expense = #{expense,jdbcType=BIGINT},
343 401 pay_type = #{payType,jdbcType=VARCHAR},
344 402 order_status = #{orderStatus,jdbcType=VARCHAR},
345   - isCanceled = #{iscanceled,jdbcType=BIT},
  403 + address = #{address,jdbcType=VARCHAR},
  404 + phone = #{phone,jdbcType=VARCHAR},
  405 + in_name = #{inName,jdbcType=VARCHAR},
  406 + invoice = #{invoice,jdbcType=VARCHAR},
  407 + is_canceled = #{isCanceled,jdbcType=BIT},
346 408 member_id = #{memberId,jdbcType=VARCHAR},
347 409 create_date = #{createDate,jdbcType=TIMESTAMP},
348 410 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
src/main/webapp/case_manage.jsp
  View file @6a13fa7
... ... @@ -89,11 +89,11 @@
89 89 <c:forEach items="${orderListOutputDtoList}" var="order">
90 90 <tr>
91 91 <td class="td-width-210">
92   - <div class="case-type"><span>案件类型：</span><span>${order.casement.caseTypeTile}</span></div>
  92 + <div class="case-type"><span>案件类型：</span><span>${order.caseOutputDto.caseTypeTitle}</span></div>
93 93 <div><span>
94 94 <c:choose>
95   - <c:when test="${order.casement.name!=null}">
96   - ${order.casement.name}
  95 + <c:when test="${order.caseOutputDto.name!=null}">
  96 + ${order.caseOutputDto.name}
97 97 </c:when>
98 98 <c:otherwise>
99 99 暂无名称
... ... @@ -102,14 +102,14 @@
102 102 </span></div>
103 103 </td>
104 104 <td class="td-width-120">
105   - ${order.casement.caseSn}
  105 + ${order.caseOutputDto.caseSn}
106 106 </td>
107 107 <td class="td-width-120">
108 108 <div>
109   - <span>${order.casement.serviceTypeTile}</span>
  109 + <span>${order.caseOutputDto.serviceTypeTitle}</span>
110 110 </div>
111 111 <div>
112   - <span>${order.casement.paidTypeTile}</span>
  112 + <span>${order.caseOutputDto.paidTypeTitle}</span>
113 113 </div>
114 114 </td>
115 115 <td class="td-width-120">
... ... @@ -125,7 +125,7 @@
125 125 </td>
126 126 <td class="td-width-120">
127 127 <div>
128   - <span>未支付</span>
  128 + <span>${order.caseOutputDto.caseStatusTitle}</span>
129 129 </div>
130 130 <div>
131 131 <a href="javascript:" class="color-ff6642">未支付</a>
... ... @@ -137,104 +137,12 @@
137 137 </tr>
138 138 <tr class="case-list-item-bottom-tr">
139 139 <td colspan="6">
140   - <span>合同号：<span>466686664696562</span></span>
141   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
  140 + <span>合同号：<span>${order.caseOutputDto.contractNum}</span></span>
  141 + <span>立案时间：<span>${order.caseOutputDto.createDate}</span></span>
142 142 <span class="color-ff6642 delete-btn">删除</span>
143 143 </td>
144 144 </tr>
145 145 </c:forEach>
146   - <tr>
147   - <td class="td-width-210">
148   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
149   - <div><span>暂无名称</span></div>
150   - </td>
151   - <td class="td-width-120">
152   - GG1603754CA
153   - </td>
154   - <td class="td-width-120">
155   - <div>
156   - <span>标准服务</span>
157   - </div>
158   - <div>
159   - <span>官费暂不缴纳</span>
160   - </div>
161   - </td>
162   - <td class="td-width-120">
163   - <div>
164   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
165   - </div>
166   - <div>
167   - <a href="javascript:" class="color-ff6642">取消案件</a>
168   - </div>
169   - </td>
170   - <td class="td-width-120">
171   - <span>3800</span>
172   - </td>
173   - <td class="td-width-120">
174   - <div>
175   - <span>未支付</span>
176   - </div>
177   - <div>
178   - <a href="javascript:" class="color-ff6642">未支付</a>
179   - </div>
180   - <div>
181   - <a href="javascript:">订单详情</a>
182   - </div>
183   - </td>
184   - </tr>
185   - <tr class="case-list-item-bottom-tr">
186   - <td colspan="6">
187   - <span>合同号：<span>466686664696562</span></span>
188   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
189   - <span class="color-ff6642 delete-btn">删除</span>
190   - </td>
191   - </tr>
192   - <tr>
193   - <td class="td-width-210">
194   - <div class="case-type"><span>案件类型：</span><span>发明专利</span></div>
195   - <div><span>暂无名称</span></div>
196   - </td>
197   - <td class="td-width-120">
198   - GG1603754CA
199   - </td>
200   - <td class="td-width-120">
201   - <div>
202   - <span>标准服务</span>
203   - </div>
204   - <div>
205   - <span>官费暂不缴纳</span>
206   - </div>
207   - </td>
208   - <td class="td-width-120">
209   - <div>
210   - <a href="case-detail.jsp" class="color-ff6642">案件详情</a>
211   - </div>
212   - <div>
213   - <a href="javascript:" class="color-ff6642">取消案件</a>
214   - </div>
215   - </td>
216   - <td class="td-width-120">
217   - <span>3800</span>
218   - </td>
219   - <td class="td-width-120">
220   - <div>
221   - <span>未支付</span>
222   - </div>
223   - <div>
224   - <a href="javascript:" class="color-ff6642">未支付</a>
225   - </div>
226   - <div>
227   - <a href="javascript:">订单详情</a>
228   - </div>
229   - </td>
230   - </tr>
231   - <tr class="case-list-item-bottom-tr">
232   - <td colspan="6">
233   - <span>合同号：<span>466686664696562</span></span>
234   - <span>立案时间：<span>2016-05-13 22:40:53</span></span>
235   - <span class="color-ff6642 delete-btn">删除</span>
236   - </td>
237   - </tr>
238 146 </tbody>
239 147 </table>
240 148 </div>
... ...
src/main/webapp/pay.jsp
  View file @6a13fa7
... ... @@ -114,8 +114,7 @@
114 114 <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
115 115 <div>
116 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" />
  117 + <input type="hidden" name="orderId" value="${orderId}" />
119 118 <input type="hidden" name="address" id="pay_address" />
120 119 <input type="hidden" name="phone" id="pay_phone" />
121 120 <input type="hidden" name="inName" id="in_name" />
... ... @@ -161,8 +160,6 @@
161 160 * 提交支付
162 161 */
163 162 function submit_pay(){
164   - var id = $("#case_id").val();
165   - var expense = $("#expense span").text();
166 163 var address = $("#address").val();
167 164 if(address==""){
168 165 alert("地址不能为空");
... ... @@ -187,8 +184,6 @@
187 184 $("#invoice").focus();
188 185 return;
189 186 }
190   - $("#pay_case_id").val(id);
191   - $("#pay_expense").val(expense);
192 187 $("#pay_address").val(address);
193 188 $("#pay_phone").val(phone);
194 189 $("#in_name").val(company==null?person:company);
... ...
target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/Casement.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/Order.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/service/CaseHandlingService.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/service/OrderService.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/web/CasementPageController.class
View file @6a13fa7
No preview for this file type
target/classes/com/canrd/patent/web/OrderPageController.class
View file @6a13fa7
No preview for this file type
target/classes/mapper/CasementMapper.xml
  View file @6a13fa7
... ... @@ -8,17 +8,12 @@
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11   - <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
  11 + <result column="case_sn" jdbcType="VARCHAR" property="caseSn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
13   - <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
14 13 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
15   - <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
16 14 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
17   - <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
18 15 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
19   - <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
20 16 <result column="expense" jdbcType="BIGINT" property="expense" />
21   - <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
22 17 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
23 18 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
24 19 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
... ... @@ -95,8 +90,7 @@
95 90 WARNING - @mbggenerated
96 91 This element is automatically generated by MyBatis Generator, do not modify.
97 92 -->
98   - id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
99   - paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  93 + id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status,
100 94 member_id, create_date, update_date
101 95 </sql>
102 96 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
... ... @@ -153,18 +147,14 @@
153 147 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
154 148 SELECT LAST_INSERT_ID()
155 149 </selectKey>
156   - insert into casement (name, caseSn, case_type,
157   - case_type_title, service_type, service_type_title,
158   - paid_type, paid_type_title, reduce_type,
159   - reduce_type_title, expense, order_status,
160   - case_status, member_id, create_date,
161   - update_date)
162   - values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
163   - #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
164   - #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
165   - #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
166   - #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
167   - #{updateDate,jdbcType=TIMESTAMP})
  150 + insert into casement (name, case_sn, case_type,
  151 + service_type, paid_type, reduce_type,
  152 + expense, case_status, member_id,
  153 + create_date, update_date)
  154 + values (#{name,jdbcType=VARCHAR}, #{caseSn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
  155 + #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  156 + #{expense,jdbcType=BIGINT}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  157 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
168 158 </insert>
169 159 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
170 160 <!--
... ... @@ -179,39 +169,24 @@
179 169 <if test="name != null">
180 170 name,
181 171 </if>
182   - <if test="casesn != null">
183   - caseSn,
  172 + <if test="caseSn != null">
  173 + case_sn,
184 174 </if>
185 175 <if test="caseType != null">
186 176 case_type,
187 177 </if>
188   - <if test="caseTypeTitle != null">
189   - case_type_title,
190   - </if>
191 178 <if test="serviceType != null">
192 179 service_type,
193 180 </if>
194   - <if test="serviceTypeTitle != null">
195   - service_type_title,
196   - </if>
197 181 <if test="paidType != null">
198 182 paid_type,
199 183 </if>
200   - <if test="paidTypeTitle != null">
201   - paid_type_title,
202   - </if>
203 184 <if test="reduceType != null">
204 185 reduce_type,
205 186 </if>
206   - <if test="reduceTypeTitle != null">
207   - reduce_type_title,
208   - </if>
209 187 <if test="expense != null">
210 188 expense,
211 189 </if>
212   - <if test="orderStatus != null">
213   - order_status,
214   - </if>
215 190 <if test="caseStatus != null">
216 191 case_status,
217 192 </if>
... ... @@ -229,39 +204,24 @@
229 204 <if test="name != null">
230 205 #{name,jdbcType=VARCHAR},
231 206 </if>
232   - <if test="casesn != null">
233   - #{casesn,jdbcType=VARCHAR},
  207 + <if test="caseSn != null">
  208 + #{caseSn,jdbcType=VARCHAR},
234 209 </if>
235 210 <if test="caseType != null">
236 211 #{caseType,jdbcType=VARCHAR},
237 212 </if>
238   - <if test="caseTypeTitle != null">
239   - #{caseTypeTitle,jdbcType=VARCHAR},
240   - </if>
241 213 <if test="serviceType != null">
242 214 #{serviceType,jdbcType=VARCHAR},
243 215 </if>
244   - <if test="serviceTypeTitle != null">
245   - #{serviceTypeTitle,jdbcType=VARCHAR},
246   - </if>
247 216 <if test="paidType != null">
248 217 #{paidType,jdbcType=VARCHAR},
249 218 </if>
250   - <if test="paidTypeTitle != null">
251   - #{paidTypeTitle,jdbcType=VARCHAR},
252   - </if>
253 219 <if test="reduceType != null">
254 220 #{reduceType,jdbcType=VARCHAR},
255 221 </if>
256   - <if test="reduceTypeTitle != null">
257   - #{reduceTypeTitle,jdbcType=VARCHAR},
258   - </if>
259 222 <if test="expense != null">
260 223 #{expense,jdbcType=BIGINT},
261 224 </if>
262   - <if test="orderStatus != null">
263   - #{orderStatus,jdbcType=VARCHAR},
264   - </if>
265 225 <if test="caseStatus != null">
266 226 #{caseStatus,jdbcType=VARCHAR},
267 227 </if>
... ... @@ -299,39 +259,24 @@
299 259 <if test="record.name != null">
300 260 name = #{record.name,jdbcType=VARCHAR},
301 261 </if>
302   - <if test="record.casesn != null">
303   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  262 + <if test="record.caseSn != null">
  263 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
304 264 </if>
305 265 <if test="record.caseType != null">
306 266 case_type = #{record.caseType,jdbcType=VARCHAR},
307 267 </if>
308   - <if test="record.caseTypeTitle != null">
309   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
310   - </if>
311 268 <if test="record.serviceType != null">
312 269 service_type = #{record.serviceType,jdbcType=VARCHAR},
313 270 </if>
314   - <if test="record.serviceTypeTitle != null">
315   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
316   - </if>
317 271 <if test="record.paidType != null">
318 272 paid_type = #{record.paidType,jdbcType=VARCHAR},
319 273 </if>
320   - <if test="record.paidTypeTitle != null">
321   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
322   - </if>
323 274 <if test="record.reduceType != null">
324 275 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
325 276 </if>
326   - <if test="record.reduceTypeTitle != null">
327   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
328   - </if>
329 277 <if test="record.expense != null">
330 278 expense = #{record.expense,jdbcType=BIGINT},
331 279 </if>
332   - <if test="record.orderStatus != null">
333   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
334   - </if>
335 280 <if test="record.caseStatus != null">
336 281 case_status = #{record.caseStatus,jdbcType=VARCHAR},
337 282 </if>
... ... @@ -357,17 +302,12 @@
357 302 update casement
358 303 set id = #{record.id,jdbcType=BIGINT},
359 304 name = #{record.name,jdbcType=VARCHAR},
360   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  305 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
361 306 case_type = #{record.caseType,jdbcType=VARCHAR},
362   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
363 307 service_type = #{record.serviceType,jdbcType=VARCHAR},
364   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
365 308 paid_type = #{record.paidType,jdbcType=VARCHAR},
366   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
367 309 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
368   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
369 310 expense = #{record.expense,jdbcType=BIGINT},
370   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
371 311 case_status = #{record.caseStatus,jdbcType=VARCHAR},
372 312 member_id = #{record.memberId,jdbcType=VARCHAR},
373 313 create_date = #{record.createDate,jdbcType=TIMESTAMP},
... ... @@ -386,39 +326,24 @@
386 326 <if test="name != null">
387 327 name = #{name,jdbcType=VARCHAR},
388 328 </if>
389   - <if test="casesn != null">
390   - caseSn = #{casesn,jdbcType=VARCHAR},
  329 + <if test="caseSn != null">
  330 + case_sn = #{caseSn,jdbcType=VARCHAR},
391 331 </if>
392 332 <if test="caseType != null">
393 333 case_type = #{caseType,jdbcType=VARCHAR},
394 334 </if>
395   - <if test="caseTypeTitle != null">
396   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
397   - </if>
398 335 <if test="serviceType != null">
399 336 service_type = #{serviceType,jdbcType=VARCHAR},
400 337 </if>
401   - <if test="serviceTypeTitle != null">
402   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
403   - </if>
404 338 <if test="paidType != null">
405 339 paid_type = #{paidType,jdbcType=VARCHAR},
406 340 </if>
407   - <if test="paidTypeTitle != null">
408   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
409   - </if>
410 341 <if test="reduceType != null">
411 342 reduce_type = #{reduceType,jdbcType=VARCHAR},
412 343 </if>
413   - <if test="reduceTypeTitle != null">
414   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
415   - </if>
416 344 <if test="expense != null">
417 345 expense = #{expense,jdbcType=BIGINT},
418 346 </if>
419   - <if test="orderStatus != null">
420   - order_status = #{orderStatus,jdbcType=VARCHAR},
421   - </if>
422 347 <if test="caseStatus != null">
423 348 case_status = #{caseStatus,jdbcType=VARCHAR},
424 349 </if>
... ... @@ -441,17 +366,12 @@
441 366 -->
442 367 update casement
443 368 set name = #{name,jdbcType=VARCHAR},
444   - caseSn = #{casesn,jdbcType=VARCHAR},
  369 + case_sn = #{caseSn,jdbcType=VARCHAR},
445 370 case_type = #{caseType,jdbcType=VARCHAR},
446   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
447 371 service_type = #{serviceType,jdbcType=VARCHAR},
448   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
449 372 paid_type = #{paidType,jdbcType=VARCHAR},
450   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
451 373 reduce_type = #{reduceType,jdbcType=VARCHAR},
452   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
453 374 expense = #{expense,jdbcType=BIGINT},
454   - order_status = #{orderStatus,jdbcType=VARCHAR},
455 375 case_status = #{caseStatus,jdbcType=VARCHAR},
456 376 member_id = #{memberId,jdbcType=VARCHAR},
457 377 create_date = #{createDate,jdbcType=TIMESTAMP},
... ...
target/classes/mapper/OrderMapper.xml
  View file @6a13fa7
... ... @@ -12,7 +12,11 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
15   - <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
  15 + <result column="address" jdbcType="VARCHAR" property="address" />
  16 + <result column="phone" jdbcType="VARCHAR" property="phone" />
  17 + <result column="in_name" jdbcType="VARCHAR" property="inName" />
  18 + <result column="invoice" jdbcType="VARCHAR" property="invoice" />
  19 + <result column="is_canceled" jdbcType="BIT" property="isCanceled" />
16 20 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
17 21 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
18 22 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -88,8 +92,8 @@
88 92 WARNING - @mbggenerated
89 93 This element is automatically generated by MyBatis Generator, do not modify.
90 94 -->
91   - id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
92   - update_date
  95 + id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name,
  96 + invoice, is_canceled, member_id, create_date, update_date
93 97 </sql>
94 98 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
95 99 <!--
... ... @@ -146,13 +150,15 @@
146 150 SELECT LAST_INSERT_ID()
147 151 </selectKey>
148 152 insert into orders (case_id, quantity, expense,
149   - pay_type, order_status, isCanceled,
150   - member_id, create_date, update_date
151   - )
  153 + pay_type, order_status, address,
  154 + phone, in_name, invoice,
  155 + is_canceled, member_id, create_date,
  156 + update_date)
152 157 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
153   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
154   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
155   - )
  158 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
  159 + #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,jdbcType=VARCHAR},
  160 + #{isCanceled,jdbcType=BIT}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  161 + #{updateDate,jdbcType=TIMESTAMP})
156 162 </insert>
157 163 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
158 164 <!--
... ... @@ -179,8 +185,20 @@
179 185 <if test="orderStatus != null">
180 186 order_status,
181 187 </if>
182   - <if test="iscanceled != null">
183   - isCanceled,
  188 + <if test="address != null">
  189 + address,
  190 + </if>
  191 + <if test="phone != null">
  192 + phone,
  193 + </if>
  194 + <if test="inName != null">
  195 + in_name,
  196 + </if>
  197 + <if test="invoice != null">
  198 + invoice,
  199 + </if>
  200 + <if test="isCanceled != null">
  201 + is_canceled,
184 202 </if>
185 203 <if test="memberId != null">
186 204 member_id,
... ... @@ -208,8 +226,20 @@
208 226 <if test="orderStatus != null">
209 227 #{orderStatus,jdbcType=VARCHAR},
210 228 </if>
211   - <if test="iscanceled != null">
212   - #{iscanceled,jdbcType=BIT},
  229 + <if test="address != null">
  230 + #{address,jdbcType=VARCHAR},
  231 + </if>
  232 + <if test="phone != null">
  233 + #{phone,jdbcType=VARCHAR},
  234 + </if>
  235 + <if test="inName != null">
  236 + #{inName,jdbcType=VARCHAR},
  237 + </if>
  238 + <if test="invoice != null">
  239 + #{invoice,jdbcType=VARCHAR},
  240 + </if>
  241 + <if test="isCanceled != null">
  242 + #{isCanceled,jdbcType=BIT},
213 243 </if>
214 244 <if test="memberId != null">
215 245 #{memberId,jdbcType=VARCHAR},
... ... @@ -257,8 +287,20 @@
257 287 <if test="record.orderStatus != null">
258 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
259 289 </if>
260   - <if test="record.iscanceled != null">
261   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  290 + <if test="record.address != null">
  291 + address = #{record.address,jdbcType=VARCHAR},
  292 + </if>
  293 + <if test="record.phone != null">
  294 + phone = #{record.phone,jdbcType=VARCHAR},
  295 + </if>
  296 + <if test="record.inName != null">
  297 + in_name = #{record.inName,jdbcType=VARCHAR},
  298 + </if>
  299 + <if test="record.invoice != null">
  300 + invoice = #{record.invoice,jdbcType=VARCHAR},
  301 + </if>
  302 + <if test="record.isCanceled != null">
  303 + is_canceled = #{record.isCanceled,jdbcType=BIT},
262 304 </if>
263 305 <if test="record.memberId != null">
264 306 member_id = #{record.memberId,jdbcType=VARCHAR},
... ... @@ -286,7 +328,11 @@
286 328 expense = #{record.expense,jdbcType=BIGINT},
287 329 pay_type = #{record.payType,jdbcType=VARCHAR},
288 330 order_status = #{record.orderStatus,jdbcType=VARCHAR},
289   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  331 + address = #{record.address,jdbcType=VARCHAR},
  332 + phone = #{record.phone,jdbcType=VARCHAR},
  333 + in_name = #{record.inName,jdbcType=VARCHAR},
  334 + invoice = #{record.invoice,jdbcType=VARCHAR},
  335 + is_canceled = #{record.isCanceled,jdbcType=BIT},
290 336 member_id = #{record.memberId,jdbcType=VARCHAR},
291 337 create_date = #{record.createDate,jdbcType=TIMESTAMP},
292 338 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -316,8 +362,20 @@
316 362 <if test="orderStatus != null">
317 363 order_status = #{orderStatus,jdbcType=VARCHAR},
318 364 </if>
319   - <if test="iscanceled != null">
320   - isCanceled = #{iscanceled,jdbcType=BIT},
  365 + <if test="address != null">
  366 + address = #{address,jdbcType=VARCHAR},
  367 + </if>
  368 + <if test="phone != null">
  369 + phone = #{phone,jdbcType=VARCHAR},
  370 + </if>
  371 + <if test="inName != null">
  372 + in_name = #{inName,jdbcType=VARCHAR},
  373 + </if>
  374 + <if test="invoice != null">
  375 + invoice = #{invoice,jdbcType=VARCHAR},
  376 + </if>
  377 + <if test="isCanceled != null">
  378 + is_canceled = #{isCanceled,jdbcType=BIT},
321 379 </if>
322 380 <if test="memberId != null">
323 381 member_id = #{memberId,jdbcType=VARCHAR},
... ... @@ -342,7 +400,11 @@
342 400 expense = #{expense,jdbcType=BIGINT},
343 401 pay_type = #{payType,jdbcType=VARCHAR},
344 402 order_status = #{orderStatus,jdbcType=VARCHAR},
345   - isCanceled = #{iscanceled,jdbcType=BIT},
  403 + address = #{address,jdbcType=VARCHAR},
  404 + phone = #{phone,jdbcType=VARCHAR},
  405 + in_name = #{inName,jdbcType=VARCHAR},
  406 + invoice = #{invoice,jdbcType=VARCHAR},
  407 + is_canceled = #{isCanceled,jdbcType=BIT},
346 408 member_id = #{memberId,jdbcType=VARCHAR},
347 409 create_date = #{createDate,jdbcType=TIMESTAMP},
348 410 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class
View file @6a13fa7
No preview for this file type
target/patent/WEB-INF/classes/mapper/CasementMapper.xml
  View file @6a13fa7
... ... @@ -8,17 +8,12 @@
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="name" jdbcType="VARCHAR" property="name" />
11   - <result column="caseSn" jdbcType="VARCHAR" property="casesn" />
  11 + <result column="case_sn" jdbcType="VARCHAR" property="caseSn" />
12 12 <result column="case_type" jdbcType="VARCHAR" property="caseType" />
13   - <result column="case_type_title" jdbcType="VARCHAR" property="caseTypeTitle" />
14 13 <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
15   - <result column="service_type_title" jdbcType="VARCHAR" property="serviceTypeTitle" />
16 14 <result column="paid_type" jdbcType="VARCHAR" property="paidType" />
17   - <result column="paid_type_title" jdbcType="VARCHAR" property="paidTypeTitle" />
18 15 <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" />
19   - <result column="reduce_type_title" jdbcType="VARCHAR" property="reduceTypeTitle" />
20 16 <result column="expense" jdbcType="BIGINT" property="expense" />
21   - <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
22 17 <result column="case_status" jdbcType="VARCHAR" property="caseStatus" />
23 18 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
24 19 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
... ... @@ -95,8 +90,7 @@
95 90 WARNING - @mbggenerated
96 91 This element is automatically generated by MyBatis Generator, do not modify.
97 92 -->
98   - id, name, caseSn, case_type, case_type_title, service_type, service_type_title, paid_type,
99   - paid_type_title, reduce_type, reduce_type_title, expense, order_status, case_status,
  93 + id, name, case_sn, case_type, service_type, paid_type, reduce_type, expense, case_status,
100 94 member_id, create_date, update_date
101 95 </sql>
102 96 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap">
... ... @@ -153,18 +147,14 @@
153 147 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
154 148 SELECT LAST_INSERT_ID()
155 149 </selectKey>
156   - insert into casement (name, caseSn, case_type,
157   - case_type_title, service_type, service_type_title,
158   - paid_type, paid_type_title, reduce_type,
159   - reduce_type_title, expense, order_status,
160   - case_status, member_id, create_date,
161   - update_date)
162   - values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
163   - #{caseTypeTitle,jdbcType=VARCHAR}, #{serviceType,jdbcType=VARCHAR}, #{serviceTypeTitle,jdbcType=VARCHAR},
164   - #{paidType,jdbcType=VARCHAR}, #{paidTypeTitle,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
165   - #{reduceTypeTitle,jdbcType=VARCHAR}, #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR},
166   - #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
167   - #{updateDate,jdbcType=TIMESTAMP})
  150 + insert into casement (name, case_sn, case_type,
  151 + service_type, paid_type, reduce_type,
  152 + expense, case_status, member_id,
  153 + create_date, update_date)
  154 + values (#{name,jdbcType=VARCHAR}, #{caseSn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR},
  155 + #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR},
  156 + #{expense,jdbcType=BIGINT}, #{caseStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  157 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
168 158 </insert>
169 159 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement">
170 160 <!--
... ... @@ -179,39 +169,24 @@
179 169 <if test="name != null">
180 170 name,
181 171 </if>
182   - <if test="casesn != null">
183   - caseSn,
  172 + <if test="caseSn != null">
  173 + case_sn,
184 174 </if>
185 175 <if test="caseType != null">
186 176 case_type,
187 177 </if>
188   - <if test="caseTypeTitle != null">
189   - case_type_title,
190   - </if>
191 178 <if test="serviceType != null">
192 179 service_type,
193 180 </if>
194   - <if test="serviceTypeTitle != null">
195   - service_type_title,
196   - </if>
197 181 <if test="paidType != null">
198 182 paid_type,
199 183 </if>
200   - <if test="paidTypeTitle != null">
201   - paid_type_title,
202   - </if>
203 184 <if test="reduceType != null">
204 185 reduce_type,
205 186 </if>
206   - <if test="reduceTypeTitle != null">
207   - reduce_type_title,
208   - </if>
209 187 <if test="expense != null">
210 188 expense,
211 189 </if>
212   - <if test="orderStatus != null">
213   - order_status,
214   - </if>
215 190 <if test="caseStatus != null">
216 191 case_status,
217 192 </if>
... ... @@ -229,39 +204,24 @@
229 204 <if test="name != null">
230 205 #{name,jdbcType=VARCHAR},
231 206 </if>
232   - <if test="casesn != null">
233   - #{casesn,jdbcType=VARCHAR},
  207 + <if test="caseSn != null">
  208 + #{caseSn,jdbcType=VARCHAR},
234 209 </if>
235 210 <if test="caseType != null">
236 211 #{caseType,jdbcType=VARCHAR},
237 212 </if>
238   - <if test="caseTypeTitle != null">
239   - #{caseTypeTitle,jdbcType=VARCHAR},
240   - </if>
241 213 <if test="serviceType != null">
242 214 #{serviceType,jdbcType=VARCHAR},
243 215 </if>
244   - <if test="serviceTypeTitle != null">
245   - #{serviceTypeTitle,jdbcType=VARCHAR},
246   - </if>
247 216 <if test="paidType != null">
248 217 #{paidType,jdbcType=VARCHAR},
249 218 </if>
250   - <if test="paidTypeTitle != null">
251   - #{paidTypeTitle,jdbcType=VARCHAR},
252   - </if>
253 219 <if test="reduceType != null">
254 220 #{reduceType,jdbcType=VARCHAR},
255 221 </if>
256   - <if test="reduceTypeTitle != null">
257   - #{reduceTypeTitle,jdbcType=VARCHAR},
258   - </if>
259 222 <if test="expense != null">
260 223 #{expense,jdbcType=BIGINT},
261 224 </if>
262   - <if test="orderStatus != null">
263   - #{orderStatus,jdbcType=VARCHAR},
264   - </if>
265 225 <if test="caseStatus != null">
266 226 #{caseStatus,jdbcType=VARCHAR},
267 227 </if>
... ... @@ -299,39 +259,24 @@
299 259 <if test="record.name != null">
300 260 name = #{record.name,jdbcType=VARCHAR},
301 261 </if>
302   - <if test="record.casesn != null">
303   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  262 + <if test="record.caseSn != null">
  263 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
304 264 </if>
305 265 <if test="record.caseType != null">
306 266 case_type = #{record.caseType,jdbcType=VARCHAR},
307 267 </if>
308   - <if test="record.caseTypeTitle != null">
309   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
310   - </if>
311 268 <if test="record.serviceType != null">
312 269 service_type = #{record.serviceType,jdbcType=VARCHAR},
313 270 </if>
314   - <if test="record.serviceTypeTitle != null">
315   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
316   - </if>
317 271 <if test="record.paidType != null">
318 272 paid_type = #{record.paidType,jdbcType=VARCHAR},
319 273 </if>
320   - <if test="record.paidTypeTitle != null">
321   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
322   - </if>
323 274 <if test="record.reduceType != null">
324 275 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
325 276 </if>
326   - <if test="record.reduceTypeTitle != null">
327   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
328   - </if>
329 277 <if test="record.expense != null">
330 278 expense = #{record.expense,jdbcType=BIGINT},
331 279 </if>
332   - <if test="record.orderStatus != null">
333   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
334   - </if>
335 280 <if test="record.caseStatus != null">
336 281 case_status = #{record.caseStatus,jdbcType=VARCHAR},
337 282 </if>
... ... @@ -357,17 +302,12 @@
357 302 update casement
358 303 set id = #{record.id,jdbcType=BIGINT},
359 304 name = #{record.name,jdbcType=VARCHAR},
360   - caseSn = #{record.casesn,jdbcType=VARCHAR},
  305 + case_sn = #{record.caseSn,jdbcType=VARCHAR},
361 306 case_type = #{record.caseType,jdbcType=VARCHAR},
362   - case_type_title = #{record.caseTypeTitle,jdbcType=VARCHAR},
363 307 service_type = #{record.serviceType,jdbcType=VARCHAR},
364   - service_type_title = #{record.serviceTypeTitle,jdbcType=VARCHAR},
365 308 paid_type = #{record.paidType,jdbcType=VARCHAR},
366   - paid_type_title = #{record.paidTypeTitle,jdbcType=VARCHAR},
367 309 reduce_type = #{record.reduceType,jdbcType=VARCHAR},
368   - reduce_type_title = #{record.reduceTypeTitle,jdbcType=VARCHAR},
369 310 expense = #{record.expense,jdbcType=BIGINT},
370   - order_status = #{record.orderStatus,jdbcType=VARCHAR},
371 311 case_status = #{record.caseStatus,jdbcType=VARCHAR},
372 312 member_id = #{record.memberId,jdbcType=VARCHAR},
373 313 create_date = #{record.createDate,jdbcType=TIMESTAMP},
... ... @@ -386,39 +326,24 @@
386 326 <if test="name != null">
387 327 name = #{name,jdbcType=VARCHAR},
388 328 </if>
389   - <if test="casesn != null">
390   - caseSn = #{casesn,jdbcType=VARCHAR},
  329 + <if test="caseSn != null">
  330 + case_sn = #{caseSn,jdbcType=VARCHAR},
391 331 </if>
392 332 <if test="caseType != null">
393 333 case_type = #{caseType,jdbcType=VARCHAR},
394 334 </if>
395   - <if test="caseTypeTitle != null">
396   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
397   - </if>
398 335 <if test="serviceType != null">
399 336 service_type = #{serviceType,jdbcType=VARCHAR},
400 337 </if>
401   - <if test="serviceTypeTitle != null">
402   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
403   - </if>
404 338 <if test="paidType != null">
405 339 paid_type = #{paidType,jdbcType=VARCHAR},
406 340 </if>
407   - <if test="paidTypeTitle != null">
408   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
409   - </if>
410 341 <if test="reduceType != null">
411 342 reduce_type = #{reduceType,jdbcType=VARCHAR},
412 343 </if>
413   - <if test="reduceTypeTitle != null">
414   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
415   - </if>
416 344 <if test="expense != null">
417 345 expense = #{expense,jdbcType=BIGINT},
418 346 </if>
419   - <if test="orderStatus != null">
420   - order_status = #{orderStatus,jdbcType=VARCHAR},
421   - </if>
422 347 <if test="caseStatus != null">
423 348 case_status = #{caseStatus,jdbcType=VARCHAR},
424 349 </if>
... ... @@ -441,17 +366,12 @@
441 366 -->
442 367 update casement
443 368 set name = #{name,jdbcType=VARCHAR},
444   - caseSn = #{casesn,jdbcType=VARCHAR},
  369 + case_sn = #{caseSn,jdbcType=VARCHAR},
445 370 case_type = #{caseType,jdbcType=VARCHAR},
446   - case_type_title = #{caseTypeTitle,jdbcType=VARCHAR},
447 371 service_type = #{serviceType,jdbcType=VARCHAR},
448   - service_type_title = #{serviceTypeTitle,jdbcType=VARCHAR},
449 372 paid_type = #{paidType,jdbcType=VARCHAR},
450   - paid_type_title = #{paidTypeTitle,jdbcType=VARCHAR},
451 373 reduce_type = #{reduceType,jdbcType=VARCHAR},
452   - reduce_type_title = #{reduceTypeTitle,jdbcType=VARCHAR},
453 374 expense = #{expense,jdbcType=BIGINT},
454   - order_status = #{orderStatus,jdbcType=VARCHAR},
455 375 case_status = #{caseStatus,jdbcType=VARCHAR},
456 376 member_id = #{memberId,jdbcType=VARCHAR},
457 377 create_date = #{createDate,jdbcType=TIMESTAMP},
... ...
target/patent/WEB-INF/classes/mapper/OrderMapper.xml
  View file @6a13fa7
... ... @@ -12,7 +12,11 @@
12 12 <result column="expense" jdbcType="BIGINT" property="expense" />
13 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
14 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
15   - <result column="isCanceled" jdbcType="BIT" property="iscanceled" />
  15 + <result column="address" jdbcType="VARCHAR" property="address" />
  16 + <result column="phone" jdbcType="VARCHAR" property="phone" />
  17 + <result column="in_name" jdbcType="VARCHAR" property="inName" />
  18 + <result column="invoice" jdbcType="VARCHAR" property="invoice" />
  19 + <result column="is_canceled" jdbcType="BIT" property="isCanceled" />
16 20 <result column="member_id" jdbcType="VARCHAR" property="memberId" />
17 21 <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
18 22 <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
... ... @@ -88,8 +92,8 @@
88 92 WARNING - @mbggenerated
89 93 This element is automatically generated by MyBatis Generator, do not modify.
90 94 -->
91   - id, case_id, quantity, expense, pay_type, order_status, isCanceled, member_id, create_date,
92   - update_date
  95 + id, case_id, quantity, expense, pay_type, order_status, address, phone, in_name,
  96 + invoice, is_canceled, member_id, create_date, update_date
93 97 </sql>
94 98 <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
95 99 <!--
... ... @@ -146,13 +150,15 @@
146 150 SELECT LAST_INSERT_ID()
147 151 </selectKey>
148 152 insert into orders (case_id, quantity, expense,
149   - pay_type, order_status, isCanceled,
150   - member_id, create_date, update_date
151   - )
  153 + pay_type, order_status, address,
  154 + phone, in_name, invoice,
  155 + is_canceled, member_id, create_date,
  156 + update_date)
152 157 values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
153   - #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{iscanceled,jdbcType=BIT},
154   - #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP}
155   - )
  158 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
  159 + #{phone,jdbcType=VARCHAR}, #{inName,jdbcType=VARCHAR}, #{invoice,jdbcType=VARCHAR},
  160 + #{isCanceled,jdbcType=BIT}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
  161 + #{updateDate,jdbcType=TIMESTAMP})
156 162 </insert>
157 163 <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
158 164 <!--
... ... @@ -179,8 +185,20 @@
179 185 <if test="orderStatus != null">
180 186 order_status,
181 187 </if>
182   - <if test="iscanceled != null">
183   - isCanceled,
  188 + <if test="address != null">
  189 + address,
  190 + </if>
  191 + <if test="phone != null">
  192 + phone,
  193 + </if>
  194 + <if test="inName != null">
  195 + in_name,
  196 + </if>
  197 + <if test="invoice != null">
  198 + invoice,
  199 + </if>
  200 + <if test="isCanceled != null">
  201 + is_canceled,
184 202 </if>
185 203 <if test="memberId != null">
186 204 member_id,
... ... @@ -208,8 +226,20 @@
208 226 <if test="orderStatus != null">
209 227 #{orderStatus,jdbcType=VARCHAR},
210 228 </if>
211   - <if test="iscanceled != null">
212   - #{iscanceled,jdbcType=BIT},
  229 + <if test="address != null">
  230 + #{address,jdbcType=VARCHAR},
  231 + </if>
  232 + <if test="phone != null">
  233 + #{phone,jdbcType=VARCHAR},
  234 + </if>
  235 + <if test="inName != null">
  236 + #{inName,jdbcType=VARCHAR},
  237 + </if>
  238 + <if test="invoice != null">
  239 + #{invoice,jdbcType=VARCHAR},
  240 + </if>
  241 + <if test="isCanceled != null">
  242 + #{isCanceled,jdbcType=BIT},
213 243 </if>
214 244 <if test="memberId != null">
215 245 #{memberId,jdbcType=VARCHAR},
... ... @@ -257,8 +287,20 @@
257 287 <if test="record.orderStatus != null">
258 288 order_status = #{record.orderStatus,jdbcType=VARCHAR},
259 289 </if>
260   - <if test="record.iscanceled != null">
261   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  290 + <if test="record.address != null">
  291 + address = #{record.address,jdbcType=VARCHAR},
  292 + </if>
  293 + <if test="record.phone != null">
  294 + phone = #{record.phone,jdbcType=VARCHAR},
  295 + </if>
  296 + <if test="record.inName != null">
  297 + in_name = #{record.inName,jdbcType=VARCHAR},
  298 + </if>
  299 + <if test="record.invoice != null">
  300 + invoice = #{record.invoice,jdbcType=VARCHAR},
  301 + </if>
  302 + <if test="record.isCanceled != null">
  303 + is_canceled = #{record.isCanceled,jdbcType=BIT},
262 304 </if>
263 305 <if test="record.memberId != null">
264 306 member_id = #{record.memberId,jdbcType=VARCHAR},
... ... @@ -286,7 +328,11 @@
286 328 expense = #{record.expense,jdbcType=BIGINT},
287 329 pay_type = #{record.payType,jdbcType=VARCHAR},
288 330 order_status = #{record.orderStatus,jdbcType=VARCHAR},
289   - isCanceled = #{record.iscanceled,jdbcType=BIT},
  331 + address = #{record.address,jdbcType=VARCHAR},
  332 + phone = #{record.phone,jdbcType=VARCHAR},
  333 + in_name = #{record.inName,jdbcType=VARCHAR},
  334 + invoice = #{record.invoice,jdbcType=VARCHAR},
  335 + is_canceled = #{record.isCanceled,jdbcType=BIT},
290 336 member_id = #{record.memberId,jdbcType=VARCHAR},
291 337 create_date = #{record.createDate,jdbcType=TIMESTAMP},
292 338 update_date = #{record.updateDate,jdbcType=TIMESTAMP}
... ... @@ -316,8 +362,20 @@
316 362 <if test="orderStatus != null">
317 363 order_status = #{orderStatus,jdbcType=VARCHAR},
318 364 </if>
319   - <if test="iscanceled != null">
320   - isCanceled = #{iscanceled,jdbcType=BIT},
  365 + <if test="address != null">
  366 + address = #{address,jdbcType=VARCHAR},
  367 + </if>
  368 + <if test="phone != null">
  369 + phone = #{phone,jdbcType=VARCHAR},
  370 + </if>
  371 + <if test="inName != null">
  372 + in_name = #{inName,jdbcType=VARCHAR},
  373 + </if>
  374 + <if test="invoice != null">
  375 + invoice = #{invoice,jdbcType=VARCHAR},
  376 + </if>
  377 + <if test="isCanceled != null">
  378 + is_canceled = #{isCanceled,jdbcType=BIT},
321 379 </if>
322 380 <if test="memberId != null">
323 381 member_id = #{memberId,jdbcType=VARCHAR},
... ... @@ -342,7 +400,11 @@
342 400 expense = #{expense,jdbcType=BIGINT},
343 401 pay_type = #{payType,jdbcType=VARCHAR},
344 402 order_status = #{orderStatus,jdbcType=VARCHAR},
345   - isCanceled = #{iscanceled,jdbcType=BIT},
  403 + address = #{address,jdbcType=VARCHAR},
  404 + phone = #{phone,jdbcType=VARCHAR},
  405 + in_name = #{inName,jdbcType=VARCHAR},
  406 + invoice = #{invoice,jdbcType=VARCHAR},
  407 + is_canceled = #{isCanceled,jdbcType=BIT},
346 408 member_id = #{memberId,jdbcType=VARCHAR},
347 409 create_date = #{createDate,jdbcType=TIMESTAMP},
348 410 update_date = #{updateDate,jdbcType=TIMESTAMP}
... ...
target/patent/pay.jsp
  View file @6a13fa7
... ... @@ -114,8 +114,7 @@
114 114 <div class="total-wrap">应付总额：<span class="total">￥${totalExpense}</span></div>
115 115 <div>
116 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" />
  117 + <input type="hidden" name="orderId" value="${orderId}" />
119 118 <input type="hidden" name="address" id="pay_address" />
120 119 <input type="hidden" name="phone" id="pay_phone" />
121 120 <input type="hidden" name="inName" id="in_name" />
... ... @@ -161,8 +160,6 @@
161 160 * 提交支付
162 161 */
163 162 function submit_pay(){
164   - var id = $("#case_id").val();
165   - var expense = $("#expense span").text();
166 163 var address = $("#address").val();
167 164 if(address==""){
168 165 alert("地址不能为空");
... ... @@ -187,8 +184,6 @@
187 184 $("#invoice").focus();
188 185 return;
189 186 }
190   - $("#pay_case_id").val(id);
191   - $("#pay_expense").val(expense);
192 187 $("#pay_address").val(address);
193 188 $("#pay_phone").val(phone);
194 189 $("#in_name").val(company==null?person:company);
... ...