Commit 7c850db099c03b942ebd509a028a7c9b0547a0a9
1 parent
cb6a3f56
submit case
Showing
35 changed files
with
3712 additions
and
445 deletions
Too many changes to show.
To preserve performance only 35 of 123 files are displayed.
.DS_Store
No preview for this file type
.idea/workspace.xml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> | 4 | + <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> |
5 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java" /> | ||
6 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" /> | ||
7 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java" /> | ||
8 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java" /> | ||
9 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" /> | ||
10 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java" /> | ||
11 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" /> | ||
12 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" /> | ||
13 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" /> | ||
14 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" /> | ||
15 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" /> | ||
16 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" /> | ||
17 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" /> | ||
18 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/css/home.css" /> | ||
19 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> | ||
20 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HelloController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HelloController.class" /> | ||
21 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HelloController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HelloController.class" /> | ||
22 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" /> | ||
23 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" /> | ||
24 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTest.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTest.class" /> | ||
25 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTest.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTest.class" /> | ||
26 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTestExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTestExample$Criteria.class" /> | ||
27 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTestExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTestExample$Criteria.class" /> | ||
28 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTestExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/MybatisTestExample$GeneratedCriteria.class" /> | ||
29 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTestExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/MybatisTestExample$GeneratedCriteria.class" /> | ||
30 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/mapper/MybatisTestMapper.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/mapper/MybatisTestMapper.class" /> | ||
31 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/MybatisTestMapper.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/MybatisTestMapper.class" /> | ||
32 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/common/utils/TextUtils.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/common/utils/TextUtils.class" /> | ||
33 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/common/utils/TextUtils.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/common/utils/TextUtils.class" /> | ||
34 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="$PROJECT_DIR$/doc/patent.mwb.bak" /> | ||
35 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" /> | ||
36 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" /> | ||
37 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/MybatisTest.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/MybatisTest.java" /> | ||
38 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/MybatisTestExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/MybatisTestExample.java" /> | ||
39 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java" /> | ||
40 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml" /> | ||
41 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/MybatisTestMapper.xml" /> | ||
42 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/MybatisTestMapper.xml" /> | ||
43 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> | ||
44 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" /> | ||
45 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/applicationContext.xml" afterPath="$PROJECT_DIR$/target/classes/applicationContext.xml" /> | ||
46 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/applicationContext.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/applicationContext.xml" /> | ||
47 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> | ||
48 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/case-manage.jsp" afterPath="$PROJECT_DIR$/target/patent/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$/src/main/webapp/include/footer.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> | ||
51 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/include/footer.jsp" afterPath="$PROJECT_DIR$/target/patent/include/footer.jsp" /> | ||
52 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" /> | ||
53 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" /> | ||
54 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/include/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> | ||
55 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/include/header.jsp" afterPath="$PROJECT_DIR$/target/patent/include/header.jsp" /> | ||
56 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" /> | ||
57 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/index.jsp" afterPath="$PROJECT_DIR$/target/patent/index.jsp" /> | ||
58 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" /> | ||
59 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/classes/props/jdbc.properties" /> | ||
60 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" /> | ||
61 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="$PROJECT_DIR$/doc/patent.mwb" /> | ||
62 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> | ||
63 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" /> | ||
64 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> | ||
65 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
66 | + </list> | ||
5 | <ignored path="patent.iws" /> | 67 | <ignored path="patent.iws" /> |
6 | <ignored path=".idea/workspace.xml" /> | 68 | <ignored path=".idea/workspace.xml" /> |
7 | <ignored path="$PROJECT_DIR$/target/" /> | 69 | <ignored path="$PROJECT_DIR$/target/" /> |
@@ -23,74 +85,31 @@ | @@ -23,74 +85,31 @@ | ||
23 | </component> | 85 | </component> |
24 | <component name="FileEditorManager"> | 86 | <component name="FileEditorManager"> |
25 | <leaf> | 87 | <leaf> |
26 | - <file leaf-file-name="index.jsp" pinned="false" current-in-tab="false"> | ||
27 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | ||
28 | - <provider selected="true" editor-type-id="text-editor"> | ||
29 | - <state vertical-scroll-proportion="-13.125"> | ||
30 | - <caret line="29" column="60" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="60" /> | ||
31 | - <folding /> | ||
32 | - </state> | ||
33 | - </provider> | ||
34 | - </entry> | ||
35 | - </file> | ||
36 | - <file leaf-file-name="index.js" pinned="false" current-in-tab="true"> | ||
37 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> | 88 | + <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false"> |
89 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> | ||
38 | <provider selected="true" editor-type-id="text-editor"> | 90 | <provider selected="true" editor-type-id="text-editor"> |
39 | - <state vertical-scroll-proportion="0.3480392"> | ||
40 | - <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" /> | 91 | + <state vertical-scroll-proportion="-4.5882354"> |
92 | + <caret line="215" column="41" selection-start-line="215" selection-start-column="41" selection-end-line="215" selection-end-column="41" /> | ||
41 | <folding /> | 93 | <folding /> |
42 | </state> | 94 | </state> |
43 | </provider> | 95 | </provider> |
44 | </entry> | 96 | </entry> |
45 | </file> | 97 | </file> |
46 | - <file leaf-file-name="application.properties" pinned="false" current-in-tab="false"> | ||
47 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/application.properties"> | 98 | + <file leaf-file-name="HomePatentController.java" pinned="false" current-in-tab="false"> |
99 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java"> | ||
48 | <provider selected="true" editor-type-id="text-editor"> | 100 | <provider selected="true" editor-type-id="text-editor"> |
49 | <state vertical-scroll-proportion="0.0"> | 101 | <state vertical-scroll-proportion="0.0"> |
50 | - <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="29" /> | 102 | + <caret line="57" column="52" selection-start-line="57" selection-start-column="52" selection-end-line="57" selection-end-column="52" /> |
51 | <folding /> | 103 | <folding /> |
52 | </state> | 104 | </state> |
53 | </provider> | 105 | </provider> |
54 | </entry> | 106 | </entry> |
55 | </file> | 107 | </file> |
56 | - <file leaf-file-name="FrontConstant.java" pinned="false" current-in-tab="false"> | ||
57 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java"> | 108 | + <file leaf-file-name="HomePatentService.java" pinned="false" current-in-tab="true"> |
109 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java"> | ||
58 | <provider selected="true" editor-type-id="text-editor"> | 110 | <provider selected="true" editor-type-id="text-editor"> |
59 | - <state vertical-scroll-proportion="0.0"> | ||
60 | - <caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" /> | ||
61 | - <folding> | ||
62 | - <element signature="imports" expanded="true" /> | ||
63 | - <element signature="e#386#387#0" expanded="true" /> | ||
64 | - <element signature="e#417#418#0" expanded="true" /> | ||
65 | - <element signature="e#465#466#0" expanded="true" /> | ||
66 | - <element signature="e#505#506#0" expanded="true" /> | ||
67 | - <element signature="e#544#545#0" expanded="true" /> | ||
68 | - <element signature="e#579#580#0" expanded="true" /> | ||
69 | - <element signature="e#635#636#0" expanded="true" /> | ||
70 | - <element signature="e#683#684#0" expanded="true" /> | ||
71 | - </folding> | ||
72 | - </state> | ||
73 | - </provider> | ||
74 | - </entry> | ||
75 | - </file> | ||
76 | - <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false"> | ||
77 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> | ||
78 | - <provider selected="true" editor-type-id="text-editor"> | ||
79 | - <state vertical-scroll-proportion="0.0"> | ||
80 | - <caret line="29" column="34" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="34" /> | ||
81 | - <folding> | ||
82 | - <element signature="e#764#765#0" expanded="true" /> | ||
83 | - <element signature="e#812#813#0" expanded="true" /> | ||
84 | - </folding> | ||
85 | - </state> | ||
86 | - </provider> | ||
87 | - </entry> | ||
88 | - </file> | ||
89 | - <file leaf-file-name="AlipayConstant.java" pinned="false" current-in-tab="false"> | ||
90 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/AlipayConstant.java"> | ||
91 | - <provider selected="true" editor-type-id="text-editor"> | ||
92 | - <state vertical-scroll-proportion="0.0"> | ||
93 | - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> | 111 | + <state vertical-scroll-proportion="0.33187774"> |
112 | + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> | ||
94 | <folding /> | 113 | <folding /> |
95 | </state> | 114 | </state> |
96 | </provider> | 115 | </provider> |
@@ -102,8 +121,9 @@ | @@ -102,8 +121,9 @@ | ||
102 | <option name="RECENT_TEMPLATES"> | 121 | <option name="RECENT_TEMPLATES"> |
103 | <list> | 122 | <list> |
104 | <option value="CSS File" /> | 123 | <option value="CSS File" /> |
105 | - <option value="Jsp File" /> | ||
106 | <option value="jsf" /> | 124 | <option value="jsf" /> |
125 | + <option value="Jsp File" /> | ||
126 | + <option value="Enum" /> | ||
107 | <option value="Class" /> | 127 | <option value="Class" /> |
108 | </list> | 128 | </list> |
109 | </option> | 129 | </option> |
@@ -119,15 +139,6 @@ | @@ -119,15 +139,6 @@ | ||
119 | <component name="IdeDocumentHistory"> | 139 | <component name="IdeDocumentHistory"> |
120 | <option name="CHANGED_PATHS"> | 140 | <option name="CHANGED_PATHS"> |
121 | <list> | 141 | <list> |
122 | - <option value="$PROJECT_DIR$/src/test/java/com/canrd/core/service/TestMail.java" /> | ||
123 | - <option value="$PROJECT_DIR$/src/test/java/com/canrd/core/common/Test.java" /> | ||
124 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/core/interceptor/Interceptor.java" /> | ||
125 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/core/web/IndexController.java" /> | ||
126 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/core/web/HelloController.java" /> | ||
127 | - <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/jsp/index.jsp" /> | ||
128 | - <option value="$PROJECT_DIR$/pom.xml" /> | ||
129 | - <option value="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" /> | ||
130 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" /> | ||
131 | <option value="$PROJECT_DIR$/src/main/webapp/resources/style.css" /> | 142 | <option value="$PROJECT_DIR$/src/main/webapp/resources/style.css" /> |
132 | <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/index.jsp" /> | 143 | <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/index.jsp" /> |
133 | <option value="$PROJECT_DIR$/src/main/webapp/css/service.css" /> | 144 | <option value="$PROJECT_DIR$/src/main/webapp/css/service.css" /> |
@@ -138,19 +149,47 @@ | @@ -138,19 +149,47 @@ | ||
138 | <option value="$PROJECT_DIR$/src/main/webapp/pay.html" /> | 149 | <option value="$PROJECT_DIR$/src/main/webapp/pay.html" /> |
139 | <option value="$PROJECT_DIR$/src/main/webapp/service.html" /> | 150 | <option value="$PROJECT_DIR$/src/main/webapp/service.html" /> |
140 | <option value="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" /> | 151 | <option value="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" /> |
141 | - <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> | ||
142 | <option value="$PROJECT_DIR$/src/main/webapp/include/footer.xhtml" /> | 152 | <option value="$PROJECT_DIR$/src/main/webapp/include/footer.xhtml" /> |
143 | - <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> | ||
144 | <option value="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" /> | 153 | <option value="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" /> |
145 | - <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> | ||
146 | - <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> | ||
147 | <option value="$PROJECT_DIR$/src/main/webapp/service.jsp" /> | 154 | <option value="$PROJECT_DIR$/src/main/webapp/service.jsp" /> |
148 | <option value="$PROJECT_DIR$/src/main/resources.local/props/application.properties" /> | 155 | <option value="$PROJECT_DIR$/src/main/resources.local/props/application.properties" /> |
149 | <option value="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" /> | 156 | <option value="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" /> |
150 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java" /> | 157 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java" /> |
158 | + <option value="$PROJECT_DIR$/src/main/webapp/js/index.js" /> | ||
159 | + <option value="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" /> | ||
160 | + <option value="$PROJECT_DIR$/pom.xml" /> | ||
161 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java" /> | ||
162 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" /> | ||
163 | + <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" /> | ||
164 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseType.java" /> | ||
165 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" /> | ||
166 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceEnum.java" /> | ||
167 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" /> | ||
151 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" /> | 168 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" /> |
169 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" /> | ||
170 | + <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" /> | ||
152 | <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> | 171 | <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> |
153 | - <option value="$PROJECT_DIR$/src/main/webapp/js/index.js" /> | 172 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/Enum.java" /> |
173 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java" /> | ||
174 | + <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> | ||
175 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java" /> | ||
176 | + <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> | ||
177 | + <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> | ||
178 | + <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> | ||
179 | + <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> | ||
180 | + <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" /> | ||
181 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" /> | ||
182 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" /> | ||
183 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> | ||
184 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" /> | ||
185 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" /> | ||
186 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" /> | ||
187 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" /> | ||
188 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" /> | ||
189 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" /> | ||
190 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" /> | ||
191 | + <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> | ||
192 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" /> | ||
154 | </list> | 193 | </list> |
155 | </option> | 194 | </option> |
156 | </component> | 195 | </component> |
@@ -171,6 +210,11 @@ | @@ -171,6 +210,11 @@ | ||
171 | <option name="mavenHome" value="$USER_HOME$/install/apache-maven-3.2.5" /> | 210 | <option name="mavenHome" value="$USER_HOME$/install/apache-maven-3.2.5" /> |
172 | </MavenGeneralSettings> | 211 | </MavenGeneralSettings> |
173 | </option> | 212 | </option> |
213 | + <option name="disabledProfiles"> | ||
214 | + <list> | ||
215 | + <option value="dev" /> | ||
216 | + </list> | ||
217 | + </option> | ||
174 | </component> | 218 | </component> |
175 | <component name="MavenProjectNavigator"> | 219 | <component name="MavenProjectNavigator"> |
176 | <treeState> | 220 | <treeState> |
@@ -204,6 +248,20 @@ | @@ -204,6 +248,20 @@ | ||
204 | <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" /> | 248 | <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" /> |
205 | </PATH_ELEMENT> | 249 | </PATH_ELEMENT> |
206 | <PATH_ELEMENT> | 250 | <PATH_ELEMENT> |
251 | + <option name="myItemId" value="patent" /> | ||
252 | + <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" /> | ||
253 | + </PATH_ELEMENT> | ||
254 | + <PATH_ELEMENT> | ||
255 | + <option name="myItemId" value="Lifecycle" /> | ||
256 | + <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" /> | ||
257 | + </PATH_ELEMENT> | ||
258 | + </PATH> | ||
259 | + <PATH> | ||
260 | + <PATH_ELEMENT> | ||
261 | + <option name="myItemId" value="" /> | ||
262 | + <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" /> | ||
263 | + </PATH_ELEMENT> | ||
264 | + <PATH_ELEMENT> | ||
207 | <option name="myItemId" value="Profiles" /> | 265 | <option name="myItemId" value="Profiles" /> |
208 | <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode" /> | 266 | <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode" /> |
209 | </PATH_ELEMENT> | 267 | </PATH_ELEMENT> |
@@ -214,9 +272,10 @@ | @@ -214,9 +272,10 @@ | ||
214 | <order /> | 272 | <order /> |
215 | </component> | 273 | </component> |
216 | <component name="ProjectFrameBounds"> | 274 | <component name="ProjectFrameBounds"> |
275 | + <option name="x" value="1280" /> | ||
217 | <option name="y" value="23" /> | 276 | <option name="y" value="23" /> |
218 | - <option name="width" value="1280" /> | ||
219 | - <option name="height" value="732" /> | 277 | + <option name="width" value="1920" /> |
278 | + <option name="height" value="1057" /> | ||
220 | </component> | 279 | </component> |
221 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> | 280 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
222 | <OptionsSetting value="true" id="Add" /> | 281 | <OptionsSetting value="true" id="Add" /> |
@@ -242,6 +301,8 @@ | @@ -242,6 +301,8 @@ | ||
242 | </navigator> | 301 | </navigator> |
243 | <panes> | 302 | <panes> |
244 | <pane id="PackagesPane" /> | 303 | <pane id="PackagesPane" /> |
304 | + <pane id="Scope" /> | ||
305 | + <pane id="Scratches" /> | ||
245 | <pane id="ProjectPane"> | 306 | <pane id="ProjectPane"> |
246 | <subPane> | 307 | <subPane> |
247 | <PATH> | 308 | <PATH> |
@@ -260,152 +321,8 @@ | @@ -260,152 +321,8 @@ | ||
260 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 321 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
261 | </PATH_ELEMENT> | 322 | </PATH_ELEMENT> |
262 | </PATH> | 323 | </PATH> |
263 | - <PATH> | ||
264 | - <PATH_ELEMENT> | ||
265 | - <option name="myItemId" value="patent" /> | ||
266 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
267 | - </PATH_ELEMENT> | ||
268 | - <PATH_ELEMENT> | ||
269 | - <option name="myItemId" value="canrd-patent" /> | ||
270 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
271 | - </PATH_ELEMENT> | ||
272 | - <PATH_ELEMENT> | ||
273 | - <option name="myItemId" value="src" /> | ||
274 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
275 | - </PATH_ELEMENT> | ||
276 | - </PATH> | ||
277 | - <PATH> | ||
278 | - <PATH_ELEMENT> | ||
279 | - <option name="myItemId" value="patent" /> | ||
280 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
281 | - </PATH_ELEMENT> | ||
282 | - <PATH_ELEMENT> | ||
283 | - <option name="myItemId" value="canrd-patent" /> | ||
284 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
285 | - </PATH_ELEMENT> | ||
286 | - <PATH_ELEMENT> | ||
287 | - <option name="myItemId" value="src" /> | ||
288 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
289 | - </PATH_ELEMENT> | ||
290 | - <PATH_ELEMENT> | ||
291 | - <option name="myItemId" value="main" /> | ||
292 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
293 | - </PATH_ELEMENT> | ||
294 | - <PATH_ELEMENT> | ||
295 | - <option name="myItemId" value="webapp" /> | ||
296 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
297 | - </PATH_ELEMENT> | ||
298 | - </PATH> | ||
299 | - <PATH> | ||
300 | - <PATH_ELEMENT> | ||
301 | - <option name="myItemId" value="patent" /> | ||
302 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
303 | - </PATH_ELEMENT> | ||
304 | - <PATH_ELEMENT> | ||
305 | - <option name="myItemId" value="canrd-patent" /> | ||
306 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
307 | - </PATH_ELEMENT> | ||
308 | - <PATH_ELEMENT> | ||
309 | - <option name="myItemId" value="src" /> | ||
310 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
311 | - </PATH_ELEMENT> | ||
312 | - <PATH_ELEMENT> | ||
313 | - <option name="myItemId" value="main" /> | ||
314 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
315 | - </PATH_ELEMENT> | ||
316 | - <PATH_ELEMENT> | ||
317 | - <option name="myItemId" value="webapp" /> | ||
318 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
319 | - </PATH_ELEMENT> | ||
320 | - <PATH_ELEMENT> | ||
321 | - <option name="myItemId" value="js" /> | ||
322 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
323 | - </PATH_ELEMENT> | ||
324 | - </PATH> | ||
325 | - <PATH> | ||
326 | - <PATH_ELEMENT> | ||
327 | - <option name="myItemId" value="patent" /> | ||
328 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
329 | - </PATH_ELEMENT> | ||
330 | - <PATH_ELEMENT> | ||
331 | - <option name="myItemId" value="canrd-patent" /> | ||
332 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
333 | - </PATH_ELEMENT> | ||
334 | - <PATH_ELEMENT> | ||
335 | - <option name="myItemId" value="src" /> | ||
336 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
337 | - </PATH_ELEMENT> | ||
338 | - <PATH_ELEMENT> | ||
339 | - <option name="myItemId" value="main" /> | ||
340 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
341 | - </PATH_ELEMENT> | ||
342 | - </PATH> | ||
343 | - <PATH> | ||
344 | - <PATH_ELEMENT> | ||
345 | - <option name="myItemId" value="patent" /> | ||
346 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
347 | - </PATH_ELEMENT> | ||
348 | - <PATH_ELEMENT> | ||
349 | - <option name="myItemId" value="canrd-patent" /> | ||
350 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
351 | - </PATH_ELEMENT> | ||
352 | - <PATH_ELEMENT> | ||
353 | - <option name="myItemId" value="src" /> | ||
354 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
355 | - </PATH_ELEMENT> | ||
356 | - <PATH_ELEMENT> | ||
357 | - <option name="myItemId" value="main" /> | ||
358 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
359 | - </PATH_ELEMENT> | ||
360 | - <PATH_ELEMENT> | ||
361 | - <option name="myItemId" value="resources.local" /> | ||
362 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
363 | - </PATH_ELEMENT> | ||
364 | - </PATH> | ||
365 | - <PATH> | ||
366 | - <PATH_ELEMENT> | ||
367 | - <option name="myItemId" value="patent" /> | ||
368 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
369 | - </PATH_ELEMENT> | ||
370 | - <PATH_ELEMENT> | ||
371 | - <option name="myItemId" value="canrd-patent" /> | ||
372 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
373 | - </PATH_ELEMENT> | ||
374 | - <PATH_ELEMENT> | ||
375 | - <option name="myItemId" value="src" /> | ||
376 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
377 | - </PATH_ELEMENT> | ||
378 | - <PATH_ELEMENT> | ||
379 | - <option name="myItemId" value="main" /> | ||
380 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
381 | - </PATH_ELEMENT> | ||
382 | - <PATH_ELEMENT> | ||
383 | - <option name="myItemId" value="resources.local" /> | ||
384 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
385 | - </PATH_ELEMENT> | ||
386 | - <PATH_ELEMENT> | ||
387 | - <option name="myItemId" value="props" /> | ||
388 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
389 | - </PATH_ELEMENT> | ||
390 | - </PATH> | ||
391 | - <PATH> | ||
392 | - <PATH_ELEMENT> | ||
393 | - <option name="myItemId" value="patent" /> | ||
394 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
395 | - </PATH_ELEMENT> | ||
396 | - <PATH_ELEMENT> | ||
397 | - <option name="myItemId" value="canrd-patent" /> | ||
398 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
399 | - </PATH_ELEMENT> | ||
400 | - <PATH_ELEMENT> | ||
401 | - <option name="myItemId" value="doc" /> | ||
402 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
403 | - </PATH_ELEMENT> | ||
404 | - </PATH> | ||
405 | </subPane> | 324 | </subPane> |
406 | </pane> | 325 | </pane> |
407 | - <pane id="Scratches" /> | ||
408 | - <pane id="Scope" /> | ||
409 | </panes> | 326 | </panes> |
410 | </component> | 327 | </component> |
411 | <component name="PropertiesComponent"> | 328 | <component name="PropertiesComponent"> |
@@ -420,9 +337,17 @@ | @@ -420,9 +337,17 @@ | ||
420 | <property name="restartRequiresConfirmation" value="true" /> | 337 | <property name="restartRequiresConfirmation" value="true" /> |
421 | <property name="FullScreen" value="false" /> | 338 | <property name="FullScreen" value="false" /> |
422 | <property name="list.type.of.created.stylesheet" value="CSS" /> | 339 | <property name="list.type.of.created.stylesheet" value="CSS" /> |
340 | + <property name="dynamic.classpath" value="false" /> | ||
341 | + <property name="OverrideImplement.combined" value="true" /> | ||
342 | + <property name="OverrideImplement.overriding.sorted" value="false" /> | ||
343 | + <property name="extract.method.default.visibility" value="private" /> | ||
423 | </component> | 344 | </component> |
424 | <component name="RecentsManager"> | 345 | <component name="RecentsManager"> |
346 | + <key name="CopyClassDialog.RECENTS_KEY"> | ||
347 | + <recent name="com.canrd.patent.web" /> | ||
348 | + </key> | ||
425 | <key name="CopyFile.RECENT_KEYS"> | 349 | <key name="CopyFile.RECENT_KEYS"> |
350 | + <recent name="$PROJECT_DIR$/src/main/webapp/css" /> | ||
426 | <recent name="$PROJECT_DIR$/src/main/webapp/include" /> | 351 | <recent name="$PROJECT_DIR$/src/main/webapp/include" /> |
427 | <recent name="$PROJECT_DIR$/src/main/webapp" /> | 352 | <recent name="$PROJECT_DIR$/src/main/webapp" /> |
428 | </key> | 353 | </key> |
@@ -433,6 +358,66 @@ | @@ -433,6 +358,66 @@ | ||
433 | </key> | 358 | </key> |
434 | </component> | 359 | </component> |
435 | <component name="RunManager" selected="Tomcat Server.patent"> | 360 | <component name="RunManager" selected="Tomcat Server.patent"> |
361 | + <configuration default="false" name="CaseTypeEnum" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | ||
362 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> | ||
363 | + <pattern> | ||
364 | + <option name="PATTERN" value="com.canrd.patent.dal.enums.*" /> | ||
365 | + <option name="ENABLED" value="true" /> | ||
366 | + </pattern> | ||
367 | + </extension> | ||
368 | + <option name="MAIN_CLASS_NAME" value="com.canrd.patent.dal.enums.CaseTypeEnum" /> | ||
369 | + <option name="VM_PARAMETERS" /> | ||
370 | + <option name="PROGRAM_PARAMETERS" /> | ||
371 | + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> | ||
372 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
373 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
374 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
375 | + <option name="ENV_VARIABLES" /> | ||
376 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
377 | + <module name="patent" /> | ||
378 | + <envs /> | ||
379 | + <method /> | ||
380 | + </configuration> | ||
381 | + <configuration default="false" name="TextUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | ||
382 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> | ||
383 | + <pattern> | ||
384 | + <option name="PATTERN" value="com.canrd.patent.common.utils.*" /> | ||
385 | + <option name="ENABLED" value="true" /> | ||
386 | + </pattern> | ||
387 | + </extension> | ||
388 | + <option name="MAIN_CLASS_NAME" value="com.canrd.patent.common.utils.TextUtils" /> | ||
389 | + <option name="VM_PARAMETERS" /> | ||
390 | + <option name="PROGRAM_PARAMETERS" /> | ||
391 | + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> | ||
392 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
393 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
394 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
395 | + <option name="ENV_VARIABLES" /> | ||
396 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
397 | + <module name="patent" /> | ||
398 | + <envs /> | ||
399 | + <method /> | ||
400 | + </configuration> | ||
401 | + <configuration default="false" name="HomePatentService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | ||
402 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> | ||
403 | + <pattern> | ||
404 | + <option name="PATTERN" value="com.canrd.patent.service.*" /> | ||
405 | + <option name="ENABLED" value="true" /> | ||
406 | + </pattern> | ||
407 | + </extension> | ||
408 | + <option name="MAIN_CLASS_NAME" value="com.canrd.patent.service.HomePatentService" /> | ||
409 | + <option name="VM_PARAMETERS" /> | ||
410 | + <option name="PROGRAM_PARAMETERS" /> | ||
411 | + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> | ||
412 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
413 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
414 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
415 | + <option name="ENV_VARIABLES" /> | ||
416 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
417 | + <module name="patent" /> | ||
418 | + <envs /> | ||
419 | + <method /> | ||
420 | + </configuration> | ||
436 | <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false"> | 421 | <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false"> |
437 | <deployment /> | 422 | <deployment /> |
438 | <server-settings /> | 423 | <server-settings /> |
@@ -636,6 +621,28 @@ | @@ -636,6 +621,28 @@ | ||
636 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> | 621 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> |
637 | <method /> | 622 | <method /> |
638 | </configuration> | 623 | </configuration> |
624 | + <configuration default="true" type="MavenRunConfiguration" factoryName="Maven"> | ||
625 | + <MavenSettings> | ||
626 | + <option name="myGeneralSettings" /> | ||
627 | + <option name="myRunnerSettings" /> | ||
628 | + <option name="myRunnerParameters"> | ||
629 | + <MavenRunnerParameters> | ||
630 | + <option name="profiles"> | ||
631 | + <set /> | ||
632 | + </option> | ||
633 | + <option name="goals"> | ||
634 | + <list /> | ||
635 | + </option> | ||
636 | + <option name="profilesMap"> | ||
637 | + <map /> | ||
638 | + </option> | ||
639 | + <option name="resolveToWorkspace" value="false" /> | ||
640 | + <option name="workingDirPath" value="" /> | ||
641 | + </MavenRunnerParameters> | ||
642 | + </option> | ||
643 | + </MavenSettings> | ||
644 | + <method /> | ||
645 | + </configuration> | ||
639 | <configuration default="true" type="Remote" factoryName="Remote"> | 646 | <configuration default="true" type="Remote" factoryName="Remote"> |
640 | <option name="USE_SOCKET_TRANSPORT" value="true" /> | 647 | <option name="USE_SOCKET_TRANSPORT" value="true" /> |
641 | <option name="SERVER_MODE" value="false" /> | 648 | <option name="SERVER_MODE" value="false" /> |
@@ -765,9 +772,19 @@ | @@ -765,9 +772,19 @@ | ||
765 | </option> | 772 | </option> |
766 | </method> | 773 | </method> |
767 | </configuration> | 774 | </configuration> |
768 | - <list size="1"> | 775 | + <list size="4"> |
769 | <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" /> | 776 | <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" /> |
777 | + <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" /> | ||
778 | + <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" /> | ||
779 | + <item index="3" class="java.lang.String" itemvalue="Application.HomePatentService" /> | ||
770 | </list> | 780 | </list> |
781 | + <recent_temporary> | ||
782 | + <list size="3"> | ||
783 | + <item index="0" class="java.lang.String" itemvalue="Application.HomePatentService" /> | ||
784 | + <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" /> | ||
785 | + <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" /> | ||
786 | + </list> | ||
787 | + </recent_temporary> | ||
771 | </component> | 788 | </component> |
772 | <component name="ShelveChangesManager" show_recycled="false" /> | 789 | <component name="ShelveChangesManager" show_recycled="false" /> |
773 | <component name="SvnConfiguration"> | 790 | <component name="SvnConfiguration"> |
@@ -783,44 +800,76 @@ | @@ -783,44 +800,76 @@ | ||
783 | <workItem from="1468234772794" duration="330000" /> | 800 | <workItem from="1468234772794" duration="330000" /> |
784 | <workItem from="1468239559791" duration="4887000" /> | 801 | <workItem from="1468239559791" duration="4887000" /> |
785 | <workItem from="1468299389349" duration="3387000" /> | 802 | <workItem from="1468299389349" duration="3387000" /> |
786 | - <workItem from="1468337930753" duration="4823000" /> | 803 | + <workItem from="1468337930753" duration="8151000" /> |
804 | + <workItem from="1468542212525" duration="929000" /> | ||
805 | + <workItem from="1468640565571" duration="23833000" /> | ||
806 | + <workItem from="1468748693910" duration="7618000" /> | ||
807 | + <workItem from="1468885739175" duration="7592000" /> | ||
787 | </task> | 808 | </task> |
788 | <servers /> | 809 | <servers /> |
789 | </component> | 810 | </component> |
790 | <component name="TimeTrackingManager"> | 811 | <component name="TimeTrackingManager"> |
791 | - <option name="totallyTimeSpent" value="14476000" /> | 812 | + <option name="totallyTimeSpent" value="57776000" /> |
792 | </component> | 813 | </component> |
793 | <component name="ToolWindowManager"> | 814 | <component name="ToolWindowManager"> |
794 | - <frame x="0" y="23" width="1280" height="732" extended-state="0" /> | ||
795 | - <editor active="false" /> | 815 | + <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> |
816 | + <editor active="true" /> | ||
796 | <layout> | 817 | <layout> |
797 | <window_info id="Palette	" 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" /> | 818 | <window_info id="Palette	" 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" /> |
798 | <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" /> | 819 | <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" /> |
799 | <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" /> | 820 | <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" /> |
800 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.61139894" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 821 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3421875" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
801 | <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" /> | 822 | <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" /> |
802 | - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4078125" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 823 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4484375" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
803 | <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" /> | 824 | <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" /> |
804 | <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" /> | 825 | <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" /> |
805 | <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" /> | 826 | <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" /> |
806 | - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 827 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49637306" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
807 | <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" /> | 828 | <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" /> |
808 | <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" /> | 829 | <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" /> |
809 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 830 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
810 | - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5264249" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 831 | + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31813473" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
811 | <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" /> | 832 | <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" /> |
812 | <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" /> | 833 | <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" /> |
813 | <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" /> | 834 | <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" /> |
814 | - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.0726979" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 835 | + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.08642972" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
815 | <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" /> | 836 | <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" /> |
816 | - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1987076" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | ||
817 | - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 837 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13312034" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
838 | + <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" /> | ||
818 | <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" /> | 839 | <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" /> |
819 | <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" /> | 840 | <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" /> |
820 | <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" /> | 841 | <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" /> |
821 | <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" /> | 842 | <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" /> |
822 | <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" /> | 843 | <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" /> |
823 | </layout> | 844 | </layout> |
845 | + <layout-to-restore> | ||
846 | + <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" /> | ||
847 | + <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
848 | + <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" /> | ||
849 | + <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" /> | ||
850 | + <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" /> | ||
851 | + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> | ||
852 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | ||
853 | + <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" /> | ||
854 | + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> | ||
855 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24313408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | ||
856 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
857 | + <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" /> | ||
858 | + <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" /> | ||
859 | + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | ||
860 | + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | ||
861 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.140625" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> | ||
862 | + <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" /> | ||
863 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.528125" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
864 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.090625" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
865 | + <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="4" side_tool="true" content_ui="tabs" /> | ||
866 | + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26943004" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> | ||
867 | + <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="5" side_tool="true" content_ui="tabs" /> | ||
868 | + <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" /> | ||
869 | + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.08642972" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | ||
870 | + <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" /> | ||
871 | + <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" /> | ||
872 | + </layout-to-restore> | ||
824 | </component> | 873 | </component> |
825 | <component name="Vcs.Log.UiProperties"> | 874 | <component name="Vcs.Log.UiProperties"> |
826 | <option name="RECENTLY_FILTERED_USER_GROUPS"> | 875 | <option name="RECENTLY_FILTERED_USER_GROUPS"> |
@@ -835,413 +884,475 @@ | @@ -835,413 +884,475 @@ | ||
835 | </component> | 884 | </component> |
836 | <component name="XDebuggerManager"> | 885 | <component name="XDebuggerManager"> |
837 | <breakpoint-manager> | 886 | <breakpoint-manager> |
838 | - <option name="time" value="4" /> | 887 | + <option name="time" value="14" /> |
839 | </breakpoint-manager> | 888 | </breakpoint-manager> |
840 | - <watches-manager /> | 889 | + <watches-manager> |
890 | + <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory"> | ||
891 | + <watch expression="ReduceTypeEnum.valueOf(reduceType)" language="JAVA" custom="" /> | ||
892 | + <watch expression="TextUtils.isNotEmpty(reduceType)" language="JAVA" custom="" /> | ||
893 | + <watch expression="caseTypeEnum.name()+serviceTypeEnum.name()+paidTypeEnum.name()+reduceTypeEnum.name()" language="JAVA" custom="" /> | ||
894 | + <watch expression="CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name()" language="JAVA" custom="" /> | ||
895 | + </configuration> | ||
896 | + </watches-manager> | ||
841 | </component> | 897 | </component> |
842 | <component name="antWorkspaceConfiguration"> | 898 | <component name="antWorkspaceConfiguration"> |
843 | <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | 899 | <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> |
844 | <option name="FILTER_TARGETS" value="false" /> | 900 | <option name="FILTER_TARGETS" value="false" /> |
845 | </component> | 901 | </component> |
846 | <component name="editorHistoryManager"> | 902 | <component name="editorHistoryManager"> |
847 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml"> | 903 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> |
848 | <provider selected="true" editor-type-id="text-editor"> | 904 | <provider selected="true" editor-type-id="text-editor"> |
849 | <state vertical-scroll-proportion="0.0"> | 905 | <state vertical-scroll-proportion="0.0"> |
850 | - <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" /> | 906 | + <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" /> |
851 | <folding /> | 907 | <folding /> |
852 | </state> | 908 | </state> |
853 | </provider> | 909 | </provider> |
854 | </entry> | 910 | </entry> |
855 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | 911 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/alipay.properties"> |
856 | <provider selected="true" editor-type-id="text-editor"> | 912 | <provider selected="true" editor-type-id="text-editor"> |
857 | <state vertical-scroll-proportion="0.0"> | 913 | <state vertical-scroll-proportion="0.0"> |
858 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 914 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
859 | - <folding /> | ||
860 | </state> | 915 | </state> |
861 | </provider> | 916 | </provider> |
862 | </entry> | 917 | </entry> |
863 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-manage.jsp"> | 918 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> |
864 | <provider selected="true" editor-type-id="text-editor"> | 919 | <provider selected="true" editor-type-id="text-editor"> |
865 | <state vertical-scroll-proportion="0.0"> | 920 | <state vertical-scroll-proportion="0.0"> |
866 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
867 | - <folding /> | 921 | + <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" /> |
868 | </state> | 922 | </state> |
869 | </provider> | 923 | </provider> |
870 | </entry> | 924 | </entry> |
871 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/resources/style.css"> | 925 | + <entry file="file://$PROJECT_DIR$/pom.xml"> |
872 | <provider selected="true" editor-type-id="text-editor"> | 926 | <provider selected="true" editor-type-id="text-editor"> |
873 | <state vertical-scroll-proportion="0.0"> | 927 | <state vertical-scroll-proportion="0.0"> |
874 | - <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" /> | 928 | + <caret line="529" column="25" selection-start-line="529" selection-start-column="25" selection-end-line="529" selection-end-column="25" /> |
929 | + <folding /> | ||
875 | </state> | 930 | </state> |
876 | </provider> | 931 | </provider> |
877 | </entry> | 932 | </entry> |
878 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> | 933 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml"> |
879 | <provider selected="true" editor-type-id="text-editor"> | 934 | <provider selected="true" editor-type-id="text-editor"> |
880 | <state vertical-scroll-proportion="0.0"> | 935 | <state vertical-scroll-proportion="0.0"> |
881 | - <caret line="45" column="33" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="33" /> | ||
882 | - <folding /> | 936 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
883 | </state> | 937 | </state> |
884 | </provider> | 938 | </provider> |
885 | </entry> | 939 | </entry> |
886 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> | 940 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/TestModel.java"> |
887 | <provider selected="true" editor-type-id="text-editor"> | 941 | <provider selected="true" editor-type-id="text-editor"> |
888 | <state vertical-scroll-proportion="0.0"> | 942 | <state vertical-scroll-proportion="0.0"> |
889 | - <caret line="14" column="7" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" /> | ||
890 | - <folding> | ||
891 | - <element signature="e#764#765#0" expanded="true" /> | ||
892 | - <element signature="e#812#813#0" expanded="true" /> | ||
893 | - </folding> | 943 | + <caret line="0" column="31" selection-start-line="0" selection-start-column="31" selection-end-line="0" selection-end-column="31" /> |
894 | </state> | 944 | </state> |
895 | </provider> | 945 | </provider> |
896 | </entry> | 946 | </entry> |
897 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-detail.jsp"> | 947 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml"> |
898 | <provider selected="true" editor-type-id="text-editor"> | 948 | <provider selected="true" editor-type-id="text-editor"> |
899 | <state vertical-scroll-proportion="0.0"> | 949 | <state vertical-scroll-proportion="0.0"> |
900 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 950 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
901 | - <folding /> | ||
902 | </state> | 951 | </state> |
903 | </provider> | 952 | </provider> |
904 | </entry> | 953 | </entry> |
905 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> | 954 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java"> |
906 | <provider selected="true" editor-type-id="text-editor"> | 955 | <provider selected="true" editor-type-id="text-editor"> |
907 | <state vertical-scroll-proportion="0.0"> | 956 | <state vertical-scroll-proportion="0.0"> |
908 | - <caret line="211" column="0" selection-start-line="211" selection-start-column="0" selection-end-line="211" selection-end-column="0" /> | ||
909 | - <folding /> | 957 | + <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> |
910 | </state> | 958 | </state> |
911 | </provider> | 959 | </provider> |
912 | </entry> | 960 | </entry> |
913 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | 961 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/TessEnum.java"> |
914 | <provider selected="true" editor-type-id="text-editor"> | 962 | <provider selected="true" editor-type-id="text-editor"> |
915 | <state vertical-scroll-proportion="0.0"> | 963 | <state vertical-scroll-proportion="0.0"> |
916 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 964 | + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> |
917 | </state> | 965 | </state> |
918 | </provider> | 966 | </provider> |
919 | </entry> | 967 | </entry> |
920 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | 968 | + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/src.zip!/java/lang/String.java"> |
921 | <provider selected="true" editor-type-id="text-editor"> | 969 | <provider selected="true" editor-type-id="text-editor"> |
922 | <state vertical-scroll-proportion="0.0"> | 970 | <state vertical-scroll-proportion="0.0"> |
923 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
924 | - <folding /> | 971 | + <caret line="2980" column="25" selection-start-line="2980" selection-start-column="25" selection-end-line="2980" selection-end-column="25" /> |
972 | + <folding> | ||
973 | + <element signature="e#117557#117558#0" expanded="false" /> | ||
974 | + <element signature="e#117619#117620#0" expanded="false" /> | ||
975 | + </folding> | ||
925 | </state> | 976 | </state> |
926 | </provider> | 977 | </provider> |
927 | </entry> | 978 | </entry> |
928 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/service/TestMail.java"> | 979 | + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/src.zip!/java/lang/Enum.java"> |
929 | <provider selected="true" editor-type-id="text-editor"> | 980 | <provider selected="true" editor-type-id="text-editor"> |
930 | <state vertical-scroll-proportion="0.0"> | 981 | <state vertical-scroll-proportion="0.0"> |
931 | - <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" /> | 982 | + <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" /> |
932 | </state> | 983 | </state> |
933 | </provider> | 984 | </provider> |
934 | </entry> | 985 | </entry> |
935 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java"> | 986 | + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/StringUtils.java"> |
936 | <provider selected="true" editor-type-id="text-editor"> | 987 | <provider selected="true" editor-type-id="text-editor"> |
937 | <state vertical-scroll-proportion="0.0"> | 988 | <state vertical-scroll-proportion="0.0"> |
938 | - <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" /> | 989 | + <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" /> |
939 | </state> | 990 | </state> |
940 | </provider> | 991 | </provider> |
941 | </entry> | 992 | </entry> |
942 | - <entry file="file://$PROJECT_DIR$/README.md"> | 993 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> |
943 | <provider selected="true" editor-type-id="text-editor"> | 994 | <provider selected="true" editor-type-id="text-editor"> |
944 | <state vertical-scroll-proportion="0.0"> | 995 | <state vertical-scroll-proportion="0.0"> |
945 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 996 | + <caret line="111" column="73" selection-start-line="111" selection-start-column="73" selection-end-line="111" selection-end-column="73" /> |
946 | </state> | 997 | </state> |
947 | </provider> | 998 | </provider> |
948 | </entry> | 999 | </entry> |
949 | - <entry file="file://$PROJECT_DIR$/patent.iml"> | 1000 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> |
950 | <provider selected="true" editor-type-id="text-editor"> | 1001 | <provider selected="true" editor-type-id="text-editor"> |
951 | <state vertical-scroll-proportion="0.0"> | 1002 | <state vertical-scroll-proportion="0.0"> |
952 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1003 | + <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" /> |
953 | </state> | 1004 | </state> |
954 | </provider> | 1005 | </provider> |
955 | </entry> | 1006 | </entry> |
956 | - <entry file="file://$PROJECT_DIR$/core.iml"> | 1007 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml"> |
957 | <provider selected="true" editor-type-id="text-editor"> | 1008 | <provider selected="true" editor-type-id="text-editor"> |
958 | - <state vertical-scroll-proportion="0.0"> | ||
959 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1009 | + <state vertical-scroll-proportion="-8.333333"> |
1010 | + <caret line="15" column="44" selection-start-line="15" selection-start-column="44" selection-end-line="15" selection-end-column="44" /> | ||
1011 | + <folding /> | ||
960 | </state> | 1012 | </state> |
961 | </provider> | 1013 | </provider> |
962 | </entry> | 1014 | </entry> |
963 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | 1015 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"> |
964 | <provider selected="true" editor-type-id="text-editor"> | 1016 | <provider selected="true" editor-type-id="text-editor"> |
965 | <state vertical-scroll-proportion="0.0"> | 1017 | <state vertical-scroll-proportion="0.0"> |
966 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1018 | + <caret line="23" column="42" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" /> |
967 | <folding /> | 1019 | <folding /> |
968 | </state> | 1020 | </state> |
969 | </provider> | 1021 | </provider> |
970 | </entry> | 1022 | </entry> |
971 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/service/TestMail.java"> | 1023 | + <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml"> |
972 | <provider selected="true" editor-type-id="text-editor"> | 1024 | <provider selected="true" editor-type-id="text-editor"> |
973 | <state vertical-scroll-proportion="0.0"> | 1025 | <state vertical-scroll-proportion="0.0"> |
974 | - <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" /> | 1026 | + <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" /> |
1027 | + <folding /> | ||
975 | </state> | 1028 | </state> |
976 | </provider> | 1029 | </provider> |
977 | </entry> | 1030 | </entry> |
978 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java"> | 1031 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/case-detail.jsp"> |
979 | <provider selected="true" editor-type-id="text-editor"> | 1032 | <provider selected="true" editor-type-id="text-editor"> |
980 | - <state vertical-scroll-proportion="0.0"> | ||
981 | - <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" /> | 1033 | + <state vertical-scroll-proportion="-3.75"> |
1034 | + <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" /> | ||
1035 | + <folding /> | ||
982 | </state> | 1036 | </state> |
983 | </provider> | 1037 | </provider> |
984 | </entry> | 1038 | </entry> |
985 | - <entry file="file://$PROJECT_DIR$/README.md"> | 1039 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp"> |
986 | <provider selected="true" editor-type-id="text-editor"> | 1040 | <provider selected="true" editor-type-id="text-editor"> |
987 | - <state vertical-scroll-proportion="0.0"> | ||
988 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1041 | + <state vertical-scroll-proportion="-78.916664"> |
1042 | + <caret line="231" column="61" selection-start-line="231" selection-start-column="61" selection-end-line="231" selection-end-column="61" /> | ||
1043 | + <folding /> | ||
989 | </state> | 1044 | </state> |
990 | </provider> | 1045 | </provider> |
991 | </entry> | 1046 | </entry> |
992 | - <entry file="file://$PROJECT_DIR$/patent.iml"> | 1047 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java"> |
993 | <provider selected="true" editor-type-id="text-editor"> | 1048 | <provider selected="true" editor-type-id="text-editor"> |
994 | <state vertical-scroll-proportion="0.0"> | 1049 | <state vertical-scroll-proportion="0.0"> |
995 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1050 | + <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="10" selection-end-column="31" /> |
1051 | + <folding /> | ||
996 | </state> | 1052 | </state> |
997 | </provider> | 1053 | </provider> |
998 | </entry> | 1054 | </entry> |
999 | - <entry file="file://$PROJECT_DIR$/core.iml"> | 1055 | + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.2.3.RELEASE/spring-tx-4.2.3.RELEASE.jar!/org/springframework/transaction/annotation/Transactional.class"> |
1000 | <provider selected="true" editor-type-id="text-editor"> | 1056 | <provider selected="true" editor-type-id="text-editor"> |
1001 | - <state vertical-scroll-proportion="0.0"> | ||
1002 | - <caret line="25" column="49" selection-start-line="25" selection-start-column="49" selection-end-line="25" selection-end-column="49" /> | 1057 | + <state vertical-scroll-proportion="-5.5555553"> |
1058 | + <caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" /> | ||
1003 | </state> | 1059 | </state> |
1004 | </provider> | 1060 | </provider> |
1005 | </entry> | 1061 | </entry> |
1006 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/service/TestMail.java"> | 1062 | + <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql"> |
1063 | + <provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider"> | ||
1064 | + <state /> | ||
1065 | + </provider> | ||
1007 | <provider selected="true" editor-type-id="text-editor"> | 1066 | <provider selected="true" editor-type-id="text-editor"> |
1008 | - <state vertical-scroll-proportion="0.0"> | ||
1009 | - <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" /> | 1067 | + <state vertical-scroll-proportion="-1.1111112"> |
1068 | + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" /> | ||
1010 | </state> | 1069 | </state> |
1011 | </provider> | 1070 | </provider> |
1012 | </entry> | 1071 | </entry> |
1013 | - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java"> | 1072 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java"> |
1014 | <provider selected="true" editor-type-id="text-editor"> | 1073 | <provider selected="true" editor-type-id="text-editor"> |
1015 | <state vertical-scroll-proportion="0.0"> | 1074 | <state vertical-scroll-proportion="0.0"> |
1016 | - <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" /> | 1075 | + <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" /> |
1017 | </state> | 1076 | </state> |
1018 | </provider> | 1077 | </provider> |
1019 | </entry> | 1078 | </entry> |
1020 | - <entry file="file://$PROJECT_DIR$/README.md"> | 1079 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css"> |
1021 | <provider selected="true" editor-type-id="text-editor"> | 1080 | <provider selected="true" editor-type-id="text-editor"> |
1022 | <state vertical-scroll-proportion="0.0"> | 1081 | <state vertical-scroll-proportion="0.0"> |
1023 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1082 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
1024 | </state> | 1083 | </state> |
1025 | </provider> | 1084 | </provider> |
1026 | </entry> | 1085 | </entry> |
1027 | - <entry file="file://$PROJECT_DIR$/patent.iml"> | 1086 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css"> |
1028 | <provider selected="true" editor-type-id="text-editor"> | 1087 | <provider selected="true" editor-type-id="text-editor"> |
1029 | <state vertical-scroll-proportion="0.0"> | 1088 | <state vertical-scroll-proportion="0.0"> |
1030 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1089 | + <caret line="89" column="16" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" /> |
1031 | </state> | 1090 | </state> |
1032 | </provider> | 1091 | </provider> |
1033 | </entry> | 1092 | </entry> |
1034 | - <entry file="file://$PROJECT_DIR$/core.iml"> | 1093 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp"> |
1035 | <provider selected="true" editor-type-id="text-editor"> | 1094 | <provider selected="true" editor-type-id="text-editor"> |
1036 | <state vertical-scroll-proportion="0.0"> | 1095 | <state vertical-scroll-proportion="0.0"> |
1037 | - <caret line="25" column="49" selection-start-line="25" selection-start-column="49" selection-end-line="25" selection-end-column="49" /> | 1096 | + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" /> |
1097 | + <folding /> | ||
1038 | </state> | 1098 | </state> |
1039 | </provider> | 1099 | </provider> |
1040 | </entry> | 1100 | </entry> |
1041 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.2.3.RELEASE/spring-webmvc-4.2.3.RELEASE.jar!/org/springframework/web/servlet/view/InternalResourceViewResolver.class"> | 1101 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp"> |
1042 | <provider selected="true" editor-type-id="text-editor"> | 1102 | <provider selected="true" editor-type-id="text-editor"> |
1043 | - <state vertical-scroll-proportion="-3.3333333"> | ||
1044 | - <caret line="13" column="41" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="41" /> | 1103 | + <state vertical-scroll-proportion="0.0"> |
1104 | + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="62" /> | ||
1105 | + <folding /> | ||
1045 | </state> | 1106 | </state> |
1046 | </provider> | 1107 | </provider> |
1047 | </entry> | 1108 | </entry> |
1048 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.2.3.RELEASE/spring-webmvc-4.2.3.RELEASE-sources.jar!/org/springframework/web/servlet/view/InternalResourceViewResolver.java"> | 1109 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css"> |
1049 | <provider selected="true" editor-type-id="text-editor"> | 1110 | <provider selected="true" editor-type-id="text-editor"> |
1050 | <state vertical-scroll-proportion="0.0"> | 1111 | <state vertical-scroll-proportion="0.0"> |
1051 | - <caret line="47" column="13" selection-start-line="47" selection-start-column="13" selection-end-line="47" selection-end-column="13" /> | 1112 | + <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="101" selection-end-column="1" /> |
1052 | </state> | 1113 | </state> |
1053 | </provider> | 1114 | </provider> |
1054 | </entry> | 1115 | </entry> |
1055 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"> | 1116 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js"> |
1056 | <provider selected="true" editor-type-id="text-editor"> | 1117 | <provider selected="true" editor-type-id="text-editor"> |
1057 | <state vertical-scroll-proportion="0.0"> | 1118 | <state vertical-scroll-proportion="0.0"> |
1058 | - <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" /> | ||
1059 | - <folding /> | 1119 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
1060 | </state> | 1120 | </state> |
1061 | </provider> | 1121 | </provider> |
1062 | </entry> | 1122 | </entry> |
1063 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | 1123 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> |
1064 | <provider selected="true" editor-type-id="text-editor"> | 1124 | <provider selected="true" editor-type-id="text-editor"> |
1065 | - <state vertical-scroll-proportion="-9.666667"> | ||
1066 | - <caret line="538" column="25" selection-start-line="538" selection-start-column="25" selection-end-line="538" selection-end-column="25" /> | 1125 | + <state vertical-scroll-proportion="-1.875"> |
1126 | + <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> | ||
1067 | <folding /> | 1127 | <folding /> |
1068 | </state> | 1128 | </state> |
1069 | </provider> | 1129 | </provider> |
1070 | </entry> | 1130 | </entry> |
1071 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/interceptor/Interceptor.java"> | 1131 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java"> |
1072 | <provider selected="true" editor-type-id="text-editor"> | 1132 | <provider selected="true" editor-type-id="text-editor"> |
1073 | <state vertical-scroll-proportion="0.0"> | 1133 | <state vertical-scroll-proportion="0.0"> |
1074 | - <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 1134 | + <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> |
1135 | + <folding /> | ||
1075 | </state> | 1136 | </state> |
1076 | </provider> | 1137 | </provider> |
1077 | </entry> | 1138 | </entry> |
1078 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/resources/style.css"> | 1139 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/case-manage.jsp"> |
1079 | <provider selected="true" editor-type-id="text-editor"> | 1140 | <provider selected="true" editor-type-id="text-editor"> |
1080 | - <state vertical-scroll-proportion="0.0"> | ||
1081 | - <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" /> | 1141 | + <state vertical-scroll-proportion="7.9166665"> |
1142 | + <caret line="197" column="60" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" /> | ||
1143 | + <folding /> | ||
1082 | </state> | 1144 | </state> |
1083 | </provider> | 1145 | </provider> |
1084 | </entry> | 1146 | </entry> |
1085 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | 1147 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> |
1086 | <provider selected="true" editor-type-id="text-editor"> | 1148 | <provider selected="true" editor-type-id="text-editor"> |
1087 | - <state vertical-scroll-proportion="0.0"> | ||
1088 | - <caret line="6" column="30" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" /> | 1149 | + <state vertical-scroll-proportion="-1.3333334"> |
1150 | + <caret line="116" column="19" selection-start-line="116" selection-start-column="19" selection-end-line="116" selection-end-column="19" /> | ||
1151 | + <folding /> | ||
1089 | </state> | 1152 | </state> |
1090 | </provider> | 1153 | </provider> |
1091 | </entry> | 1154 | </entry> |
1092 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/service.css"> | 1155 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> |
1093 | <provider selected="true" editor-type-id="text-editor"> | 1156 | <provider selected="true" editor-type-id="text-editor"> |
1094 | <state vertical-scroll-proportion="0.0"> | 1157 | <state vertical-scroll-proportion="0.0"> |
1095 | - <caret line="120" column="21" selection-start-line="120" selection-start-column="21" selection-end-line="120" selection-end-column="21" /> | ||
1096 | - <folding /> | 1158 | + <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" /> |
1097 | </state> | 1159 | </state> |
1098 | </provider> | 1160 | </provider> |
1099 | </entry> | 1161 | </entry> |
1100 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml"> | 1162 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java"> |
1101 | <provider selected="true" editor-type-id="text-editor"> | 1163 | <provider selected="true" editor-type-id="text-editor"> |
1102 | <state vertical-scroll-proportion="0.0"> | 1164 | <state vertical-scroll-proportion="0.0"> |
1103 | - <caret line="15" column="44" selection-start-line="15" selection-start-column="44" selection-end-line="15" selection-end-column="44" /> | ||
1104 | - <folding /> | 1165 | + <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" /> |
1166 | + <folding> | ||
1167 | + <element signature="e#861#862#0" expanded="false" /> | ||
1168 | + <element signature="e#894#895#0" expanded="false" /> | ||
1169 | + <element signature="e#931#932#0" expanded="false" /> | ||
1170 | + <element signature="e#967#968#0" expanded="false" /> | ||
1171 | + <element signature="e#1002#1003#0" expanded="false" /> | ||
1172 | + <element signature="e#1037#1038#0" expanded="false" /> | ||
1173 | + <element signature="e#1081#1082#0" expanded="false" /> | ||
1174 | + <element signature="e#1121#1122#0" expanded="false" /> | ||
1175 | + <element signature="e#1666#1667#0" expanded="false" /> | ||
1176 | + <element signature="e#1699#1700#0" expanded="false" /> | ||
1177 | + <element signature="e#1736#1737#0" expanded="false" /> | ||
1178 | + <element signature="e#1772#1773#0" expanded="false" /> | ||
1179 | + <element signature="e#1807#1808#0" expanded="false" /> | ||
1180 | + <element signature="e#1842#1843#0" expanded="false" /> | ||
1181 | + <element signature="e#1886#1887#0" expanded="false" /> | ||
1182 | + <element signature="e#1926#1927#0" expanded="false" /> | ||
1183 | + <element signature="e#2278#2279#0" expanded="false" /> | ||
1184 | + <element signature="e#2311#2312#0" expanded="false" /> | ||
1185 | + <element signature="e#2348#2349#0" expanded="false" /> | ||
1186 | + <element signature="e#2384#2385#0" expanded="false" /> | ||
1187 | + <element signature="e#2419#2420#0" expanded="false" /> | ||
1188 | + <element signature="e#2454#2455#0" expanded="false" /> | ||
1189 | + <element signature="e#2498#2499#0" expanded="false" /> | ||
1190 | + <element signature="e#2538#2539#0" expanded="false" /> | ||
1191 | + <element signature="e#3116#3117#0" expanded="false" /> | ||
1192 | + <element signature="e#3153#3154#0" expanded="false" /> | ||
1193 | + <element signature="e#3189#3190#0" expanded="false" /> | ||
1194 | + <element signature="e#3224#3225#0" expanded="false" /> | ||
1195 | + <element signature="e#3259#3260#0" expanded="false" /> | ||
1196 | + <element signature="e#3303#3304#0" expanded="false" /> | ||
1197 | + <element signature="e#3343#3344#0" expanded="false" /> | ||
1198 | + </folding> | ||
1105 | </state> | 1199 | </state> |
1106 | </provider> | 1200 | </provider> |
1107 | </entry> | 1201 | </entry> |
1108 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css"> | 1202 | + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java"> |
1109 | <provider selected="true" editor-type-id="text-editor"> | 1203 | <provider selected="true" editor-type-id="text-editor"> |
1110 | <state vertical-scroll-proportion="0.0"> | 1204 | <state vertical-scroll-proportion="0.0"> |
1111 | - <caret line="89" column="16" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" /> | 1205 | + <caret line="89" column="23" selection-start-line="89" selection-start-column="23" selection-end-line="89" selection-end-column="23" /> |
1112 | <folding /> | 1206 | <folding /> |
1113 | </state> | 1207 | </state> |
1114 | </provider> | 1208 | </provider> |
1115 | </entry> | 1209 | </entry> |
1116 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp"> | 1210 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java"> |
1117 | <provider selected="true" editor-type-id="text-editor"> | 1211 | <provider selected="true" editor-type-id="text-editor"> |
1118 | - <state vertical-scroll-proportion="0.7794118"> | ||
1119 | - <caret line="53" column="6" selection-start-line="53" selection-start-column="6" selection-end-line="53" selection-end-column="6" /> | ||
1120 | - <folding /> | 1212 | + <state vertical-scroll-proportion="0.0"> |
1213 | + <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" /> | ||
1214 | + <folding> | ||
1215 | + <element signature="e#2334#2335#0" expanded="false" /> | ||
1216 | + <element signature="e#2389#2390#0" expanded="false" /> | ||
1217 | + </folding> | ||
1121 | </state> | 1218 | </state> |
1122 | </provider> | 1219 | </provider> |
1123 | </entry> | 1220 | </entry> |
1124 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp"> | 1221 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java"> |
1125 | <provider selected="true" editor-type-id="text-editor"> | 1222 | <provider selected="true" editor-type-id="text-editor"> |
1126 | - <state vertical-scroll-proportion="0.7352941"> | ||
1127 | - <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" /> | ||
1128 | - <folding /> | 1223 | + <state vertical-scroll-proportion="0.0"> |
1224 | + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | ||
1129 | </state> | 1225 | </state> |
1130 | </provider> | 1226 | </provider> |
1131 | </entry> | 1227 | </entry> |
1132 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-detail.jsp"> | 1228 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java"> |
1133 | <provider selected="true" editor-type-id="text-editor"> | 1229 | <provider selected="true" editor-type-id="text-editor"> |
1134 | - <state vertical-scroll-proportion="0.63235295"> | ||
1135 | - <caret line="247" column="0" selection-start-line="247" selection-start-column="0" selection-end-line="247" selection-end-column="54" /> | ||
1136 | - <folding /> | 1230 | + <state vertical-scroll-proportion="0.0"> |
1231 | + <caret line="55" column="24" selection-start-line="55" selection-start-column="24" selection-end-line="55" selection-end-column="24" /> | ||
1232 | + <folding> | ||
1233 | + <element signature="e#1351#1352#0" expanded="false" /> | ||
1234 | + <element signature="e#1419#1420#0" expanded="false" /> | ||
1235 | + </folding> | ||
1137 | </state> | 1236 | </state> |
1138 | </provider> | 1237 | </provider> |
1139 | </entry> | 1238 | </entry> |
1140 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-manage.jsp"> | 1239 | + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml"> |
1141 | <provider selected="true" editor-type-id="text-editor"> | 1240 | <provider selected="true" editor-type-id="text-editor"> |
1142 | - <state vertical-scroll-proportion="0.5955882"> | ||
1143 | - <caret line="231" column="6" selection-start-line="231" selection-start-column="6" selection-end-line="231" selection-end-column="6" /> | 1241 | + <state vertical-scroll-proportion="0.0"> |
1242 | + <caret line="50" column="118" selection-start-line="50" selection-start-column="13" selection-end-line="50" selection-end-column="204" /> | ||
1144 | <folding /> | 1243 | <folding /> |
1145 | </state> | 1244 | </state> |
1146 | </provider> | 1245 | </provider> |
1147 | </entry> | 1246 | </entry> |
1148 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> | 1247 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java"> |
1149 | <provider selected="true" editor-type-id="text-editor"> | 1248 | <provider selected="true" editor-type-id="text-editor"> |
1150 | - <state vertical-scroll-proportion="0.5588235"> | ||
1151 | - <caret line="161" column="54" selection-start-line="161" selection-start-column="54" selection-end-line="161" selection-end-column="54" /> | ||
1152 | - <folding /> | 1249 | + <state vertical-scroll-proportion="0.0"> |
1250 | + <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" /> | ||
1153 | </state> | 1251 | </state> |
1154 | </provider> | 1252 | </provider> |
1155 | </entry> | 1253 | </entry> |
1156 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp"> | 1254 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java"> |
1157 | <provider selected="true" editor-type-id="text-editor"> | 1255 | <provider selected="true" editor-type-id="text-editor"> |
1158 | - <state vertical-scroll-proportion="1.129902"> | ||
1159 | - <caret line="231" column="61" selection-start-line="231" selection-start-column="61" selection-end-line="231" selection-end-column="61" /> | ||
1160 | - <folding /> | 1256 | + <state vertical-scroll-proportion="0.0"> |
1257 | + <caret line="202" column="13" selection-start-line="202" selection-start-column="13" selection-end-line="202" selection-end-column="13" /> | ||
1161 | </state> | 1258 | </state> |
1162 | </provider> | 1259 | </provider> |
1163 | </entry> | 1260 | </entry> |
1164 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/alipay.properties"> | 1261 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java"> |
1165 | <provider selected="true" editor-type-id="text-editor"> | 1262 | <provider selected="true" editor-type-id="text-editor"> |
1166 | <state vertical-scroll-proportion="0.0"> | 1263 | <state vertical-scroll-proportion="0.0"> |
1167 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
1168 | - <folding /> | 1264 | + <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" /> |
1265 | + <folding> | ||
1266 | + <element signature="e#532#533#0" expanded="true" /> | ||
1267 | + <element signature="e#558#559#0" expanded="true" /> | ||
1268 | + <element signature="e#593#594#0" expanded="true" /> | ||
1269 | + <element signature="e#623#624#0" expanded="true" /> | ||
1270 | + <element signature="e#669#670#0" expanded="true" /> | ||
1271 | + <element signature="e#697#698#0" expanded="true" /> | ||
1272 | + <element signature="e#739#740#0" expanded="true" /> | ||
1273 | + <element signature="e#773#774#0" expanded="true" /> | ||
1274 | + <element signature="e#825#826#0" expanded="true" /> | ||
1275 | + <element signature="e#859#860#0" expanded="true" /> | ||
1276 | + <element signature="e#913#914#0" expanded="true" /> | ||
1277 | + <element signature="e#959#960#0" expanded="true" /> | ||
1278 | + </folding> | ||
1169 | </state> | 1279 | </state> |
1170 | </provider> | 1280 | </provider> |
1171 | </entry> | 1281 | </entry> |
1172 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/AlipayConstant.java"> | 1282 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java"> |
1173 | <provider selected="true" editor-type-id="text-editor"> | 1283 | <provider selected="true" editor-type-id="text-editor"> |
1174 | <state vertical-scroll-proportion="0.0"> | 1284 | <state vertical-scroll-proportion="0.0"> |
1175 | - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> | ||
1176 | - <folding /> | 1285 | + <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" /> |
1177 | </state> | 1286 | </state> |
1178 | </provider> | 1287 | </provider> |
1179 | </entry> | 1288 | </entry> |
1180 | - <entry file="file://$PROJECT_DIR$/src/main/resources.prod/props/application.properties"> | 1289 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java"> |
1181 | <provider selected="true" editor-type-id="text-editor"> | 1290 | <provider selected="true" editor-type-id="text-editor"> |
1182 | <state vertical-scroll-proportion="0.0"> | 1291 | <state vertical-scroll-proportion="0.0"> |
1183 | - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="13" /> | 1292 | + <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" /> |
1184 | <folding /> | 1293 | <folding /> |
1185 | </state> | 1294 | </state> |
1186 | </provider> | 1295 | </provider> |
1187 | </entry> | 1296 | </entry> |
1188 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> | 1297 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java"> |
1189 | <provider selected="true" editor-type-id="text-editor"> | 1298 | <provider selected="true" editor-type-id="text-editor"> |
1190 | <state vertical-scroll-proportion="0.0"> | 1299 | <state vertical-scroll-proportion="0.0"> |
1191 | - <caret line="45" column="33" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="33" /> | ||
1192 | - <folding /> | 1300 | + <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" /> |
1301 | + <folding> | ||
1302 | + <element signature="e#442#443#0" expanded="true" /> | ||
1303 | + <element signature="e#468#469#0" expanded="true" /> | ||
1304 | + <element signature="e#503#504#0" expanded="true" /> | ||
1305 | + <element signature="e#533#534#0" expanded="true" /> | ||
1306 | + <element signature="e#579#580#0" expanded="true" /> | ||
1307 | + <element signature="e#607#608#0" expanded="true" /> | ||
1308 | + <element signature="e#649#650#0" expanded="true" /> | ||
1309 | + <element signature="e#683#684#0" expanded="true" /> | ||
1310 | + <element signature="e#735#736#0" expanded="true" /> | ||
1311 | + <element signature="e#769#770#0" expanded="true" /> | ||
1312 | + <element signature="e#823#824#0" expanded="true" /> | ||
1313 | + <element signature="e#869#870#0" expanded="true" /> | ||
1314 | + </folding> | ||
1193 | </state> | 1315 | </state> |
1194 | </provider> | 1316 | </provider> |
1195 | </entry> | 1317 | </entry> |
1196 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java"> | 1318 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java"> |
1197 | <provider selected="true" editor-type-id="text-editor"> | 1319 | <provider selected="true" editor-type-id="text-editor"> |
1198 | <state vertical-scroll-proportion="0.0"> | 1320 | <state vertical-scroll-proportion="0.0"> |
1199 | - <caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" /> | 1321 | + <caret line="47" column="47" selection-start-line="47" selection-start-column="47" selection-end-line="47" selection-end-column="47" /> |
1200 | <folding> | 1322 | <folding> |
1201 | <element signature="imports" expanded="true" /> | 1323 | <element signature="imports" expanded="true" /> |
1202 | - <element signature="e#386#387#0" expanded="true" /> | ||
1203 | - <element signature="e#417#418#0" expanded="true" /> | ||
1204 | - <element signature="e#465#466#0" expanded="true" /> | ||
1205 | - <element signature="e#505#506#0" expanded="true" /> | ||
1206 | - <element signature="e#544#545#0" expanded="true" /> | ||
1207 | - <element signature="e#579#580#0" expanded="true" /> | ||
1208 | - <element signature="e#635#636#0" expanded="true" /> | ||
1209 | - <element signature="e#683#684#0" expanded="true" /> | ||
1210 | </folding> | 1324 | </folding> |
1211 | </state> | 1325 | </state> |
1212 | </provider> | 1326 | </provider> |
1213 | </entry> | 1327 | </entry> |
1214 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/application.properties"> | 1328 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> |
1215 | <provider selected="true" editor-type-id="text-editor"> | 1329 | <provider selected="true" editor-type-id="text-editor"> |
1216 | <state vertical-scroll-proportion="0.0"> | 1330 | <state vertical-scroll-proportion="0.0"> |
1217 | - <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="29" /> | 1331 | + <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" /> |
1218 | <folding /> | 1332 | <folding /> |
1219 | </state> | 1333 | </state> |
1220 | </provider> | 1334 | </provider> |
1221 | </entry> | 1335 | </entry> |
1222 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> | 1336 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> |
1223 | <provider selected="true" editor-type-id="text-editor"> | 1337 | <provider selected="true" editor-type-id="text-editor"> |
1224 | - <state vertical-scroll-proportion="0.0"> | ||
1225 | - <caret line="29" column="34" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="34" /> | ||
1226 | - <folding> | ||
1227 | - <element signature="e#764#765#0" expanded="true" /> | ||
1228 | - <element signature="e#812#813#0" expanded="true" /> | ||
1229 | - </folding> | 1338 | + <state vertical-scroll-proportion="-4.5882354"> |
1339 | + <caret line="215" column="41" selection-start-line="215" selection-start-column="41" selection-end-line="215" selection-end-column="41" /> | ||
1340 | + <folding /> | ||
1230 | </state> | 1341 | </state> |
1231 | </provider> | 1342 | </provider> |
1232 | </entry> | 1343 | </entry> |
1233 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | 1344 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java"> |
1234 | <provider selected="true" editor-type-id="text-editor"> | 1345 | <provider selected="true" editor-type-id="text-editor"> |
1235 | - <state vertical-scroll-proportion="-13.125"> | ||
1236 | - <caret line="29" column="60" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="60" /> | 1346 | + <state vertical-scroll-proportion="0.0"> |
1347 | + <caret line="57" column="52" selection-start-line="57" selection-start-column="52" selection-end-line="57" selection-end-column="52" /> | ||
1237 | <folding /> | 1348 | <folding /> |
1238 | </state> | 1349 | </state> |
1239 | </provider> | 1350 | </provider> |
1240 | </entry> | 1351 | </entry> |
1241 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> | 1352 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java"> |
1242 | <provider selected="true" editor-type-id="text-editor"> | 1353 | <provider selected="true" editor-type-id="text-editor"> |
1243 | - <state vertical-scroll-proportion="0.3480392"> | ||
1244 | - <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" /> | 1354 | + <state vertical-scroll-proportion="0.33187774"> |
1355 | + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> | ||
1245 | <folding /> | 1356 | <folding /> |
1246 | </state> | 1357 | </state> |
1247 | </provider> | 1358 | </provider> |
doc/.DS_Store
0 → 100644
No preview for this file type
doc/patent.mwb
No preview for this file type
doc/patent.mwb.bak
No preview for this file type
doc/sql/ddl.sql
1 | -#测试表 | ||
2 | -DROP TABLE IF EXISTS test; | ||
3 | -CREATE TABLE test( | ||
4 | - id int(4) PRIMARY KEY NOT NULL auto_increment COMMENT '产å“主键', | ||
5 | - name VARCHAR(128) NOT NULL COMMENT 'åç§°', | ||
6 | - age int(4) NOT NULL COMMENT '年龄' | ||
7 | -); | ||
8 | -INSERT INTO test(name,age) VALUES("A","1"); | 1 | +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; |
2 | +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; | ||
3 | +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; | ||
9 | 4 | ||
10 | -#mybatis测试表 | ||
11 | -DROP TABLE IF EXISTS mybatis_test; | ||
12 | -CREATE TABLE mybatis_test( | ||
13 | - id int(4) PRIMARY KEY NOT NULL auto_increment COMMENT '产å“主键', | ||
14 | - name VARCHAR(128) NOT NULL COMMENT 'åç§°', | ||
15 | - age int(4) NOT NULL COMMENT '年龄' | ||
16 | -); | ||
17 | -INSERT INTO mybatis_test(name,age) VALUES("C","111"); | 5 | +ALTER SCHEMA `patent` DEFAULT COLLATE utf8mb4_general_ci ; |
6 | + | ||
7 | +CREATE TABLE IF NOT EXISTS `patent`.`casement` ( | ||
8 | + `id` BIGINT(20) NOT NULL AUTO_INCREMENT, | ||
9 | + `name` VARCHAR(32) NULL DEFAULT NULL, | ||
10 | + `caseSn` VARCHAR(32) NOT NULL, | ||
11 | + `case_type` VARCHAR(32) NOT NULL COMMENT '呿˜Žç±»åž‹ï¼šINVE' /* comment truncated */ /*TION_TYPE | ||
12 | +实用新型:PRACTICAL_NEW | ||
13 | +外观设计:APPEARENCE_DESIGN | ||
14 | +呿˜Ž+新型:INVENTION_NEW*/, | ||
15 | + `service_type` VARCHAR(32) NOT NULL COMMENT 'æ ‡å‡†æœåŠ¡ï¼šSTANDE' /* comment truncated */ /*D_SERVICE | ||
16 | +æ‹…ä¿æŽˆæƒï¼šAUTHORITY_GUARANTEE*/, | ||
17 | + `paid_type` VARCHAR(32) NOT NULL COMMENT '缴纳ï' /* comment truncated */ /*šPAID | ||
18 | +ä¸ç¼´çº³ï¼šNO_PAID*/, | ||
19 | + `reduce_type` VARCHAR(32) NULL DEFAULT NULL, | ||
20 | + `expense` BIGINT(20) NOT NULL, | ||
21 | + `formula` VARCHAR(128) NULL DEFAULT NULL COMMENT '计算公å¼', | ||
22 | + PRIMARY KEY (`id`)) | ||
23 | +ENGINE = InnoDB | ||
24 | +DEFAULT CHARACTER SET = utf8mb4; | ||
25 | + | ||
26 | +ALTER TABLE `patent`.`test` | ||
27 | +COLLATE = utf8mb4_general_ci ; | ||
28 | + | ||
29 | +ALTER TABLE `patent`.`mybatis_test` | ||
30 | +COLLATE = utf8mb4_general_ci ; | ||
31 | + | ||
32 | + | ||
33 | +SET SQL_MODE=@OLD_SQL_MODE; | ||
34 | +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; | ||
35 | +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; |
pom.xml
@@ -515,15 +515,6 @@ | @@ -515,15 +515,6 @@ | ||
515 | </configuration> | 515 | </configuration> |
516 | </plugin> | 516 | </plugin> |
517 | <plugin> | 517 | <plugin> |
518 | - <groupId>org.mybatis.generator</groupId> | ||
519 | - <artifactId>mybatis-generator-maven-plugin</artifactId> | ||
520 | - <version>1.3.2</version> | ||
521 | - <configuration> | ||
522 | - <verbose>true</verbose> | ||
523 | - <overwrite>true</overwrite> | ||
524 | - </configuration> | ||
525 | - </plugin> | ||
526 | - <plugin> | ||
527 | <groupId>org.mortbay.jetty</groupId> | 518 | <groupId>org.mortbay.jetty</groupId> |
528 | <artifactId>maven-jetty-plugin</artifactId> | 519 | <artifactId>maven-jetty-plugin</artifactId> |
529 | <version>6.1.19</version> | 520 | <version>6.1.19</version> |
@@ -537,8 +528,24 @@ | @@ -537,8 +528,24 @@ | ||
537 | </connectors> | 528 | </connectors> |
538 | </configuration> | 529 | </configuration> |
539 | </plugin> | 530 | </plugin> |
531 | + <plugin> | ||
532 | + <groupId>org.mybatis.generator</groupId> | ||
533 | + <artifactId>mybatis-generator-maven-plugin</artifactId> | ||
534 | + <version>1.3.2</version> | ||
535 | + <dependencies> | ||
536 | + <dependency> | ||
537 | + <groupId>mysql</groupId> | ||
538 | + <artifactId>mysql-connector-java</artifactId> | ||
539 | + <version>5.1.34</version> | ||
540 | + </dependency> | ||
541 | + </dependencies> | ||
542 | + <configuration> | ||
543 | + <configurationFile>${basedir}/src/test/resources/mbg/generatorConfig.xml</configurationFile> | ||
544 | + <overwrite>true</overwrite> | ||
545 | + <verbose>true</verbose> | ||
546 | + </configuration> | ||
547 | + </plugin> | ||
540 | </plugins> | 548 | </plugins> |
541 | </pluginManagement> | 549 | </pluginManagement> |
542 | </build> | 550 | </build> |
543 | - | ||
544 | </project> | 551 | </project> |
src/main/java/com/canrd/patent/common/utils/TextUtils.java
@@ -2,7 +2,9 @@ package com.canrd.patent.common.utils; | @@ -2,7 +2,9 @@ package com.canrd.patent.common.utils; | ||
2 | 2 | ||
3 | import com.google.common.base.Splitter; | 3 | import com.google.common.base.Splitter; |
4 | import com.google.common.collect.Lists; | 4 | import com.google.common.collect.Lists; |
5 | +import com.google.common.collect.Maps; | ||
5 | import org.apache.commons.lang3.StringUtils; | 6 | import org.apache.commons.lang3.StringUtils; |
7 | +import org.springframework.util.Assert; | ||
6 | import org.springframework.util.CollectionUtils; | 8 | import org.springframework.util.CollectionUtils; |
7 | import org.springframework.web.util.HtmlUtils; | 9 | import org.springframework.web.util.HtmlUtils; |
8 | 10 | ||
@@ -62,11 +64,18 @@ public class TextUtils { | @@ -62,11 +64,18 @@ public class TextUtils { | ||
62 | } | 64 | } |
63 | 65 | ||
64 | public static void main(String args[]){ | 66 | public static void main(String args[]){ |
65 | - List<String> list = Lists.newArrayList(); | ||
66 | - list.add("a"); | ||
67 | - list.add("b"); | ||
68 | - list.add("c"); | ||
69 | - list.add("d"); | ||
70 | - System.out.println(toStr(list)); | 67 | + Assert.isNull("","不能为空"); |
68 | + } | ||
69 | + | ||
70 | + public static boolean isNull(Object obj) { | ||
71 | + return obj==null; | ||
72 | + } | ||
73 | + | ||
74 | + public static boolean isEmpty(String str) { | ||
75 | + return (str == null || "".equals(str)); | ||
76 | + } | ||
77 | + | ||
78 | + public static boolean isNotEmpty(String str) { | ||
79 | + return !(str == null || "".equals(str)); | ||
71 | } | 80 | } |
72 | } | 81 | } |
src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java
0 → 100644
1 | +package com.canrd.patent.dal.dto; | ||
2 | + | ||
3 | +/** | ||
4 | + * Created by ouyangmao on 16/7/17. | ||
5 | + */ | ||
6 | +public class CaseInputDto { | ||
7 | + private String caseType; | ||
8 | + private String serviceType; | ||
9 | + private String paidType; | ||
10 | + private String reduceType; | ||
11 | + private String expense; | ||
12 | + | ||
13 | + public String getCaseType() { | ||
14 | + return caseType; | ||
15 | + } | ||
16 | + | ||
17 | + public void setCaseType(String caseType) { | ||
18 | + this.caseType = caseType; | ||
19 | + } | ||
20 | + | ||
21 | + public String getServiceType() { | ||
22 | + return serviceType; | ||
23 | + } | ||
24 | + | ||
25 | + public void setServiceType(String serviceType) { | ||
26 | + this.serviceType = serviceType; | ||
27 | + } | ||
28 | + | ||
29 | + public String getPaidType() { | ||
30 | + return paidType; | ||
31 | + } | ||
32 | + | ||
33 | + public void setPaidType(String paidType) { | ||
34 | + this.paidType = paidType; | ||
35 | + } | ||
36 | + | ||
37 | + public String getReduceType() { | ||
38 | + return reduceType; | ||
39 | + } | ||
40 | + | ||
41 | + public void setReduceType(String reduceType) { | ||
42 | + this.reduceType = reduceType; | ||
43 | + } | ||
44 | + | ||
45 | + public String getExpense() { | ||
46 | + return expense; | ||
47 | + } | ||
48 | + | ||
49 | + public void setExpense(String expense) { | ||
50 | + this.expense = expense; | ||
51 | + } | ||
52 | +} |
src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java
0 → 100644
1 | +package com.canrd.patent.dal.dto; | ||
2 | + | ||
3 | +import com.canrd.patent.dal.enums.CaseTypeEnum; | ||
4 | +import com.canrd.patent.dal.enums.PaidTypeEnum; | ||
5 | +import com.canrd.patent.dal.enums.ReduceTypeEnum; | ||
6 | +import com.canrd.patent.dal.enums.ServiceTypeEnum; | ||
7 | + | ||
8 | +import java.util.List; | ||
9 | + | ||
10 | +/** | ||
11 | + * Created by ouyangmao on 16/7/16. | ||
12 | + */ | ||
13 | +public class HomePatentTypeOutputDto { | ||
14 | + List<CaseType> caseTypeList; | ||
15 | + List<ServiceType> serviceTypeList; | ||
16 | + List<PaidType> paidTypeList; | ||
17 | + List<ReduceType> reduceTypeList; | ||
18 | + public static class ReduceType{ | ||
19 | + private int id; | ||
20 | + private String name; | ||
21 | + private String title; | ||
22 | + private String description; | ||
23 | + | ||
24 | + public String getDescription() { | ||
25 | + return description; | ||
26 | + } | ||
27 | + | ||
28 | + public void setDescription(String description) { | ||
29 | + this.description = description; | ||
30 | + } | ||
31 | + | ||
32 | + public int getId() { | ||
33 | + return id; | ||
34 | + } | ||
35 | + | ||
36 | + public void setId(int id) { | ||
37 | + this.id = id; | ||
38 | + } | ||
39 | + | ||
40 | + public String getName() { | ||
41 | + return name; | ||
42 | + } | ||
43 | + | ||
44 | + public void setName(String name) { | ||
45 | + this.name = name; | ||
46 | + } | ||
47 | + | ||
48 | + public String getTitle() { | ||
49 | + return title; | ||
50 | + } | ||
51 | + | ||
52 | + public void setTitle(String title) { | ||
53 | + this.title = title; | ||
54 | + } | ||
55 | + } | ||
56 | + public static class PaidType{ | ||
57 | + private int id; | ||
58 | + private String name; | ||
59 | + private String title; | ||
60 | + private String description; | ||
61 | + | ||
62 | + public String getDescription() { | ||
63 | + return description; | ||
64 | + } | ||
65 | + | ||
66 | + public void setDescription(String description) { | ||
67 | + this.description = description; | ||
68 | + } | ||
69 | + | ||
70 | + public int getId() { | ||
71 | + return id; | ||
72 | + } | ||
73 | + | ||
74 | + public void setId(int id) { | ||
75 | + this.id = id; | ||
76 | + } | ||
77 | + | ||
78 | + public String getName() { | ||
79 | + return name; | ||
80 | + } | ||
81 | + | ||
82 | + public void setName(String name) { | ||
83 | + this.name = name; | ||
84 | + } | ||
85 | + | ||
86 | + public String getTitle() { | ||
87 | + return title; | ||
88 | + } | ||
89 | + | ||
90 | + public void setTitle(String title) { | ||
91 | + this.title = title; | ||
92 | + } | ||
93 | + } | ||
94 | + public static class ServiceType{ | ||
95 | + private int id; | ||
96 | + private String name; | ||
97 | + private String title; | ||
98 | + private String description; | ||
99 | + | ||
100 | + public int getId() { | ||
101 | + return id; | ||
102 | + } | ||
103 | + | ||
104 | + public void setId(int id) { | ||
105 | + this.id = id; | ||
106 | + } | ||
107 | + | ||
108 | + public String getName() { | ||
109 | + return name; | ||
110 | + } | ||
111 | + | ||
112 | + public void setName(String name) { | ||
113 | + this.name = name; | ||
114 | + } | ||
115 | + | ||
116 | + public String getTitle() { | ||
117 | + return title; | ||
118 | + } | ||
119 | + | ||
120 | + public void setTitle(String title) { | ||
121 | + this.title = title; | ||
122 | + } | ||
123 | + | ||
124 | + public String getDescription() { | ||
125 | + return description; | ||
126 | + } | ||
127 | + | ||
128 | + public void setDescription(String description) { | ||
129 | + this.description = description; | ||
130 | + } | ||
131 | + } | ||
132 | + public static class CaseType{ | ||
133 | + private int id; | ||
134 | + private String name; | ||
135 | + private String title; | ||
136 | + private String description; | ||
137 | + | ||
138 | + public int getId() { | ||
139 | + return id; | ||
140 | + } | ||
141 | + | ||
142 | + public void setId(int id) { | ||
143 | + this.id = id; | ||
144 | + } | ||
145 | + | ||
146 | + public String getName() { | ||
147 | + return name; | ||
148 | + } | ||
149 | + | ||
150 | + public void setName(String name) { | ||
151 | + this.name = name; | ||
152 | + } | ||
153 | + | ||
154 | + public String getTitle() { | ||
155 | + return title; | ||
156 | + } | ||
157 | + | ||
158 | + public void setTitle(String title) { | ||
159 | + this.title = title; | ||
160 | + } | ||
161 | + | ||
162 | + public String getDescription() { | ||
163 | + return description; | ||
164 | + } | ||
165 | + | ||
166 | + public void setDescription(String description) { | ||
167 | + this.description = description; | ||
168 | + } | ||
169 | + } | ||
170 | + | ||
171 | + public List<CaseType> getCaseTypeList() { | ||
172 | + return caseTypeList; | ||
173 | + } | ||
174 | + | ||
175 | + public void setCaseTypeList(List<CaseType> caseTypeList) { | ||
176 | + this.caseTypeList = caseTypeList; | ||
177 | + } | ||
178 | + | ||
179 | + public List<ServiceType> getServiceTypeList() { | ||
180 | + return serviceTypeList; | ||
181 | + } | ||
182 | + | ||
183 | + public void setServiceTypeList(List<ServiceType> serviceTypeList) { | ||
184 | + this.serviceTypeList = serviceTypeList; | ||
185 | + } | ||
186 | + | ||
187 | + public List<PaidType> getPaidTypeList() { | ||
188 | + return paidTypeList; | ||
189 | + } | ||
190 | + | ||
191 | + public void setPaidTypeList(List<PaidType> paidTypeList) { | ||
192 | + this.paidTypeList = paidTypeList; | ||
193 | + } | ||
194 | + | ||
195 | + public List<ReduceType> getReduceTypeList() { | ||
196 | + return reduceTypeList; | ||
197 | + } | ||
198 | + | ||
199 | + public void setReduceTypeList(List<ReduceType> reduceTypeList) { | ||
200 | + this.reduceTypeList = reduceTypeList; | ||
201 | + } | ||
202 | +} |
src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java
0 → 100644
src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +/** | ||
4 | + * Created by ouyangmao on 16/7/18. | ||
5 | + */ | ||
6 | +public enum CaseStatusEnum implements AbstractEnum{ | ||
7 | + INIT(1,"初始化","案件初始化"); | ||
8 | + private int val; | ||
9 | + private String title; | ||
10 | + private String description; | ||
11 | + | ||
12 | + CaseStatusEnum(int val, String title, String description) { | ||
13 | + this.val = val; | ||
14 | + this.title = title; | ||
15 | + this.description = description; | ||
16 | + } | ||
17 | + | ||
18 | + @Override | ||
19 | + public int getVal() { | ||
20 | + return val; | ||
21 | + } | ||
22 | + | ||
23 | + public void setVal(int val) { | ||
24 | + this.val = val; | ||
25 | + } | ||
26 | + | ||
27 | + @Override | ||
28 | + public String getTitle() { | ||
29 | + return title; | ||
30 | + } | ||
31 | + | ||
32 | + public void setTitle(String title) { | ||
33 | + this.title = title; | ||
34 | + } | ||
35 | + | ||
36 | + @Override | ||
37 | + public String getDescription() { | ||
38 | + return description; | ||
39 | + } | ||
40 | + | ||
41 | + public void setDescription(String description) { | ||
42 | + this.description = description; | ||
43 | + } | ||
44 | +} |
src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +import com.google.common.collect.Lists; | ||
4 | + | ||
5 | +/** | ||
6 | + * Created by ouyangmao on 16/7/16. | ||
7 | + */ | ||
8 | +public enum CaseTypeEnum implements AbstractEnum { | ||
9 | + | ||
10 | + INVENTION_TYPE(1,"发明类型","技术含金量最高,专利价值最大。"), | ||
11 | + PRACTICAL_NEW(2,"实用新型","授权周期短,快速占领市场。"), | ||
12 | + APPEARENCE_DESIGN(3,"外观设计","快速保护产品的独特设计。"), | ||
13 | + INVENTION_NEW(4,"发明+新型","同一技术两个申请,双重保障,效果最佳。"); | ||
14 | + | ||
15 | + private int val; | ||
16 | + private String title; | ||
17 | + private String description; | ||
18 | + | ||
19 | + CaseTypeEnum(int val, String title, String description) { | ||
20 | + this.val = val; | ||
21 | + this.title = title; | ||
22 | + this.description = description; | ||
23 | + } | ||
24 | + | ||
25 | + public int getVal() { | ||
26 | + return val; | ||
27 | + } | ||
28 | + | ||
29 | + public void setVal(int val) { | ||
30 | + this.val = val; | ||
31 | + } | ||
32 | + | ||
33 | + public String getTitle() { | ||
34 | + return title; | ||
35 | + } | ||
36 | + | ||
37 | + public void setTitle(String title) { | ||
38 | + this.title = title; | ||
39 | + } | ||
40 | + | ||
41 | + public String getDescription() { | ||
42 | + return description; | ||
43 | + } | ||
44 | + | ||
45 | + public void setDescription(String description) { | ||
46 | + this.description = description; | ||
47 | + } | ||
48 | + | ||
49 | + @Override | ||
50 | + public String toString() { | ||
51 | + return "CaseTypeEnum{" + | ||
52 | + "val=" + val + | ||
53 | + ", title='" + title + '\'' + | ||
54 | + ", description='" + description + '\'' + | ||
55 | + '}'; | ||
56 | + } | ||
57 | + | ||
58 | + public static void main(String args[]){ | ||
59 | + System.out.println(Lists.newArrayList(CaseTypeEnum.values())); | ||
60 | + } | ||
61 | +} |
src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +/** | ||
4 | + * Created by ouyangmao on 16/7/18. | ||
5 | + */ | ||
6 | +public enum OrderStatusEnum implements AbstractEnum { | ||
7 | + SUBMITED(1,"已提交","已经初始化,已经提交,未支付"), | ||
8 | + PAID_SUCCESS(2,"支付成功","订单支付成功"), | ||
9 | + PADI_FAILURE(3,"支付失败","订单支付失败"); | ||
10 | + private int val; | ||
11 | + private String title; | ||
12 | + private String description; | ||
13 | + | ||
14 | + OrderStatusEnum(int val, String title, String description) { | ||
15 | + this.val = val; | ||
16 | + this.title = title; | ||
17 | + this.description = description; | ||
18 | + } | ||
19 | + | ||
20 | + @Override | ||
21 | + public int getVal() { | ||
22 | + return val; | ||
23 | + } | ||
24 | + | ||
25 | + public void setVal(int val) { | ||
26 | + this.val = val; | ||
27 | + } | ||
28 | + | ||
29 | + @Override | ||
30 | + public String getTitle() { | ||
31 | + return title; | ||
32 | + } | ||
33 | + | ||
34 | + public void setTitle(String title) { | ||
35 | + this.title = title; | ||
36 | + } | ||
37 | + | ||
38 | + @Override | ||
39 | + public String getDescription() { | ||
40 | + return description; | ||
41 | + } | ||
42 | + | ||
43 | + public void setDescription(String description) { | ||
44 | + this.description = description; | ||
45 | + } | ||
46 | +} |
src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +import java.lang.*; | ||
4 | + | ||
5 | +/** | ||
6 | + * Created by ouyangmao on 16/7/16. | ||
7 | + */ | ||
8 | +public enum PaidTypeEnum implements AbstractEnum { | ||
9 | + NO_PAID(1,"暂不缴纳",null), | ||
10 | + PAID(2,"缴纳",null); | ||
11 | + | ||
12 | + private int val; | ||
13 | + private String title; | ||
14 | + private String description; | ||
15 | + | ||
16 | + PaidTypeEnum(int val, String title, String description) { | ||
17 | + this.val = val; | ||
18 | + this.title = title; | ||
19 | + this.description = description; | ||
20 | + } | ||
21 | + | ||
22 | + @Override | ||
23 | + public int getVal() { | ||
24 | + return val; | ||
25 | + } | ||
26 | + | ||
27 | + public void setVal(int val) { | ||
28 | + this.val = val; | ||
29 | + } | ||
30 | + | ||
31 | + @Override | ||
32 | + public String getTitle() { | ||
33 | + return title; | ||
34 | + } | ||
35 | + | ||
36 | + public void setTitle(String title) { | ||
37 | + this.title = title; | ||
38 | + } | ||
39 | + | ||
40 | + @Override | ||
41 | + public String getDescription() { | ||
42 | + return description; | ||
43 | + } | ||
44 | + | ||
45 | + public void setDescription(String description) { | ||
46 | + this.description = description; | ||
47 | + } | ||
48 | + | ||
49 | + @Override | ||
50 | + public String toString() { | ||
51 | + return "PaidTypeEnum{" + | ||
52 | + "val=" + val + | ||
53 | + ", title='" + title + '\'' + | ||
54 | + ", description='" + description + '\'' + | ||
55 | + '}'; | ||
56 | + } | ||
57 | +} |
src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +/** | ||
4 | + * Created by ouyangmao on 16/7/16. | ||
5 | + */ | ||
6 | +public enum ReduceTypeEnum implements AbstractEnum { | ||
7 | + P85(3,"减缓百分之八十五",null), | ||
8 | + P70(2,"减缓百分之七十",null), | ||
9 | + P0(1,"无减缓",null); | ||
10 | + | ||
11 | + | ||
12 | + private int val; | ||
13 | + private String title; | ||
14 | + private String description; | ||
15 | + | ||
16 | + ReduceTypeEnum(int val, String title, String description) { | ||
17 | + this.val = val; | ||
18 | + this.title = title; | ||
19 | + this.description = description; | ||
20 | + } | ||
21 | + | ||
22 | + @Override | ||
23 | + public int getVal() { | ||
24 | + return val; | ||
25 | + } | ||
26 | + | ||
27 | + public void setVal(int val) { | ||
28 | + this.val = val; | ||
29 | + } | ||
30 | + | ||
31 | + @Override | ||
32 | + public String getTitle() { | ||
33 | + return title; | ||
34 | + } | ||
35 | + | ||
36 | + public void setTitle(String title) { | ||
37 | + this.title = title; | ||
38 | + } | ||
39 | + | ||
40 | + @Override | ||
41 | + public String getDescription() { | ||
42 | + return description; | ||
43 | + } | ||
44 | + | ||
45 | + public void setDescription(String description) { | ||
46 | + this.description = description; | ||
47 | + } | ||
48 | + | ||
49 | + @Override | ||
50 | + public String toString() { | ||
51 | + return "ReduceTypeEnum{" + | ||
52 | + "description='" + description + '\'' + | ||
53 | + ", title='" + title + '\'' + | ||
54 | + ", val=" + val + | ||
55 | + '}'; | ||
56 | + } | ||
57 | +} |
src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java
0 → 100644
1 | +package com.canrd.patent.dal.enums; | ||
2 | + | ||
3 | +/** | ||
4 | + * Created by ouyangmao on 16/7/16. | ||
5 | + */ | ||
6 | +public enum ServiceTypeEnum { | ||
7 | + STANDERD_SERVICE(1,"标准服务","技术资料初审服务、技术资料整理服务、专利申请文件撰写服务、流程服务、官方意见转送服务和官方意见答复服务。"), | ||
8 | + AUTHORITY_GUARANTEE(2,"担保授权","标准服务+担保服务,不授权就退款。"); | ||
9 | + private int val; | ||
10 | + private String title; | ||
11 | + private String description; | ||
12 | + | ||
13 | + ServiceTypeEnum(int val, String title, String description) { | ||
14 | + this.val = val; | ||
15 | + this.title = title; | ||
16 | + this.description = description; | ||
17 | + } | ||
18 | + | ||
19 | + public int getVal() { | ||
20 | + return val; | ||
21 | + } | ||
22 | + | ||
23 | + public void setVal(int val) { | ||
24 | + this.val = val; | ||
25 | + } | ||
26 | + | ||
27 | + public String getTitle() { | ||
28 | + return title; | ||
29 | + } | ||
30 | + | ||
31 | + public void setTitle(String title) { | ||
32 | + this.title = title; | ||
33 | + } | ||
34 | + | ||
35 | + public String getDescription() { | ||
36 | + return description; | ||
37 | + } | ||
38 | + | ||
39 | + public void setDescription(String description) { | ||
40 | + this.description = description; | ||
41 | + } | ||
42 | + | ||
43 | + @Override | ||
44 | + public String toString() { | ||
45 | + return "ServiceTypeEnum{" + | ||
46 | + "val=" + val + | ||
47 | + ", title='" + title + '\'' + | ||
48 | + ", description='" + description + '\'' + | ||
49 | + '}'; | ||
50 | + } | ||
51 | +} |
src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java
0 → 100644
1 | +package com.canrd.patent.dal.mapper; | ||
2 | + | ||
3 | +import com.canrd.patent.dal.model.Casement; | ||
4 | +import com.canrd.patent.dal.model.CasementExample; | ||
5 | +import java.util.List; | ||
6 | +import org.apache.ibatis.annotations.Param; | ||
7 | + | ||
8 | +public interface CasementMapper { | ||
9 | + /** | ||
10 | + * This method was generated by MyBatis Generator. | ||
11 | + * This method corresponds to the database table casement | ||
12 | + * | ||
13 | + * @mbggenerated | ||
14 | + */ | ||
15 | + int countByExample(CasementExample example); | ||
16 | + | ||
17 | + /** | ||
18 | + * This method was generated by MyBatis Generator. | ||
19 | + * This method corresponds to the database table casement | ||
20 | + * | ||
21 | + * @mbggenerated | ||
22 | + */ | ||
23 | + int deleteByExample(CasementExample example); | ||
24 | + | ||
25 | + /** | ||
26 | + * This method was generated by MyBatis Generator. | ||
27 | + * This method corresponds to the database table casement | ||
28 | + * | ||
29 | + * @mbggenerated | ||
30 | + */ | ||
31 | + int deleteByPrimaryKey(Long id); | ||
32 | + | ||
33 | + /** | ||
34 | + * This method was generated by MyBatis Generator. | ||
35 | + * This method corresponds to the database table casement | ||
36 | + * | ||
37 | + * @mbggenerated | ||
38 | + */ | ||
39 | + int insert(Casement record); | ||
40 | + | ||
41 | + /** | ||
42 | + * This method was generated by MyBatis Generator. | ||
43 | + * This method corresponds to the database table casement | ||
44 | + * | ||
45 | + * @mbggenerated | ||
46 | + */ | ||
47 | + int insertSelective(Casement record); | ||
48 | + | ||
49 | + /** | ||
50 | + * This method was generated by MyBatis Generator. | ||
51 | + * This method corresponds to the database table casement | ||
52 | + * | ||
53 | + * @mbggenerated | ||
54 | + */ | ||
55 | + List<Casement> selectByExample(CasementExample example); | ||
56 | + | ||
57 | + /** | ||
58 | + * This method was generated by MyBatis Generator. | ||
59 | + * This method corresponds to the database table casement | ||
60 | + * | ||
61 | + * @mbggenerated | ||
62 | + */ | ||
63 | + Casement selectByPrimaryKey(Long id); | ||
64 | + | ||
65 | + /** | ||
66 | + * This method was generated by MyBatis Generator. | ||
67 | + * This method corresponds to the database table casement | ||
68 | + * | ||
69 | + * @mbggenerated | ||
70 | + */ | ||
71 | + int updateByExampleSelective(@Param("record") Casement record, @Param("example") CasementExample example); | ||
72 | + | ||
73 | + /** | ||
74 | + * This method was generated by MyBatis Generator. | ||
75 | + * This method corresponds to the database table casement | ||
76 | + * | ||
77 | + * @mbggenerated | ||
78 | + */ | ||
79 | + int updateByExample(@Param("record") Casement record, @Param("example") CasementExample example); | ||
80 | + | ||
81 | + /** | ||
82 | + * This method was generated by MyBatis Generator. | ||
83 | + * This method corresponds to the database table casement | ||
84 | + * | ||
85 | + * @mbggenerated | ||
86 | + */ | ||
87 | + int updateByPrimaryKeySelective(Casement record); | ||
88 | + | ||
89 | + /** | ||
90 | + * This method was generated by MyBatis Generator. | ||
91 | + * This method corresponds to the database table casement | ||
92 | + * | ||
93 | + * @mbggenerated | ||
94 | + */ | ||
95 | + int updateByPrimaryKey(Casement record); | ||
96 | +} | ||
0 | \ No newline at end of file | 97 | \ No newline at end of file |
src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java
@@ -28,7 +28,7 @@ public interface MybatisTestMapper { | @@ -28,7 +28,7 @@ public interface MybatisTestMapper { | ||
28 | * | 28 | * |
29 | * @mbggenerated | 29 | * @mbggenerated |
30 | */ | 30 | */ |
31 | - int deleteByPrimaryKey(Integer id); | 31 | + int deleteByPrimaryKey(Long id); |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * This method was generated by MyBatis Generator. | 34 | * This method was generated by MyBatis Generator. |
@@ -60,7 +60,7 @@ public interface MybatisTestMapper { | @@ -60,7 +60,7 @@ public interface MybatisTestMapper { | ||
60 | * | 60 | * |
61 | * @mbggenerated | 61 | * @mbggenerated |
62 | */ | 62 | */ |
63 | - MybatisTest selectByPrimaryKey(Integer id); | 63 | + MybatisTest selectByPrimaryKey(Long id); |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * This method was generated by MyBatis Generator. | 66 | * This method was generated by MyBatis Generator. |
src/main/java/com/canrd/patent/dal/model/Casement.java
0 → 100644
1 | +package com.canrd.patent.dal.model; | ||
2 | + | ||
3 | +import java.util.Date; | ||
4 | + | ||
5 | +public class Casement { | ||
6 | + /** | ||
7 | + * This field was generated by MyBatis Generator. | ||
8 | + * This field corresponds to the database column casement.id | ||
9 | + * | ||
10 | + * @mbggenerated | ||
11 | + */ | ||
12 | + private Long id; | ||
13 | + | ||
14 | + /** | ||
15 | + * This field was generated by MyBatis Generator. | ||
16 | + * This field corresponds to the database column casement.name | ||
17 | + * | ||
18 | + * @mbggenerated | ||
19 | + */ | ||
20 | + private String name; | ||
21 | + | ||
22 | + /** | ||
23 | + * This field was generated by MyBatis Generator. | ||
24 | + * This field corresponds to the database column casement.caseSn | ||
25 | + * | ||
26 | + * @mbggenerated | ||
27 | + */ | ||
28 | + private String casesn; | ||
29 | + | ||
30 | + /** | ||
31 | + * This field was generated by MyBatis Generator. | ||
32 | + * This field corresponds to the database column casement.case_type | ||
33 | + * | ||
34 | + * @mbggenerated | ||
35 | + */ | ||
36 | + private String caseType; | ||
37 | + | ||
38 | + /** | ||
39 | + * This field was generated by MyBatis Generator. | ||
40 | + * This field corresponds to the database column casement.service_type | ||
41 | + * | ||
42 | + * @mbggenerated | ||
43 | + */ | ||
44 | + private String serviceType; | ||
45 | + | ||
46 | + /** | ||
47 | + * This field was generated by MyBatis Generator. | ||
48 | + * This field corresponds to the database column casement.paid_type | ||
49 | + * | ||
50 | + * @mbggenerated | ||
51 | + */ | ||
52 | + private String paidType; | ||
53 | + | ||
54 | + /** | ||
55 | + * This field was generated by MyBatis Generator. | ||
56 | + * This field corresponds to the database column casement.reduce_type | ||
57 | + * | ||
58 | + * @mbggenerated | ||
59 | + */ | ||
60 | + private String reduceType; | ||
61 | + | ||
62 | + /** | ||
63 | + * This field was generated by MyBatis Generator. | ||
64 | + * This field corresponds to the database column casement.expense | ||
65 | + * | ||
66 | + * @mbggenerated | ||
67 | + */ | ||
68 | + private Long expense; | ||
69 | + | ||
70 | + /** | ||
71 | + * This field was generated by MyBatis Generator. | ||
72 | + * This field corresponds to the database column casement.order_status | ||
73 | + * | ||
74 | + * @mbggenerated | ||
75 | + */ | ||
76 | + private String orderStatus; | ||
77 | + | ||
78 | + /** | ||
79 | + * This field was generated by MyBatis Generator. | ||
80 | + * This field corresponds to the database column casement.case_status | ||
81 | + * | ||
82 | + * @mbggenerated | ||
83 | + */ | ||
84 | + private String caseStatus; | ||
85 | + | ||
86 | + /** | ||
87 | + * This field was generated by MyBatis Generator. | ||
88 | + * This field corresponds to the database column casement.member_id | ||
89 | + * | ||
90 | + * @mbggenerated | ||
91 | + */ | ||
92 | + private String memberId; | ||
93 | + | ||
94 | + /** | ||
95 | + * This field was generated by MyBatis Generator. | ||
96 | + * This field corresponds to the database column casement.create_date | ||
97 | + * | ||
98 | + * @mbggenerated | ||
99 | + */ | ||
100 | + private Date createDate; | ||
101 | + | ||
102 | + /** | ||
103 | + * This field was generated by MyBatis Generator. | ||
104 | + * This field corresponds to the database column casement.update_date | ||
105 | + * | ||
106 | + * @mbggenerated | ||
107 | + */ | ||
108 | + private Date updateDate; | ||
109 | + | ||
110 | + /** | ||
111 | + * This method was generated by MyBatis Generator. | ||
112 | + * This method returns the value of the database column casement.id | ||
113 | + * | ||
114 | + * @return the value of casement.id | ||
115 | + * | ||
116 | + * @mbggenerated | ||
117 | + */ | ||
118 | + public Long getId() { | ||
119 | + return id; | ||
120 | + } | ||
121 | + | ||
122 | + /** | ||
123 | + * This method was generated by MyBatis Generator. | ||
124 | + * This method sets the value of the database column casement.id | ||
125 | + * | ||
126 | + * @param id the value for casement.id | ||
127 | + * | ||
128 | + * @mbggenerated | ||
129 | + */ | ||
130 | + public void setId(Long id) { | ||
131 | + this.id = id; | ||
132 | + } | ||
133 | + | ||
134 | + /** | ||
135 | + * This method was generated by MyBatis Generator. | ||
136 | + * This method returns the value of the database column casement.name | ||
137 | + * | ||
138 | + * @return the value of casement.name | ||
139 | + * | ||
140 | + * @mbggenerated | ||
141 | + */ | ||
142 | + public String getName() { | ||
143 | + return name; | ||
144 | + } | ||
145 | + | ||
146 | + /** | ||
147 | + * This method was generated by MyBatis Generator. | ||
148 | + * This method sets the value of the database column casement.name | ||
149 | + * | ||
150 | + * @param name the value for casement.name | ||
151 | + * | ||
152 | + * @mbggenerated | ||
153 | + */ | ||
154 | + public void setName(String name) { | ||
155 | + this.name = name == null ? null : name.trim(); | ||
156 | + } | ||
157 | + | ||
158 | + /** | ||
159 | + * This method was generated by MyBatis Generator. | ||
160 | + * This method returns the value of the database column casement.caseSn | ||
161 | + * | ||
162 | + * @return the value of casement.caseSn | ||
163 | + * | ||
164 | + * @mbggenerated | ||
165 | + */ | ||
166 | + public String getCasesn() { | ||
167 | + return casesn; | ||
168 | + } | ||
169 | + | ||
170 | + /** | ||
171 | + * This method was generated by MyBatis Generator. | ||
172 | + * This method sets the value of the database column casement.caseSn | ||
173 | + * | ||
174 | + * @param casesn the value for casement.caseSn | ||
175 | + * | ||
176 | + * @mbggenerated | ||
177 | + */ | ||
178 | + public void setCasesn(String casesn) { | ||
179 | + this.casesn = casesn == null ? null : casesn.trim(); | ||
180 | + } | ||
181 | + | ||
182 | + /** | ||
183 | + * This method was generated by MyBatis Generator. | ||
184 | + * This method returns the value of the database column casement.case_type | ||
185 | + * | ||
186 | + * @return the value of casement.case_type | ||
187 | + * | ||
188 | + * @mbggenerated | ||
189 | + */ | ||
190 | + public String getCaseType() { | ||
191 | + return caseType; | ||
192 | + } | ||
193 | + | ||
194 | + /** | ||
195 | + * This method was generated by MyBatis Generator. | ||
196 | + * This method sets the value of the database column casement.case_type | ||
197 | + * | ||
198 | + * @param caseType the value for casement.case_type | ||
199 | + * | ||
200 | + * @mbggenerated | ||
201 | + */ | ||
202 | + public void setCaseType(String caseType) { | ||
203 | + this.caseType = caseType == null ? null : caseType.trim(); | ||
204 | + } | ||
205 | + | ||
206 | + /** | ||
207 | + * This method was generated by MyBatis Generator. | ||
208 | + * This method returns the value of the database column casement.service_type | ||
209 | + * | ||
210 | + * @return the value of casement.service_type | ||
211 | + * | ||
212 | + * @mbggenerated | ||
213 | + */ | ||
214 | + public String getServiceType() { | ||
215 | + return serviceType; | ||
216 | + } | ||
217 | + | ||
218 | + /** | ||
219 | + * This method was generated by MyBatis Generator. | ||
220 | + * This method sets the value of the database column casement.service_type | ||
221 | + * | ||
222 | + * @param serviceType the value for casement.service_type | ||
223 | + * | ||
224 | + * @mbggenerated | ||
225 | + */ | ||
226 | + public void setServiceType(String serviceType) { | ||
227 | + this.serviceType = serviceType == null ? null : serviceType.trim(); | ||
228 | + } | ||
229 | + | ||
230 | + /** | ||
231 | + * This method was generated by MyBatis Generator. | ||
232 | + * This method returns the value of the database column casement.paid_type | ||
233 | + * | ||
234 | + * @return the value of casement.paid_type | ||
235 | + * | ||
236 | + * @mbggenerated | ||
237 | + */ | ||
238 | + public String getPaidType() { | ||
239 | + return paidType; | ||
240 | + } | ||
241 | + | ||
242 | + /** | ||
243 | + * This method was generated by MyBatis Generator. | ||
244 | + * This method sets the value of the database column casement.paid_type | ||
245 | + * | ||
246 | + * @param paidType the value for casement.paid_type | ||
247 | + * | ||
248 | + * @mbggenerated | ||
249 | + */ | ||
250 | + public void setPaidType(String paidType) { | ||
251 | + this.paidType = paidType == null ? null : paidType.trim(); | ||
252 | + } | ||
253 | + | ||
254 | + /** | ||
255 | + * This method was generated by MyBatis Generator. | ||
256 | + * This method returns the value of the database column casement.reduce_type | ||
257 | + * | ||
258 | + * @return the value of casement.reduce_type | ||
259 | + * | ||
260 | + * @mbggenerated | ||
261 | + */ | ||
262 | + public String getReduceType() { | ||
263 | + return reduceType; | ||
264 | + } | ||
265 | + | ||
266 | + /** | ||
267 | + * This method was generated by MyBatis Generator. | ||
268 | + * This method sets the value of the database column casement.reduce_type | ||
269 | + * | ||
270 | + * @param reduceType the value for casement.reduce_type | ||
271 | + * | ||
272 | + * @mbggenerated | ||
273 | + */ | ||
274 | + public void setReduceType(String reduceType) { | ||
275 | + this.reduceType = reduceType == null ? null : reduceType.trim(); | ||
276 | + } | ||
277 | + | ||
278 | + /** | ||
279 | + * This method was generated by MyBatis Generator. | ||
280 | + * This method returns the value of the database column casement.expense | ||
281 | + * | ||
282 | + * @return the value of casement.expense | ||
283 | + * | ||
284 | + * @mbggenerated | ||
285 | + */ | ||
286 | + public Long getExpense() { | ||
287 | + return expense; | ||
288 | + } | ||
289 | + | ||
290 | + /** | ||
291 | + * This method was generated by MyBatis Generator. | ||
292 | + * This method sets the value of the database column casement.expense | ||
293 | + * | ||
294 | + * @param expense the value for casement.expense | ||
295 | + * | ||
296 | + * @mbggenerated | ||
297 | + */ | ||
298 | + public void setExpense(Long expense) { | ||
299 | + this.expense = expense; | ||
300 | + } | ||
301 | + | ||
302 | + /** | ||
303 | + * This method was generated by MyBatis Generator. | ||
304 | + * This method returns the value of the database column casement.order_status | ||
305 | + * | ||
306 | + * @return the value of casement.order_status | ||
307 | + * | ||
308 | + * @mbggenerated | ||
309 | + */ | ||
310 | + public String getOrderStatus() { | ||
311 | + return orderStatus; | ||
312 | + } | ||
313 | + | ||
314 | + /** | ||
315 | + * This method was generated by MyBatis Generator. | ||
316 | + * This method sets the value of the database column casement.order_status | ||
317 | + * | ||
318 | + * @param orderStatus the value for casement.order_status | ||
319 | + * | ||
320 | + * @mbggenerated | ||
321 | + */ | ||
322 | + public void setOrderStatus(String orderStatus) { | ||
323 | + this.orderStatus = orderStatus == null ? null : orderStatus.trim(); | ||
324 | + } | ||
325 | + | ||
326 | + /** | ||
327 | + * This method was generated by MyBatis Generator. | ||
328 | + * This method returns the value of the database column casement.case_status | ||
329 | + * | ||
330 | + * @return the value of casement.case_status | ||
331 | + * | ||
332 | + * @mbggenerated | ||
333 | + */ | ||
334 | + public String getCaseStatus() { | ||
335 | + return caseStatus; | ||
336 | + } | ||
337 | + | ||
338 | + /** | ||
339 | + * This method was generated by MyBatis Generator. | ||
340 | + * This method sets the value of the database column casement.case_status | ||
341 | + * | ||
342 | + * @param caseStatus the value for casement.case_status | ||
343 | + * | ||
344 | + * @mbggenerated | ||
345 | + */ | ||
346 | + public void setCaseStatus(String caseStatus) { | ||
347 | + this.caseStatus = caseStatus == null ? null : caseStatus.trim(); | ||
348 | + } | ||
349 | + | ||
350 | + /** | ||
351 | + * This method was generated by MyBatis Generator. | ||
352 | + * This method returns the value of the database column casement.member_id | ||
353 | + * | ||
354 | + * @return the value of casement.member_id | ||
355 | + * | ||
356 | + * @mbggenerated | ||
357 | + */ | ||
358 | + public String getMemberId() { | ||
359 | + return memberId; | ||
360 | + } | ||
361 | + | ||
362 | + /** | ||
363 | + * This method was generated by MyBatis Generator. | ||
364 | + * This method sets the value of the database column casement.member_id | ||
365 | + * | ||
366 | + * @param memberId the value for casement.member_id | ||
367 | + * | ||
368 | + * @mbggenerated | ||
369 | + */ | ||
370 | + public void setMemberId(String memberId) { | ||
371 | + this.memberId = memberId == null ? null : memberId.trim(); | ||
372 | + } | ||
373 | + | ||
374 | + /** | ||
375 | + * This method was generated by MyBatis Generator. | ||
376 | + * This method returns the value of the database column casement.create_date | ||
377 | + * | ||
378 | + * @return the value of casement.create_date | ||
379 | + * | ||
380 | + * @mbggenerated | ||
381 | + */ | ||
382 | + public Date getCreateDate() { | ||
383 | + return createDate; | ||
384 | + } | ||
385 | + | ||
386 | + /** | ||
387 | + * This method was generated by MyBatis Generator. | ||
388 | + * This method sets the value of the database column casement.create_date | ||
389 | + * | ||
390 | + * @param createDate the value for casement.create_date | ||
391 | + * | ||
392 | + * @mbggenerated | ||
393 | + */ | ||
394 | + public void setCreateDate(Date createDate) { | ||
395 | + this.createDate = createDate; | ||
396 | + } | ||
397 | + | ||
398 | + /** | ||
399 | + * This method was generated by MyBatis Generator. | ||
400 | + * This method returns the value of the database column casement.update_date | ||
401 | + * | ||
402 | + * @return the value of casement.update_date | ||
403 | + * | ||
404 | + * @mbggenerated | ||
405 | + */ | ||
406 | + public Date getUpdateDate() { | ||
407 | + return updateDate; | ||
408 | + } | ||
409 | + | ||
410 | + /** | ||
411 | + * This method was generated by MyBatis Generator. | ||
412 | + * This method sets the value of the database column casement.update_date | ||
413 | + * | ||
414 | + * @param updateDate the value for casement.update_date | ||
415 | + * | ||
416 | + * @mbggenerated | ||
417 | + */ | ||
418 | + public void setUpdateDate(Date updateDate) { | ||
419 | + this.updateDate = updateDate; | ||
420 | + } | ||
421 | +} | ||
0 | \ No newline at end of file | 422 | \ No newline at end of file |
src/main/java/com/canrd/patent/dal/model/CasementExample.java
0 → 100644
1 | +package com.canrd.patent.dal.model; | ||
2 | + | ||
3 | +import java.util.ArrayList; | ||
4 | +import java.util.Date; | ||
5 | +import java.util.List; | ||
6 | + | ||
7 | +public class CasementExample { | ||
8 | + /** | ||
9 | + * This field was generated by MyBatis Generator. | ||
10 | + * This field corresponds to the database table casement | ||
11 | + * | ||
12 | + * @mbggenerated | ||
13 | + */ | ||
14 | + protected String orderByClause; | ||
15 | + | ||
16 | + /** | ||
17 | + * This field was generated by MyBatis Generator. | ||
18 | + * This field corresponds to the database table casement | ||
19 | + * | ||
20 | + * @mbggenerated | ||
21 | + */ | ||
22 | + protected boolean distinct; | ||
23 | + | ||
24 | + /** | ||
25 | + * This field was generated by MyBatis Generator. | ||
26 | + * This field corresponds to the database table casement | ||
27 | + * | ||
28 | + * @mbggenerated | ||
29 | + */ | ||
30 | + protected List<Criteria> oredCriteria; | ||
31 | + | ||
32 | + /** | ||
33 | + * This method was generated by MyBatis Generator. | ||
34 | + * This method corresponds to the database table casement | ||
35 | + * | ||
36 | + * @mbggenerated | ||
37 | + */ | ||
38 | + public CasementExample() { | ||
39 | + oredCriteria = new ArrayList<Criteria>(); | ||
40 | + } | ||
41 | + | ||
42 | + /** | ||
43 | + * This method was generated by MyBatis Generator. | ||
44 | + * This method corresponds to the database table casement | ||
45 | + * | ||
46 | + * @mbggenerated | ||
47 | + */ | ||
48 | + public void setOrderByClause(String orderByClause) { | ||
49 | + this.orderByClause = orderByClause; | ||
50 | + } | ||
51 | + | ||
52 | + /** | ||
53 | + * This method was generated by MyBatis Generator. | ||
54 | + * This method corresponds to the database table casement | ||
55 | + * | ||
56 | + * @mbggenerated | ||
57 | + */ | ||
58 | + public String getOrderByClause() { | ||
59 | + return orderByClause; | ||
60 | + } | ||
61 | + | ||
62 | + /** | ||
63 | + * This method was generated by MyBatis Generator. | ||
64 | + * This method corresponds to the database table casement | ||
65 | + * | ||
66 | + * @mbggenerated | ||
67 | + */ | ||
68 | + public void setDistinct(boolean distinct) { | ||
69 | + this.distinct = distinct; | ||
70 | + } | ||
71 | + | ||
72 | + /** | ||
73 | + * This method was generated by MyBatis Generator. | ||
74 | + * This method corresponds to the database table casement | ||
75 | + * | ||
76 | + * @mbggenerated | ||
77 | + */ | ||
78 | + public boolean isDistinct() { | ||
79 | + return distinct; | ||
80 | + } | ||
81 | + | ||
82 | + /** | ||
83 | + * This method was generated by MyBatis Generator. | ||
84 | + * This method corresponds to the database table casement | ||
85 | + * | ||
86 | + * @mbggenerated | ||
87 | + */ | ||
88 | + public List<Criteria> getOredCriteria() { | ||
89 | + return oredCriteria; | ||
90 | + } | ||
91 | + | ||
92 | + /** | ||
93 | + * This method was generated by MyBatis Generator. | ||
94 | + * This method corresponds to the database table casement | ||
95 | + * | ||
96 | + * @mbggenerated | ||
97 | + */ | ||
98 | + public void or(Criteria criteria) { | ||
99 | + oredCriteria.add(criteria); | ||
100 | + } | ||
101 | + | ||
102 | + /** | ||
103 | + * This method was generated by MyBatis Generator. | ||
104 | + * This method corresponds to the database table casement | ||
105 | + * | ||
106 | + * @mbggenerated | ||
107 | + */ | ||
108 | + public Criteria or() { | ||
109 | + Criteria criteria = createCriteriaInternal(); | ||
110 | + oredCriteria.add(criteria); | ||
111 | + return criteria; | ||
112 | + } | ||
113 | + | ||
114 | + /** | ||
115 | + * This method was generated by MyBatis Generator. | ||
116 | + * This method corresponds to the database table casement | ||
117 | + * | ||
118 | + * @mbggenerated | ||
119 | + */ | ||
120 | + public Criteria createCriteria() { | ||
121 | + Criteria criteria = createCriteriaInternal(); | ||
122 | + if (oredCriteria.size() == 0) { | ||
123 | + oredCriteria.add(criteria); | ||
124 | + } | ||
125 | + return criteria; | ||
126 | + } | ||
127 | + | ||
128 | + /** | ||
129 | + * This method was generated by MyBatis Generator. | ||
130 | + * This method corresponds to the database table casement | ||
131 | + * | ||
132 | + * @mbggenerated | ||
133 | + */ | ||
134 | + protected Criteria createCriteriaInternal() { | ||
135 | + Criteria criteria = new Criteria(); | ||
136 | + return criteria; | ||
137 | + } | ||
138 | + | ||
139 | + /** | ||
140 | + * This method was generated by MyBatis Generator. | ||
141 | + * This method corresponds to the database table casement | ||
142 | + * | ||
143 | + * @mbggenerated | ||
144 | + */ | ||
145 | + public void clear() { | ||
146 | + oredCriteria.clear(); | ||
147 | + orderByClause = null; | ||
148 | + distinct = false; | ||
149 | + } | ||
150 | + | ||
151 | + /** | ||
152 | + * This class was generated by MyBatis Generator. | ||
153 | + * This class corresponds to the database table casement | ||
154 | + * | ||
155 | + * @mbggenerated | ||
156 | + */ | ||
157 | + protected abstract static class GeneratedCriteria { | ||
158 | + protected List<Criterion> criteria; | ||
159 | + | ||
160 | + protected GeneratedCriteria() { | ||
161 | + super(); | ||
162 | + criteria = new ArrayList<Criterion>(); | ||
163 | + } | ||
164 | + | ||
165 | + public boolean isValid() { | ||
166 | + return criteria.size() > 0; | ||
167 | + } | ||
168 | + | ||
169 | + public List<Criterion> getAllCriteria() { | ||
170 | + return criteria; | ||
171 | + } | ||
172 | + | ||
173 | + public List<Criterion> getCriteria() { | ||
174 | + return criteria; | ||
175 | + } | ||
176 | + | ||
177 | + protected void addCriterion(String condition) { | ||
178 | + if (condition == null) { | ||
179 | + throw new RuntimeException("Value for condition cannot be null"); | ||
180 | + } | ||
181 | + criteria.add(new Criterion(condition)); | ||
182 | + } | ||
183 | + | ||
184 | + protected void addCriterion(String condition, Object value, String property) { | ||
185 | + if (value == null) { | ||
186 | + throw new RuntimeException("Value for " + property + " cannot be null"); | ||
187 | + } | ||
188 | + criteria.add(new Criterion(condition, value)); | ||
189 | + } | ||
190 | + | ||
191 | + protected void addCriterion(String condition, Object value1, Object value2, String property) { | ||
192 | + if (value1 == null || value2 == null) { | ||
193 | + throw new RuntimeException("Between values for " + property + " cannot be null"); | ||
194 | + } | ||
195 | + criteria.add(new Criterion(condition, value1, value2)); | ||
196 | + } | ||
197 | + | ||
198 | + public Criteria andIdIsNull() { | ||
199 | + addCriterion("id is null"); | ||
200 | + return (Criteria) this; | ||
201 | + } | ||
202 | + | ||
203 | + public Criteria andIdIsNotNull() { | ||
204 | + addCriterion("id is not null"); | ||
205 | + return (Criteria) this; | ||
206 | + } | ||
207 | + | ||
208 | + public Criteria andIdEqualTo(Long value) { | ||
209 | + addCriterion("id =", value, "id"); | ||
210 | + return (Criteria) this; | ||
211 | + } | ||
212 | + | ||
213 | + public Criteria andIdNotEqualTo(Long value) { | ||
214 | + addCriterion("id <>", value, "id"); | ||
215 | + return (Criteria) this; | ||
216 | + } | ||
217 | + | ||
218 | + public Criteria andIdGreaterThan(Long value) { | ||
219 | + addCriterion("id >", value, "id"); | ||
220 | + return (Criteria) this; | ||
221 | + } | ||
222 | + | ||
223 | + public Criteria andIdGreaterThanOrEqualTo(Long value) { | ||
224 | + addCriterion("id >=", value, "id"); | ||
225 | + return (Criteria) this; | ||
226 | + } | ||
227 | + | ||
228 | + public Criteria andIdLessThan(Long value) { | ||
229 | + addCriterion("id <", value, "id"); | ||
230 | + return (Criteria) this; | ||
231 | + } | ||
232 | + | ||
233 | + public Criteria andIdLessThanOrEqualTo(Long value) { | ||
234 | + addCriterion("id <=", value, "id"); | ||
235 | + return (Criteria) this; | ||
236 | + } | ||
237 | + | ||
238 | + public Criteria andIdIn(List<Long> values) { | ||
239 | + addCriterion("id in", values, "id"); | ||
240 | + return (Criteria) this; | ||
241 | + } | ||
242 | + | ||
243 | + public Criteria andIdNotIn(List<Long> values) { | ||
244 | + addCriterion("id not in", values, "id"); | ||
245 | + return (Criteria) this; | ||
246 | + } | ||
247 | + | ||
248 | + public Criteria andIdBetween(Long value1, Long value2) { | ||
249 | + addCriterion("id between", value1, value2, "id"); | ||
250 | + return (Criteria) this; | ||
251 | + } | ||
252 | + | ||
253 | + public Criteria andIdNotBetween(Long value1, Long value2) { | ||
254 | + addCriterion("id not between", value1, value2, "id"); | ||
255 | + return (Criteria) this; | ||
256 | + } | ||
257 | + | ||
258 | + public Criteria andNameIsNull() { | ||
259 | + addCriterion("name is null"); | ||
260 | + return (Criteria) this; | ||
261 | + } | ||
262 | + | ||
263 | + public Criteria andNameIsNotNull() { | ||
264 | + addCriterion("name is not null"); | ||
265 | + return (Criteria) this; | ||
266 | + } | ||
267 | + | ||
268 | + public Criteria andNameEqualTo(String value) { | ||
269 | + addCriterion("name =", value, "name"); | ||
270 | + return (Criteria) this; | ||
271 | + } | ||
272 | + | ||
273 | + public Criteria andNameNotEqualTo(String value) { | ||
274 | + addCriterion("name <>", value, "name"); | ||
275 | + return (Criteria) this; | ||
276 | + } | ||
277 | + | ||
278 | + public Criteria andNameGreaterThan(String value) { | ||
279 | + addCriterion("name >", value, "name"); | ||
280 | + return (Criteria) this; | ||
281 | + } | ||
282 | + | ||
283 | + public Criteria andNameGreaterThanOrEqualTo(String value) { | ||
284 | + addCriterion("name >=", value, "name"); | ||
285 | + return (Criteria) this; | ||
286 | + } | ||
287 | + | ||
288 | + public Criteria andNameLessThan(String value) { | ||
289 | + addCriterion("name <", value, "name"); | ||
290 | + return (Criteria) this; | ||
291 | + } | ||
292 | + | ||
293 | + public Criteria andNameLessThanOrEqualTo(String value) { | ||
294 | + addCriterion("name <=", value, "name"); | ||
295 | + return (Criteria) this; | ||
296 | + } | ||
297 | + | ||
298 | + public Criteria andNameLike(String value) { | ||
299 | + addCriterion("name like", value, "name"); | ||
300 | + return (Criteria) this; | ||
301 | + } | ||
302 | + | ||
303 | + public Criteria andNameNotLike(String value) { | ||
304 | + addCriterion("name not like", value, "name"); | ||
305 | + return (Criteria) this; | ||
306 | + } | ||
307 | + | ||
308 | + public Criteria andNameIn(List<String> values) { | ||
309 | + addCriterion("name in", values, "name"); | ||
310 | + return (Criteria) this; | ||
311 | + } | ||
312 | + | ||
313 | + public Criteria andNameNotIn(List<String> values) { | ||
314 | + addCriterion("name not in", values, "name"); | ||
315 | + return (Criteria) this; | ||
316 | + } | ||
317 | + | ||
318 | + public Criteria andNameBetween(String value1, String value2) { | ||
319 | + addCriterion("name between", value1, value2, "name"); | ||
320 | + return (Criteria) this; | ||
321 | + } | ||
322 | + | ||
323 | + public Criteria andNameNotBetween(String value1, String value2) { | ||
324 | + addCriterion("name not between", value1, value2, "name"); | ||
325 | + return (Criteria) this; | ||
326 | + } | ||
327 | + | ||
328 | + public Criteria andCasesnIsNull() { | ||
329 | + addCriterion("caseSn is null"); | ||
330 | + return (Criteria) this; | ||
331 | + } | ||
332 | + | ||
333 | + public Criteria andCasesnIsNotNull() { | ||
334 | + addCriterion("caseSn is not null"); | ||
335 | + return (Criteria) this; | ||
336 | + } | ||
337 | + | ||
338 | + public Criteria andCasesnEqualTo(String value) { | ||
339 | + addCriterion("caseSn =", value, "casesn"); | ||
340 | + return (Criteria) this; | ||
341 | + } | ||
342 | + | ||
343 | + public Criteria andCasesnNotEqualTo(String value) { | ||
344 | + addCriterion("caseSn <>", value, "casesn"); | ||
345 | + return (Criteria) this; | ||
346 | + } | ||
347 | + | ||
348 | + public Criteria andCasesnGreaterThan(String value) { | ||
349 | + addCriterion("caseSn >", value, "casesn"); | ||
350 | + return (Criteria) this; | ||
351 | + } | ||
352 | + | ||
353 | + public Criteria andCasesnGreaterThanOrEqualTo(String value) { | ||
354 | + addCriterion("caseSn >=", value, "casesn"); | ||
355 | + return (Criteria) this; | ||
356 | + } | ||
357 | + | ||
358 | + public Criteria andCasesnLessThan(String value) { | ||
359 | + addCriterion("caseSn <", value, "casesn"); | ||
360 | + return (Criteria) this; | ||
361 | + } | ||
362 | + | ||
363 | + public Criteria andCasesnLessThanOrEqualTo(String value) { | ||
364 | + addCriterion("caseSn <=", value, "casesn"); | ||
365 | + return (Criteria) this; | ||
366 | + } | ||
367 | + | ||
368 | + public Criteria andCasesnLike(String value) { | ||
369 | + addCriterion("caseSn like", value, "casesn"); | ||
370 | + return (Criteria) this; | ||
371 | + } | ||
372 | + | ||
373 | + public Criteria andCasesnNotLike(String value) { | ||
374 | + addCriterion("caseSn not like", value, "casesn"); | ||
375 | + return (Criteria) this; | ||
376 | + } | ||
377 | + | ||
378 | + public Criteria andCasesnIn(List<String> values) { | ||
379 | + addCriterion("caseSn in", values, "casesn"); | ||
380 | + return (Criteria) this; | ||
381 | + } | ||
382 | + | ||
383 | + public Criteria andCasesnNotIn(List<String> values) { | ||
384 | + addCriterion("caseSn not in", values, "casesn"); | ||
385 | + return (Criteria) this; | ||
386 | + } | ||
387 | + | ||
388 | + public Criteria andCasesnBetween(String value1, String value2) { | ||
389 | + addCriterion("caseSn between", value1, value2, "casesn"); | ||
390 | + return (Criteria) this; | ||
391 | + } | ||
392 | + | ||
393 | + public Criteria andCasesnNotBetween(String value1, String value2) { | ||
394 | + addCriterion("caseSn not between", value1, value2, "casesn"); | ||
395 | + return (Criteria) this; | ||
396 | + } | ||
397 | + | ||
398 | + public Criteria andCaseTypeIsNull() { | ||
399 | + addCriterion("case_type is null"); | ||
400 | + return (Criteria) this; | ||
401 | + } | ||
402 | + | ||
403 | + public Criteria andCaseTypeIsNotNull() { | ||
404 | + addCriterion("case_type is not null"); | ||
405 | + return (Criteria) this; | ||
406 | + } | ||
407 | + | ||
408 | + public Criteria andCaseTypeEqualTo(String value) { | ||
409 | + addCriterion("case_type =", value, "caseType"); | ||
410 | + return (Criteria) this; | ||
411 | + } | ||
412 | + | ||
413 | + public Criteria andCaseTypeNotEqualTo(String value) { | ||
414 | + addCriterion("case_type <>", value, "caseType"); | ||
415 | + return (Criteria) this; | ||
416 | + } | ||
417 | + | ||
418 | + public Criteria andCaseTypeGreaterThan(String value) { | ||
419 | + addCriterion("case_type >", value, "caseType"); | ||
420 | + return (Criteria) this; | ||
421 | + } | ||
422 | + | ||
423 | + public Criteria andCaseTypeGreaterThanOrEqualTo(String value) { | ||
424 | + addCriterion("case_type >=", value, "caseType"); | ||
425 | + return (Criteria) this; | ||
426 | + } | ||
427 | + | ||
428 | + public Criteria andCaseTypeLessThan(String value) { | ||
429 | + addCriterion("case_type <", value, "caseType"); | ||
430 | + return (Criteria) this; | ||
431 | + } | ||
432 | + | ||
433 | + public Criteria andCaseTypeLessThanOrEqualTo(String value) { | ||
434 | + addCriterion("case_type <=", value, "caseType"); | ||
435 | + return (Criteria) this; | ||
436 | + } | ||
437 | + | ||
438 | + public Criteria andCaseTypeLike(String value) { | ||
439 | + addCriterion("case_type like", value, "caseType"); | ||
440 | + return (Criteria) this; | ||
441 | + } | ||
442 | + | ||
443 | + public Criteria andCaseTypeNotLike(String value) { | ||
444 | + addCriterion("case_type not like", value, "caseType"); | ||
445 | + return (Criteria) this; | ||
446 | + } | ||
447 | + | ||
448 | + public Criteria andCaseTypeIn(List<String> values) { | ||
449 | + addCriterion("case_type in", values, "caseType"); | ||
450 | + return (Criteria) this; | ||
451 | + } | ||
452 | + | ||
453 | + public Criteria andCaseTypeNotIn(List<String> values) { | ||
454 | + addCriterion("case_type not in", values, "caseType"); | ||
455 | + return (Criteria) this; | ||
456 | + } | ||
457 | + | ||
458 | + public Criteria andCaseTypeBetween(String value1, String value2) { | ||
459 | + addCriterion("case_type between", value1, value2, "caseType"); | ||
460 | + return (Criteria) this; | ||
461 | + } | ||
462 | + | ||
463 | + public Criteria andCaseTypeNotBetween(String value1, String value2) { | ||
464 | + addCriterion("case_type not between", value1, value2, "caseType"); | ||
465 | + return (Criteria) this; | ||
466 | + } | ||
467 | + | ||
468 | + public Criteria andServiceTypeIsNull() { | ||
469 | + addCriterion("service_type is null"); | ||
470 | + return (Criteria) this; | ||
471 | + } | ||
472 | + | ||
473 | + public Criteria andServiceTypeIsNotNull() { | ||
474 | + addCriterion("service_type is not null"); | ||
475 | + return (Criteria) this; | ||
476 | + } | ||
477 | + | ||
478 | + public Criteria andServiceTypeEqualTo(String value) { | ||
479 | + addCriterion("service_type =", value, "serviceType"); | ||
480 | + return (Criteria) this; | ||
481 | + } | ||
482 | + | ||
483 | + public Criteria andServiceTypeNotEqualTo(String value) { | ||
484 | + addCriterion("service_type <>", value, "serviceType"); | ||
485 | + return (Criteria) this; | ||
486 | + } | ||
487 | + | ||
488 | + public Criteria andServiceTypeGreaterThan(String value) { | ||
489 | + addCriterion("service_type >", value, "serviceType"); | ||
490 | + return (Criteria) this; | ||
491 | + } | ||
492 | + | ||
493 | + public Criteria andServiceTypeGreaterThanOrEqualTo(String value) { | ||
494 | + addCriterion("service_type >=", value, "serviceType"); | ||
495 | + return (Criteria) this; | ||
496 | + } | ||
497 | + | ||
498 | + public Criteria andServiceTypeLessThan(String value) { | ||
499 | + addCriterion("service_type <", value, "serviceType"); | ||
500 | + return (Criteria) this; | ||
501 | + } | ||
502 | + | ||
503 | + public Criteria andServiceTypeLessThanOrEqualTo(String value) { | ||
504 | + addCriterion("service_type <=", value, "serviceType"); | ||
505 | + return (Criteria) this; | ||
506 | + } | ||
507 | + | ||
508 | + public Criteria andServiceTypeLike(String value) { | ||
509 | + addCriterion("service_type like", value, "serviceType"); | ||
510 | + return (Criteria) this; | ||
511 | + } | ||
512 | + | ||
513 | + public Criteria andServiceTypeNotLike(String value) { | ||
514 | + addCriterion("service_type not like", value, "serviceType"); | ||
515 | + return (Criteria) this; | ||
516 | + } | ||
517 | + | ||
518 | + public Criteria andServiceTypeIn(List<String> values) { | ||
519 | + addCriterion("service_type in", values, "serviceType"); | ||
520 | + return (Criteria) this; | ||
521 | + } | ||
522 | + | ||
523 | + public Criteria andServiceTypeNotIn(List<String> values) { | ||
524 | + addCriterion("service_type not in", values, "serviceType"); | ||
525 | + return (Criteria) this; | ||
526 | + } | ||
527 | + | ||
528 | + public Criteria andServiceTypeBetween(String value1, String value2) { | ||
529 | + addCriterion("service_type between", value1, value2, "serviceType"); | ||
530 | + return (Criteria) this; | ||
531 | + } | ||
532 | + | ||
533 | + public Criteria andServiceTypeNotBetween(String value1, String value2) { | ||
534 | + addCriterion("service_type not between", value1, value2, "serviceType"); | ||
535 | + return (Criteria) this; | ||
536 | + } | ||
537 | + | ||
538 | + public Criteria andPaidTypeIsNull() { | ||
539 | + addCriterion("paid_type is null"); | ||
540 | + return (Criteria) this; | ||
541 | + } | ||
542 | + | ||
543 | + public Criteria andPaidTypeIsNotNull() { | ||
544 | + addCriterion("paid_type is not null"); | ||
545 | + return (Criteria) this; | ||
546 | + } | ||
547 | + | ||
548 | + public Criteria andPaidTypeEqualTo(String value) { | ||
549 | + addCriterion("paid_type =", value, "paidType"); | ||
550 | + return (Criteria) this; | ||
551 | + } | ||
552 | + | ||
553 | + public Criteria andPaidTypeNotEqualTo(String value) { | ||
554 | + addCriterion("paid_type <>", value, "paidType"); | ||
555 | + return (Criteria) this; | ||
556 | + } | ||
557 | + | ||
558 | + public Criteria andPaidTypeGreaterThan(String value) { | ||
559 | + addCriterion("paid_type >", value, "paidType"); | ||
560 | + return (Criteria) this; | ||
561 | + } | ||
562 | + | ||
563 | + public Criteria andPaidTypeGreaterThanOrEqualTo(String value) { | ||
564 | + addCriterion("paid_type >=", value, "paidType"); | ||
565 | + return (Criteria) this; | ||
566 | + } | ||
567 | + | ||
568 | + public Criteria andPaidTypeLessThan(String value) { | ||
569 | + addCriterion("paid_type <", value, "paidType"); | ||
570 | + return (Criteria) this; | ||
571 | + } | ||
572 | + | ||
573 | + public Criteria andPaidTypeLessThanOrEqualTo(String value) { | ||
574 | + addCriterion("paid_type <=", value, "paidType"); | ||
575 | + return (Criteria) this; | ||
576 | + } | ||
577 | + | ||
578 | + public Criteria andPaidTypeLike(String value) { | ||
579 | + addCriterion("paid_type like", value, "paidType"); | ||
580 | + return (Criteria) this; | ||
581 | + } | ||
582 | + | ||
583 | + public Criteria andPaidTypeNotLike(String value) { | ||
584 | + addCriterion("paid_type not like", value, "paidType"); | ||
585 | + return (Criteria) this; | ||
586 | + } | ||
587 | + | ||
588 | + public Criteria andPaidTypeIn(List<String> values) { | ||
589 | + addCriterion("paid_type in", values, "paidType"); | ||
590 | + return (Criteria) this; | ||
591 | + } | ||
592 | + | ||
593 | + public Criteria andPaidTypeNotIn(List<String> values) { | ||
594 | + addCriterion("paid_type not in", values, "paidType"); | ||
595 | + return (Criteria) this; | ||
596 | + } | ||
597 | + | ||
598 | + public Criteria andPaidTypeBetween(String value1, String value2) { | ||
599 | + addCriterion("paid_type between", value1, value2, "paidType"); | ||
600 | + return (Criteria) this; | ||
601 | + } | ||
602 | + | ||
603 | + public Criteria andPaidTypeNotBetween(String value1, String value2) { | ||
604 | + addCriterion("paid_type not between", value1, value2, "paidType"); | ||
605 | + return (Criteria) this; | ||
606 | + } | ||
607 | + | ||
608 | + public Criteria andReduceTypeIsNull() { | ||
609 | + addCriterion("reduce_type is null"); | ||
610 | + return (Criteria) this; | ||
611 | + } | ||
612 | + | ||
613 | + public Criteria andReduceTypeIsNotNull() { | ||
614 | + addCriterion("reduce_type is not null"); | ||
615 | + return (Criteria) this; | ||
616 | + } | ||
617 | + | ||
618 | + public Criteria andReduceTypeEqualTo(String value) { | ||
619 | + addCriterion("reduce_type =", value, "reduceType"); | ||
620 | + return (Criteria) this; | ||
621 | + } | ||
622 | + | ||
623 | + public Criteria andReduceTypeNotEqualTo(String value) { | ||
624 | + addCriterion("reduce_type <>", value, "reduceType"); | ||
625 | + return (Criteria) this; | ||
626 | + } | ||
627 | + | ||
628 | + public Criteria andReduceTypeGreaterThan(String value) { | ||
629 | + addCriterion("reduce_type >", value, "reduceType"); | ||
630 | + return (Criteria) this; | ||
631 | + } | ||
632 | + | ||
633 | + public Criteria andReduceTypeGreaterThanOrEqualTo(String value) { | ||
634 | + addCriterion("reduce_type >=", value, "reduceType"); | ||
635 | + return (Criteria) this; | ||
636 | + } | ||
637 | + | ||
638 | + public Criteria andReduceTypeLessThan(String value) { | ||
639 | + addCriterion("reduce_type <", value, "reduceType"); | ||
640 | + return (Criteria) this; | ||
641 | + } | ||
642 | + | ||
643 | + public Criteria andReduceTypeLessThanOrEqualTo(String value) { | ||
644 | + addCriterion("reduce_type <=", value, "reduceType"); | ||
645 | + return (Criteria) this; | ||
646 | + } | ||
647 | + | ||
648 | + public Criteria andReduceTypeLike(String value) { | ||
649 | + addCriterion("reduce_type like", value, "reduceType"); | ||
650 | + return (Criteria) this; | ||
651 | + } | ||
652 | + | ||
653 | + public Criteria andReduceTypeNotLike(String value) { | ||
654 | + addCriterion("reduce_type not like", value, "reduceType"); | ||
655 | + return (Criteria) this; | ||
656 | + } | ||
657 | + | ||
658 | + public Criteria andReduceTypeIn(List<String> values) { | ||
659 | + addCriterion("reduce_type in", values, "reduceType"); | ||
660 | + return (Criteria) this; | ||
661 | + } | ||
662 | + | ||
663 | + public Criteria andReduceTypeNotIn(List<String> values) { | ||
664 | + addCriterion("reduce_type not in", values, "reduceType"); | ||
665 | + return (Criteria) this; | ||
666 | + } | ||
667 | + | ||
668 | + public Criteria andReduceTypeBetween(String value1, String value2) { | ||
669 | + addCriterion("reduce_type between", value1, value2, "reduceType"); | ||
670 | + return (Criteria) this; | ||
671 | + } | ||
672 | + | ||
673 | + public Criteria andReduceTypeNotBetween(String value1, String value2) { | ||
674 | + addCriterion("reduce_type not between", value1, value2, "reduceType"); | ||
675 | + return (Criteria) this; | ||
676 | + } | ||
677 | + | ||
678 | + public Criteria andExpenseIsNull() { | ||
679 | + addCriterion("expense is null"); | ||
680 | + return (Criteria) this; | ||
681 | + } | ||
682 | + | ||
683 | + public Criteria andExpenseIsNotNull() { | ||
684 | + addCriterion("expense is not null"); | ||
685 | + return (Criteria) this; | ||
686 | + } | ||
687 | + | ||
688 | + public Criteria andExpenseEqualTo(Long value) { | ||
689 | + addCriterion("expense =", value, "expense"); | ||
690 | + return (Criteria) this; | ||
691 | + } | ||
692 | + | ||
693 | + public Criteria andExpenseNotEqualTo(Long value) { | ||
694 | + addCriterion("expense <>", value, "expense"); | ||
695 | + return (Criteria) this; | ||
696 | + } | ||
697 | + | ||
698 | + public Criteria andExpenseGreaterThan(Long value) { | ||
699 | + addCriterion("expense >", value, "expense"); | ||
700 | + return (Criteria) this; | ||
701 | + } | ||
702 | + | ||
703 | + public Criteria andExpenseGreaterThanOrEqualTo(Long value) { | ||
704 | + addCriterion("expense >=", value, "expense"); | ||
705 | + return (Criteria) this; | ||
706 | + } | ||
707 | + | ||
708 | + public Criteria andExpenseLessThan(Long value) { | ||
709 | + addCriterion("expense <", value, "expense"); | ||
710 | + return (Criteria) this; | ||
711 | + } | ||
712 | + | ||
713 | + public Criteria andExpenseLessThanOrEqualTo(Long value) { | ||
714 | + addCriterion("expense <=", value, "expense"); | ||
715 | + return (Criteria) this; | ||
716 | + } | ||
717 | + | ||
718 | + public Criteria andExpenseIn(List<Long> values) { | ||
719 | + addCriterion("expense in", values, "expense"); | ||
720 | + return (Criteria) this; | ||
721 | + } | ||
722 | + | ||
723 | + public Criteria andExpenseNotIn(List<Long> values) { | ||
724 | + addCriterion("expense not in", values, "expense"); | ||
725 | + return (Criteria) this; | ||
726 | + } | ||
727 | + | ||
728 | + public Criteria andExpenseBetween(Long value1, Long value2) { | ||
729 | + addCriterion("expense between", value1, value2, "expense"); | ||
730 | + return (Criteria) this; | ||
731 | + } | ||
732 | + | ||
733 | + public Criteria andExpenseNotBetween(Long value1, Long value2) { | ||
734 | + addCriterion("expense not between", value1, value2, "expense"); | ||
735 | + return (Criteria) this; | ||
736 | + } | ||
737 | + | ||
738 | + public Criteria andOrderStatusIsNull() { | ||
739 | + addCriterion("order_status is null"); | ||
740 | + return (Criteria) this; | ||
741 | + } | ||
742 | + | ||
743 | + public Criteria andOrderStatusIsNotNull() { | ||
744 | + addCriterion("order_status is not null"); | ||
745 | + return (Criteria) this; | ||
746 | + } | ||
747 | + | ||
748 | + public Criteria andOrderStatusEqualTo(String value) { | ||
749 | + addCriterion("order_status =", value, "orderStatus"); | ||
750 | + return (Criteria) this; | ||
751 | + } | ||
752 | + | ||
753 | + public Criteria andOrderStatusNotEqualTo(String value) { | ||
754 | + addCriterion("order_status <>", value, "orderStatus"); | ||
755 | + return (Criteria) this; | ||
756 | + } | ||
757 | + | ||
758 | + public Criteria andOrderStatusGreaterThan(String value) { | ||
759 | + addCriterion("order_status >", value, "orderStatus"); | ||
760 | + return (Criteria) this; | ||
761 | + } | ||
762 | + | ||
763 | + public Criteria andOrderStatusGreaterThanOrEqualTo(String value) { | ||
764 | + addCriterion("order_status >=", value, "orderStatus"); | ||
765 | + return (Criteria) this; | ||
766 | + } | ||
767 | + | ||
768 | + public Criteria andOrderStatusLessThan(String value) { | ||
769 | + addCriterion("order_status <", value, "orderStatus"); | ||
770 | + return (Criteria) this; | ||
771 | + } | ||
772 | + | ||
773 | + public Criteria andOrderStatusLessThanOrEqualTo(String value) { | ||
774 | + addCriterion("order_status <=", value, "orderStatus"); | ||
775 | + return (Criteria) this; | ||
776 | + } | ||
777 | + | ||
778 | + public Criteria andOrderStatusLike(String value) { | ||
779 | + addCriterion("order_status like", value, "orderStatus"); | ||
780 | + return (Criteria) this; | ||
781 | + } | ||
782 | + | ||
783 | + public Criteria andOrderStatusNotLike(String value) { | ||
784 | + addCriterion("order_status not like", value, "orderStatus"); | ||
785 | + return (Criteria) this; | ||
786 | + } | ||
787 | + | ||
788 | + public Criteria andOrderStatusIn(List<String> values) { | ||
789 | + addCriterion("order_status in", values, "orderStatus"); | ||
790 | + return (Criteria) this; | ||
791 | + } | ||
792 | + | ||
793 | + public Criteria andOrderStatusNotIn(List<String> values) { | ||
794 | + addCriterion("order_status not in", values, "orderStatus"); | ||
795 | + return (Criteria) this; | ||
796 | + } | ||
797 | + | ||
798 | + public Criteria andOrderStatusBetween(String value1, String value2) { | ||
799 | + addCriterion("order_status between", value1, value2, "orderStatus"); | ||
800 | + return (Criteria) this; | ||
801 | + } | ||
802 | + | ||
803 | + public Criteria andOrderStatusNotBetween(String value1, String value2) { | ||
804 | + addCriterion("order_status not between", value1, value2, "orderStatus"); | ||
805 | + return (Criteria) this; | ||
806 | + } | ||
807 | + | ||
808 | + public Criteria andCaseStatusIsNull() { | ||
809 | + addCriterion("case_status is null"); | ||
810 | + return (Criteria) this; | ||
811 | + } | ||
812 | + | ||
813 | + public Criteria andCaseStatusIsNotNull() { | ||
814 | + addCriterion("case_status is not null"); | ||
815 | + return (Criteria) this; | ||
816 | + } | ||
817 | + | ||
818 | + public Criteria andCaseStatusEqualTo(String value) { | ||
819 | + addCriterion("case_status =", value, "caseStatus"); | ||
820 | + return (Criteria) this; | ||
821 | + } | ||
822 | + | ||
823 | + public Criteria andCaseStatusNotEqualTo(String value) { | ||
824 | + addCriterion("case_status <>", value, "caseStatus"); | ||
825 | + return (Criteria) this; | ||
826 | + } | ||
827 | + | ||
828 | + public Criteria andCaseStatusGreaterThan(String value) { | ||
829 | + addCriterion("case_status >", value, "caseStatus"); | ||
830 | + return (Criteria) this; | ||
831 | + } | ||
832 | + | ||
833 | + public Criteria andCaseStatusGreaterThanOrEqualTo(String value) { | ||
834 | + addCriterion("case_status >=", value, "caseStatus"); | ||
835 | + return (Criteria) this; | ||
836 | + } | ||
837 | + | ||
838 | + public Criteria andCaseStatusLessThan(String value) { | ||
839 | + addCriterion("case_status <", value, "caseStatus"); | ||
840 | + return (Criteria) this; | ||
841 | + } | ||
842 | + | ||
843 | + public Criteria andCaseStatusLessThanOrEqualTo(String value) { | ||
844 | + addCriterion("case_status <=", value, "caseStatus"); | ||
845 | + return (Criteria) this; | ||
846 | + } | ||
847 | + | ||
848 | + public Criteria andCaseStatusLike(String value) { | ||
849 | + addCriterion("case_status like", value, "caseStatus"); | ||
850 | + return (Criteria) this; | ||
851 | + } | ||
852 | + | ||
853 | + public Criteria andCaseStatusNotLike(String value) { | ||
854 | + addCriterion("case_status not like", value, "caseStatus"); | ||
855 | + return (Criteria) this; | ||
856 | + } | ||
857 | + | ||
858 | + public Criteria andCaseStatusIn(List<String> values) { | ||
859 | + addCriterion("case_status in", values, "caseStatus"); | ||
860 | + return (Criteria) this; | ||
861 | + } | ||
862 | + | ||
863 | + public Criteria andCaseStatusNotIn(List<String> values) { | ||
864 | + addCriterion("case_status not in", values, "caseStatus"); | ||
865 | + return (Criteria) this; | ||
866 | + } | ||
867 | + | ||
868 | + public Criteria andCaseStatusBetween(String value1, String value2) { | ||
869 | + addCriterion("case_status between", value1, value2, "caseStatus"); | ||
870 | + return (Criteria) this; | ||
871 | + } | ||
872 | + | ||
873 | + public Criteria andCaseStatusNotBetween(String value1, String value2) { | ||
874 | + addCriterion("case_status not between", value1, value2, "caseStatus"); | ||
875 | + return (Criteria) this; | ||
876 | + } | ||
877 | + | ||
878 | + public Criteria andMemberIdIsNull() { | ||
879 | + addCriterion("member_id is null"); | ||
880 | + return (Criteria) this; | ||
881 | + } | ||
882 | + | ||
883 | + public Criteria andMemberIdIsNotNull() { | ||
884 | + addCriterion("member_id is not null"); | ||
885 | + return (Criteria) this; | ||
886 | + } | ||
887 | + | ||
888 | + public Criteria andMemberIdEqualTo(String value) { | ||
889 | + addCriterion("member_id =", value, "memberId"); | ||
890 | + return (Criteria) this; | ||
891 | + } | ||
892 | + | ||
893 | + public Criteria andMemberIdNotEqualTo(String value) { | ||
894 | + addCriterion("member_id <>", value, "memberId"); | ||
895 | + return (Criteria) this; | ||
896 | + } | ||
897 | + | ||
898 | + public Criteria andMemberIdGreaterThan(String value) { | ||
899 | + addCriterion("member_id >", value, "memberId"); | ||
900 | + return (Criteria) this; | ||
901 | + } | ||
902 | + | ||
903 | + public Criteria andMemberIdGreaterThanOrEqualTo(String value) { | ||
904 | + addCriterion("member_id >=", value, "memberId"); | ||
905 | + return (Criteria) this; | ||
906 | + } | ||
907 | + | ||
908 | + public Criteria andMemberIdLessThan(String value) { | ||
909 | + addCriterion("member_id <", value, "memberId"); | ||
910 | + return (Criteria) this; | ||
911 | + } | ||
912 | + | ||
913 | + public Criteria andMemberIdLessThanOrEqualTo(String value) { | ||
914 | + addCriterion("member_id <=", value, "memberId"); | ||
915 | + return (Criteria) this; | ||
916 | + } | ||
917 | + | ||
918 | + public Criteria andMemberIdLike(String value) { | ||
919 | + addCriterion("member_id like", value, "memberId"); | ||
920 | + return (Criteria) this; | ||
921 | + } | ||
922 | + | ||
923 | + public Criteria andMemberIdNotLike(String value) { | ||
924 | + addCriterion("member_id not like", value, "memberId"); | ||
925 | + return (Criteria) this; | ||
926 | + } | ||
927 | + | ||
928 | + public Criteria andMemberIdIn(List<String> values) { | ||
929 | + addCriterion("member_id in", values, "memberId"); | ||
930 | + return (Criteria) this; | ||
931 | + } | ||
932 | + | ||
933 | + public Criteria andMemberIdNotIn(List<String> values) { | ||
934 | + addCriterion("member_id not in", values, "memberId"); | ||
935 | + return (Criteria) this; | ||
936 | + } | ||
937 | + | ||
938 | + public Criteria andMemberIdBetween(String value1, String value2) { | ||
939 | + addCriterion("member_id between", value1, value2, "memberId"); | ||
940 | + return (Criteria) this; | ||
941 | + } | ||
942 | + | ||
943 | + public Criteria andMemberIdNotBetween(String value1, String value2) { | ||
944 | + addCriterion("member_id not between", value1, value2, "memberId"); | ||
945 | + return (Criteria) this; | ||
946 | + } | ||
947 | + | ||
948 | + public Criteria andCreateDateIsNull() { | ||
949 | + addCriterion("create_date is null"); | ||
950 | + return (Criteria) this; | ||
951 | + } | ||
952 | + | ||
953 | + public Criteria andCreateDateIsNotNull() { | ||
954 | + addCriterion("create_date is not null"); | ||
955 | + return (Criteria) this; | ||
956 | + } | ||
957 | + | ||
958 | + public Criteria andCreateDateEqualTo(Date value) { | ||
959 | + addCriterion("create_date =", value, "createDate"); | ||
960 | + return (Criteria) this; | ||
961 | + } | ||
962 | + | ||
963 | + public Criteria andCreateDateNotEqualTo(Date value) { | ||
964 | + addCriterion("create_date <>", value, "createDate"); | ||
965 | + return (Criteria) this; | ||
966 | + } | ||
967 | + | ||
968 | + public Criteria andCreateDateGreaterThan(Date value) { | ||
969 | + addCriterion("create_date >", value, "createDate"); | ||
970 | + return (Criteria) this; | ||
971 | + } | ||
972 | + | ||
973 | + public Criteria andCreateDateGreaterThanOrEqualTo(Date value) { | ||
974 | + addCriterion("create_date >=", value, "createDate"); | ||
975 | + return (Criteria) this; | ||
976 | + } | ||
977 | + | ||
978 | + public Criteria andCreateDateLessThan(Date value) { | ||
979 | + addCriterion("create_date <", value, "createDate"); | ||
980 | + return (Criteria) this; | ||
981 | + } | ||
982 | + | ||
983 | + public Criteria andCreateDateLessThanOrEqualTo(Date value) { | ||
984 | + addCriterion("create_date <=", value, "createDate"); | ||
985 | + return (Criteria) this; | ||
986 | + } | ||
987 | + | ||
988 | + public Criteria andCreateDateIn(List<Date> values) { | ||
989 | + addCriterion("create_date in", values, "createDate"); | ||
990 | + return (Criteria) this; | ||
991 | + } | ||
992 | + | ||
993 | + public Criteria andCreateDateNotIn(List<Date> values) { | ||
994 | + addCriterion("create_date not in", values, "createDate"); | ||
995 | + return (Criteria) this; | ||
996 | + } | ||
997 | + | ||
998 | + public Criteria andCreateDateBetween(Date value1, Date value2) { | ||
999 | + addCriterion("create_date between", value1, value2, "createDate"); | ||
1000 | + return (Criteria) this; | ||
1001 | + } | ||
1002 | + | ||
1003 | + public Criteria andCreateDateNotBetween(Date value1, Date value2) { | ||
1004 | + addCriterion("create_date not between", value1, value2, "createDate"); | ||
1005 | + return (Criteria) this; | ||
1006 | + } | ||
1007 | + | ||
1008 | + public Criteria andUpdateDateIsNull() { | ||
1009 | + addCriterion("update_date is null"); | ||
1010 | + return (Criteria) this; | ||
1011 | + } | ||
1012 | + | ||
1013 | + public Criteria andUpdateDateIsNotNull() { | ||
1014 | + addCriterion("update_date is not null"); | ||
1015 | + return (Criteria) this; | ||
1016 | + } | ||
1017 | + | ||
1018 | + public Criteria andUpdateDateEqualTo(Date value) { | ||
1019 | + addCriterion("update_date =", value, "updateDate"); | ||
1020 | + return (Criteria) this; | ||
1021 | + } | ||
1022 | + | ||
1023 | + public Criteria andUpdateDateNotEqualTo(Date value) { | ||
1024 | + addCriterion("update_date <>", value, "updateDate"); | ||
1025 | + return (Criteria) this; | ||
1026 | + } | ||
1027 | + | ||
1028 | + public Criteria andUpdateDateGreaterThan(Date value) { | ||
1029 | + addCriterion("update_date >", value, "updateDate"); | ||
1030 | + return (Criteria) this; | ||
1031 | + } | ||
1032 | + | ||
1033 | + public Criteria andUpdateDateGreaterThanOrEqualTo(Date value) { | ||
1034 | + addCriterion("update_date >=", value, "updateDate"); | ||
1035 | + return (Criteria) this; | ||
1036 | + } | ||
1037 | + | ||
1038 | + public Criteria andUpdateDateLessThan(Date value) { | ||
1039 | + addCriterion("update_date <", value, "updateDate"); | ||
1040 | + return (Criteria) this; | ||
1041 | + } | ||
1042 | + | ||
1043 | + public Criteria andUpdateDateLessThanOrEqualTo(Date value) { | ||
1044 | + addCriterion("update_date <=", value, "updateDate"); | ||
1045 | + return (Criteria) this; | ||
1046 | + } | ||
1047 | + | ||
1048 | + public Criteria andUpdateDateIn(List<Date> values) { | ||
1049 | + addCriterion("update_date in", values, "updateDate"); | ||
1050 | + return (Criteria) this; | ||
1051 | + } | ||
1052 | + | ||
1053 | + public Criteria andUpdateDateNotIn(List<Date> values) { | ||
1054 | + addCriterion("update_date not in", values, "updateDate"); | ||
1055 | + return (Criteria) this; | ||
1056 | + } | ||
1057 | + | ||
1058 | + public Criteria andUpdateDateBetween(Date value1, Date value2) { | ||
1059 | + addCriterion("update_date between", value1, value2, "updateDate"); | ||
1060 | + return (Criteria) this; | ||
1061 | + } | ||
1062 | + | ||
1063 | + public Criteria andUpdateDateNotBetween(Date value1, Date value2) { | ||
1064 | + addCriterion("update_date not between", value1, value2, "updateDate"); | ||
1065 | + return (Criteria) this; | ||
1066 | + } | ||
1067 | + } | ||
1068 | + | ||
1069 | + /** | ||
1070 | + * This class was generated by MyBatis Generator. | ||
1071 | + * This class corresponds to the database table casement | ||
1072 | + * | ||
1073 | + * @mbggenerated do_not_delete_during_merge | ||
1074 | + */ | ||
1075 | + public static class Criteria extends GeneratedCriteria { | ||
1076 | + | ||
1077 | + protected Criteria() { | ||
1078 | + super(); | ||
1079 | + } | ||
1080 | + } | ||
1081 | + | ||
1082 | + /** | ||
1083 | + * This class was generated by MyBatis Generator. | ||
1084 | + * This class corresponds to the database table casement | ||
1085 | + * | ||
1086 | + * @mbggenerated | ||
1087 | + */ | ||
1088 | + public static class Criterion { | ||
1089 | + private String condition; | ||
1090 | + | ||
1091 | + private Object value; | ||
1092 | + | ||
1093 | + private Object secondValue; | ||
1094 | + | ||
1095 | + private boolean noValue; | ||
1096 | + | ||
1097 | + private boolean singleValue; | ||
1098 | + | ||
1099 | + private boolean betweenValue; | ||
1100 | + | ||
1101 | + private boolean listValue; | ||
1102 | + | ||
1103 | + private String typeHandler; | ||
1104 | + | ||
1105 | + public String getCondition() { | ||
1106 | + return condition; | ||
1107 | + } | ||
1108 | + | ||
1109 | + public Object getValue() { | ||
1110 | + return value; | ||
1111 | + } | ||
1112 | + | ||
1113 | + public Object getSecondValue() { | ||
1114 | + return secondValue; | ||
1115 | + } | ||
1116 | + | ||
1117 | + public boolean isNoValue() { | ||
1118 | + return noValue; | ||
1119 | + } | ||
1120 | + | ||
1121 | + public boolean isSingleValue() { | ||
1122 | + return singleValue; | ||
1123 | + } | ||
1124 | + | ||
1125 | + public boolean isBetweenValue() { | ||
1126 | + return betweenValue; | ||
1127 | + } | ||
1128 | + | ||
1129 | + public boolean isListValue() { | ||
1130 | + return listValue; | ||
1131 | + } | ||
1132 | + | ||
1133 | + public String getTypeHandler() { | ||
1134 | + return typeHandler; | ||
1135 | + } | ||
1136 | + | ||
1137 | + protected Criterion(String condition) { | ||
1138 | + super(); | ||
1139 | + this.condition = condition; | ||
1140 | + this.typeHandler = null; | ||
1141 | + this.noValue = true; | ||
1142 | + } | ||
1143 | + | ||
1144 | + protected Criterion(String condition, Object value, String typeHandler) { | ||
1145 | + super(); | ||
1146 | + this.condition = condition; | ||
1147 | + this.value = value; | ||
1148 | + this.typeHandler = typeHandler; | ||
1149 | + if (value instanceof List<?>) { | ||
1150 | + this.listValue = true; | ||
1151 | + } else { | ||
1152 | + this.singleValue = true; | ||
1153 | + } | ||
1154 | + } | ||
1155 | + | ||
1156 | + protected Criterion(String condition, Object value) { | ||
1157 | + this(condition, value, null); | ||
1158 | + } | ||
1159 | + | ||
1160 | + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { | ||
1161 | + super(); | ||
1162 | + this.condition = condition; | ||
1163 | + this.value = value; | ||
1164 | + this.secondValue = secondValue; | ||
1165 | + this.typeHandler = typeHandler; | ||
1166 | + this.betweenValue = true; | ||
1167 | + } | ||
1168 | + | ||
1169 | + protected Criterion(String condition, Object value, Object secondValue) { | ||
1170 | + this(condition, value, secondValue, null); | ||
1171 | + } | ||
1172 | + } | ||
1173 | +} | ||
0 | \ No newline at end of file | 1174 | \ No newline at end of file |
src/main/java/com/canrd/patent/dal/model/MybatisTest.java
@@ -7,7 +7,7 @@ public class MybatisTest { | @@ -7,7 +7,7 @@ public class MybatisTest { | ||
7 | * | 7 | * |
8 | * @mbggenerated | 8 | * @mbggenerated |
9 | */ | 9 | */ |
10 | - private Integer id; | 10 | + private Long id; |
11 | 11 | ||
12 | /** | 12 | /** |
13 | * This field was generated by MyBatis Generator. | 13 | * This field was generated by MyBatis Generator. |
@@ -33,7 +33,7 @@ public class MybatisTest { | @@ -33,7 +33,7 @@ public class MybatisTest { | ||
33 | * | 33 | * |
34 | * @mbggenerated | 34 | * @mbggenerated |
35 | */ | 35 | */ |
36 | - public Integer getId() { | 36 | + public Long getId() { |
37 | return id; | 37 | return id; |
38 | } | 38 | } |
39 | 39 | ||
@@ -45,7 +45,7 @@ public class MybatisTest { | @@ -45,7 +45,7 @@ public class MybatisTest { | ||
45 | * | 45 | * |
46 | * @mbggenerated | 46 | * @mbggenerated |
47 | */ | 47 | */ |
48 | - public void setId(Integer id) { | 48 | + public void setId(Long id) { |
49 | this.id = id; | 49 | this.id = id; |
50 | } | 50 | } |
51 | 51 |
src/main/java/com/canrd/patent/dal/model/MybatisTestExample.java
@@ -204,52 +204,52 @@ public class MybatisTestExample { | @@ -204,52 +204,52 @@ public class MybatisTestExample { | ||
204 | return (Criteria) this; | 204 | return (Criteria) this; |
205 | } | 205 | } |
206 | 206 | ||
207 | - public Criteria andIdEqualTo(Integer value) { | 207 | + public Criteria andIdEqualTo(Long value) { |
208 | addCriterion("id =", value, "id"); | 208 | addCriterion("id =", value, "id"); |
209 | return (Criteria) this; | 209 | return (Criteria) this; |
210 | } | 210 | } |
211 | 211 | ||
212 | - public Criteria andIdNotEqualTo(Integer value) { | 212 | + public Criteria andIdNotEqualTo(Long value) { |
213 | addCriterion("id <>", value, "id"); | 213 | addCriterion("id <>", value, "id"); |
214 | return (Criteria) this; | 214 | return (Criteria) this; |
215 | } | 215 | } |
216 | 216 | ||
217 | - public Criteria andIdGreaterThan(Integer value) { | 217 | + public Criteria andIdGreaterThan(Long value) { |
218 | addCriterion("id >", value, "id"); | 218 | addCriterion("id >", value, "id"); |
219 | return (Criteria) this; | 219 | return (Criteria) this; |
220 | } | 220 | } |
221 | 221 | ||
222 | - public Criteria andIdGreaterThanOrEqualTo(Integer value) { | 222 | + public Criteria andIdGreaterThanOrEqualTo(Long value) { |
223 | addCriterion("id >=", value, "id"); | 223 | addCriterion("id >=", value, "id"); |
224 | return (Criteria) this; | 224 | return (Criteria) this; |
225 | } | 225 | } |
226 | 226 | ||
227 | - public Criteria andIdLessThan(Integer value) { | 227 | + public Criteria andIdLessThan(Long value) { |
228 | addCriterion("id <", value, "id"); | 228 | addCriterion("id <", value, "id"); |
229 | return (Criteria) this; | 229 | return (Criteria) this; |
230 | } | 230 | } |
231 | 231 | ||
232 | - public Criteria andIdLessThanOrEqualTo(Integer value) { | 232 | + public Criteria andIdLessThanOrEqualTo(Long value) { |
233 | addCriterion("id <=", value, "id"); | 233 | addCriterion("id <=", value, "id"); |
234 | return (Criteria) this; | 234 | return (Criteria) this; |
235 | } | 235 | } |
236 | 236 | ||
237 | - public Criteria andIdIn(List<Integer> values) { | 237 | + public Criteria andIdIn(List<Long> values) { |
238 | addCriterion("id in", values, "id"); | 238 | addCriterion("id in", values, "id"); |
239 | return (Criteria) this; | 239 | return (Criteria) this; |
240 | } | 240 | } |
241 | 241 | ||
242 | - public Criteria andIdNotIn(List<Integer> values) { | 242 | + public Criteria andIdNotIn(List<Long> values) { |
243 | addCriterion("id not in", values, "id"); | 243 | addCriterion("id not in", values, "id"); |
244 | return (Criteria) this; | 244 | return (Criteria) this; |
245 | } | 245 | } |
246 | 246 | ||
247 | - public Criteria andIdBetween(Integer value1, Integer value2) { | 247 | + public Criteria andIdBetween(Long value1, Long value2) { |
248 | addCriterion("id between", value1, value2, "id"); | 248 | addCriterion("id between", value1, value2, "id"); |
249 | return (Criteria) this; | 249 | return (Criteria) this; |
250 | } | 250 | } |
251 | 251 | ||
252 | - public Criteria andIdNotBetween(Integer value1, Integer value2) { | 252 | + public Criteria andIdNotBetween(Long value1, Long value2) { |
253 | addCriterion("id not between", value1, value2, "id"); | 253 | addCriterion("id not between", value1, value2, "id"); |
254 | return (Criteria) this; | 254 | return (Criteria) this; |
255 | } | 255 | } |
src/main/java/com/canrd/patent/dal/query/CaseQuery.java
0 → 100644
src/main/java/com/canrd/patent/service/CaseHandlingService.java
0 → 100644
1 | +package com.canrd.patent.service; | ||
2 | + | ||
3 | +import com.canrd.patent.dal.enums.*; | ||
4 | +import com.canrd.patent.dal.mapper.CasementMapper; | ||
5 | +import com.canrd.patent.dal.model.Casement; | ||
6 | +import com.canrd.patent.dal.model.CasementExample; | ||
7 | +import org.springframework.stereotype.Service; | ||
8 | +import org.springframework.transaction.annotation.Isolation; | ||
9 | +import org.springframework.transaction.annotation.Propagation; | ||
10 | +import org.springframework.transaction.annotation.Transactional; | ||
11 | +import org.springframework.util.CollectionUtils; | ||
12 | +import org.springframework.util.StringUtils; | ||
13 | + | ||
14 | +import javax.annotation.Resource; | ||
15 | +import java.util.Date; | ||
16 | +import java.util.List; | ||
17 | + | ||
18 | +/** | ||
19 | + * Created by ouyangmao on 16/7/17. | ||
20 | + */ | ||
21 | +@Service | ||
22 | +public class CaseHandlingService { | ||
23 | + @Resource | ||
24 | + private CasementMapper casementMapper; | ||
25 | + | ||
26 | + /*** | ||
27 | + * 保存案件 | ||
28 | + * @param caseTypeEnum | ||
29 | + * @param serviceTypeEnum | ||
30 | + * @param paidTypeEnum | ||
31 | + * @param reduceTypeEnum | ||
32 | + * @param expense | ||
33 | + */ | ||
34 | + public void saveCase(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense,String memberId){ | ||
35 | + Casement preCasement = findCasement(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum, expense); | ||
36 | + if(StringUtils.isEmpty(preCasement)) { | ||
37 | + Casement casement = new Casement(); | ||
38 | + casement.setCaseType(caseTypeEnum.name()); | ||
39 | + casement.setCasesn(generatorCaseSn()); | ||
40 | + casement.setServiceType(serviceTypeEnum.name()); | ||
41 | + casement.setPaidType(paidTypeEnum.name()); | ||
42 | + casement.setReduceType(reduceTypeEnum != null ? reduceTypeEnum.name() : null); | ||
43 | + casement.setExpense(expense); | ||
44 | + casement.setOrderStatus(OrderStatusEnum.SUBMITED.name()); | ||
45 | + casement.setCaseStatus(CaseStatusEnum.INIT.name()); | ||
46 | + casement.setMemberId(memberId); | ||
47 | + casement.setCreateDate(new Date()); | ||
48 | + casement.setUpdateDate(new Date()); | ||
49 | + casementMapper.insertSelective(casement); | ||
50 | + } | ||
51 | + } | ||
52 | + | ||
53 | + /*** | ||
54 | + * 查询案件 | ||
55 | + * @param caseTypeEnum | ||
56 | + * @param serviceTypeEnum | ||
57 | + * @param paidTypeEnum | ||
58 | + * @param reduceTypeEnum | ||
59 | + * @param expense | ||
60 | + * @return | ||
61 | + */ | ||
62 | + public Casement findCasement(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense){ | ||
63 | + CasementExample casementExample = new CasementExample(); | ||
64 | + CasementExample.Criteria criteria = casementExample.createCriteria(); | ||
65 | + criteria.andCaseTypeEqualTo(caseTypeEnum.name()); | ||
66 | + criteria.andServiceTypeEqualTo(serviceTypeEnum.name()); | ||
67 | + criteria.andPaidTypeEqualTo(paidTypeEnum.name()); | ||
68 | + if(reduceTypeEnum != null) { | ||
69 | + criteria.andReduceTypeEqualTo(reduceTypeEnum.name() ); | ||
70 | + } | ||
71 | + criteria.andExpenseEqualTo(expense); | ||
72 | + List<Casement> casementList = casementMapper.selectByExample(casementExample); | ||
73 | + if(CollectionUtils.isEmpty(casementList)){ | ||
74 | + return null; | ||
75 | + }else{ | ||
76 | + return casementList.get(0); | ||
77 | + } | ||
78 | + } | ||
79 | + | ||
80 | + /*** | ||
81 | + * 查询所有案件列表 | ||
82 | + * @return | ||
83 | + */ | ||
84 | + public List<Casement> findCasementList(){ | ||
85 | + CasementExample casementExample = new CasementExample(); | ||
86 | + return casementMapper.selectByExample(casementExample); | ||
87 | + } | ||
88 | + | ||
89 | + /*** | ||
90 | + * 生成案件编号 | ||
91 | + * @return | ||
92 | + */ | ||
93 | + @Transactional(isolation= Isolation.SERIALIZABLE,propagation = Propagation.REQUIRED,noRollbackFor = RuntimeException.class) | ||
94 | + private String generatorCaseSn(){ | ||
95 | + CasementExample casementExample = new CasementExample(); | ||
96 | + casementExample.setOrderByClause("caseSn desc limit 1"); | ||
97 | + List<Casement> casementList = casementMapper.selectByExample(casementExample); | ||
98 | + if(!CollectionUtils.isEmpty(casementList)){ | ||
99 | + String caseSn = casementList.get(0).getCasesn(); | ||
100 | + int sn = Integer.parseInt(caseSn.substring(2, caseSn.length())); | ||
101 | + return caseSn.substring(0,2)+(sn+1); | ||
102 | + }else { | ||
103 | + return "KC"+"00000000"; | ||
104 | + } | ||
105 | + } | ||
106 | +} |
src/main/java/com/canrd/patent/service/HomePatentService.java
0 → 100644
1 | +package com.canrd.patent.service; | ||
2 | + | ||
3 | +import com.canrd.patent.dal.dto.HomePatentTypeOutputDto; | ||
4 | +import com.canrd.patent.dal.enums.CaseTypeEnum; | ||
5 | +import com.canrd.patent.dal.enums.PaidTypeEnum; | ||
6 | +import com.canrd.patent.dal.enums.ReduceTypeEnum; | ||
7 | +import com.canrd.patent.dal.enums.ServiceTypeEnum; | ||
8 | +import com.canrd.patent.dal.mapper.CasementMapper; | ||
9 | +import com.canrd.patent.dal.model.Casement; | ||
10 | +import com.canrd.patent.dal.model.CasementExample; | ||
11 | +import com.google.common.collect.Lists; | ||
12 | +import com.google.common.collect.Maps; | ||
13 | +import org.springframework.stereotype.Service; | ||
14 | +import org.springframework.transaction.annotation.Isolation; | ||
15 | +import org.springframework.transaction.annotation.Propagation; | ||
16 | +import org.springframework.transaction.annotation.Transactional; | ||
17 | +import org.springframework.util.CollectionUtils; | ||
18 | + | ||
19 | +import javax.annotation.Resource; | ||
20 | +import java.util.List; | ||
21 | +import java.util.Map; | ||
22 | + | ||
23 | +/** | ||
24 | + * Created by ouyangmao on 16/7/16. | ||
25 | + */ | ||
26 | +@Service | ||
27 | +public class HomePatentService { | ||
28 | + public static Map<String,Long> priceMap = Maps.newHashMap(); | ||
29 | + static{ | ||
30 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),299900l);//标准+不缴纳 | ||
31 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),299900l+345000l);//担保+缴纳(不减免) | ||
32 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),299900l+107000l);//担保+缴纳(70%) | ||
33 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),299900l+56000l);//担保+缴纳(85%) | ||
34 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.NO_PAID.name(),299900l+290000l);//担保+不缴纳 | ||
35 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),299900l+290000l+345000l);//担保+缴纳(不减免) | ||
36 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),299900l+290000l+107000l);//担保+缴纳(70%) | ||
37 | + priceMap.put(CaseTypeEnum.INVENTION_TYPE.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),299900l+290000l+56000l);//担保+缴纳(85%) | ||
38 | + | ||
39 | + //使用类型 | ||
40 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),149900l); | ||
41 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),149900l+50000l); | ||
42 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),149900l+15000l); | ||
43 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),149900l+7500l); | ||
44 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.NO_PAID.name(),149900l+50000l); | ||
45 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),149900l+50000l+50000l); | ||
46 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),149900l+50000l+15000l); | ||
47 | + priceMap.put(CaseTypeEnum.PRACTICAL_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),149900l+50000l+7500l); | ||
48 | + | ||
49 | + | ||
50 | + //外观设计 | ||
51 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),49900l); | ||
52 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),49900l+50000l); | ||
53 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),49900l+15000l); | ||
54 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),49900l+7500l); | ||
55 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.NO_PAID.name(),49900l+20000l); | ||
56 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),49900l+20000l+50000l); | ||
57 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),49900l+20000l+15000l); | ||
58 | + priceMap.put(CaseTypeEnum.APPEARENCE_DESIGN.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),49900l+20000l+7500l); | ||
59 | + | ||
60 | + //发明+新型 | ||
61 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),380000l); | ||
62 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),299900l+395000l); | ||
63 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),299900l+122000l); | ||
64 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),299900l+63500l); | ||
65 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.STANDERD_SERVICE.name()+ PaidTypeEnum.NO_PAID.name(),380000l+350000); | ||
66 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P0.name(),299900l+290000l+395000l); | ||
67 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P70.name(),299900l+290000l+122000l); | ||
68 | + priceMap.put(CaseTypeEnum.INVENTION_NEW.name()+ ServiceTypeEnum.AUTHORITY_GUARANTEE.name()+ PaidTypeEnum.PAID.name()+ ReduceTypeEnum.P85.name(),299900l+290000l+63500l); | ||
69 | + } | ||
70 | + @Resource | ||
71 | + private CasementMapper casementMapper; | ||
72 | + /*** | ||
73 | + * 计算价格 | ||
74 | + * @param caseTypeEnum | ||
75 | + * @param serviceTypeEnum | ||
76 | + * @param paidTypeEnum | ||
77 | + * @param reduceTypeEnum | ||
78 | + * @return | ||
79 | + */ | ||
80 | + public Long caculatePrice(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum){ | ||
81 | + //发明类型 | ||
82 | + if(reduceTypeEnum==null){ | ||
83 | + return priceMap.get(caseTypeEnum.name()+serviceTypeEnum.name()+paidTypeEnum.name()); | ||
84 | + }else{ | ||
85 | + return priceMap.get(caseTypeEnum.name()+serviceTypeEnum.name()+paidTypeEnum.name()+reduceTypeEnum.name()); | ||
86 | + } | ||
87 | + } | ||
88 | + | ||
89 | + /*** | ||
90 | + * 国内专利类型 | ||
91 | + * @return | ||
92 | + */ | ||
93 | + public HomePatentTypeOutputDto homePatentTypeList(){ | ||
94 | + HomePatentTypeOutputDto outputDto = new HomePatentTypeOutputDto(); | ||
95 | + | ||
96 | + List<HomePatentTypeOutputDto.CaseType> caseTypeList = Lists.newArrayList(); | ||
97 | + outputDto.setCaseTypeList(caseTypeList); | ||
98 | + for(CaseTypeEnum caseTypeEnum:CaseTypeEnum.values()){ | ||
99 | + HomePatentTypeOutputDto.CaseType caseType = getCaseTypeOutputDto(caseTypeEnum); | ||
100 | + caseTypeList.add(caseType); | ||
101 | + } | ||
102 | + | ||
103 | + List<HomePatentTypeOutputDto.ServiceType> serviceTypeList = Lists.newArrayList(); | ||
104 | + outputDto.setServiceTypeList(serviceTypeList); | ||
105 | + for(ServiceTypeEnum serviceTypeEnum:ServiceTypeEnum.values()){ | ||
106 | + HomePatentTypeOutputDto.ServiceType serviceType = getServiceTypeOutputDto(serviceTypeEnum); | ||
107 | + serviceTypeList.add(serviceType); | ||
108 | + } | ||
109 | + | ||
110 | + List<HomePatentTypeOutputDto.PaidType> paidTypeList = Lists.newArrayList(); | ||
111 | + outputDto.setPaidTypeList(paidTypeList); | ||
112 | + for(PaidTypeEnum paidTypeEnum:PaidTypeEnum.values()){ | ||
113 | + HomePatentTypeOutputDto.PaidType paidType = getPaidTypeOutputDto(paidTypeEnum); | ||
114 | + paidTypeList.add(paidType); | ||
115 | + } | ||
116 | + | ||
117 | + List<HomePatentTypeOutputDto.ReduceType> reduceTypeList = Lists.newArrayList(); | ||
118 | + outputDto.setReduceTypeList(reduceTypeList); | ||
119 | + for(ReduceTypeEnum reduceTypeEnum:ReduceTypeEnum.values()){ | ||
120 | + HomePatentTypeOutputDto.ReduceType reduceType = getReduceTypeOutputDto(reduceTypeEnum); | ||
121 | + reduceTypeList.add(reduceType); | ||
122 | + } | ||
123 | + return outputDto; | ||
124 | + } | ||
125 | + | ||
126 | + private HomePatentTypeOutputDto.ServiceType getServiceTypeOutputDto(ServiceTypeEnum serviceTypeEnum) { | ||
127 | + HomePatentTypeOutputDto.ServiceType serviceType = new HomePatentTypeOutputDto.ServiceType(); | ||
128 | + serviceType.setId(serviceTypeEnum.getVal()); | ||
129 | + serviceType.setName(serviceTypeEnum.name()); | ||
130 | + serviceType.setTitle(serviceTypeEnum.getTitle()); | ||
131 | + serviceType.setDescription(serviceTypeEnum.getDescription()); | ||
132 | + return serviceType; | ||
133 | + } | ||
134 | + | ||
135 | + private HomePatentTypeOutputDto.CaseType getCaseTypeOutputDto(CaseTypeEnum caseTypeEnum) { | ||
136 | + HomePatentTypeOutputDto.CaseType caseType = new HomePatentTypeOutputDto.CaseType(); | ||
137 | + caseType.setId(caseTypeEnum.getVal()); | ||
138 | + caseType.setName(caseTypeEnum.name()); | ||
139 | + caseType.setTitle(caseTypeEnum.getTitle()); | ||
140 | + caseType.setDescription(caseTypeEnum.getDescription()); | ||
141 | + return caseType; | ||
142 | + } | ||
143 | + | ||
144 | + private HomePatentTypeOutputDto.PaidType getPaidTypeOutputDto(PaidTypeEnum paidTypeEnum) { | ||
145 | + HomePatentTypeOutputDto.PaidType paidType = new HomePatentTypeOutputDto.PaidType(); | ||
146 | + paidType.setId(paidTypeEnum.getVal()); | ||
147 | + paidType.setName(paidTypeEnum.name()); | ||
148 | + paidType.setTitle(paidTypeEnum.getTitle()); | ||
149 | + paidType.setDescription(paidTypeEnum.getDescription()); | ||
150 | + return paidType; | ||
151 | + } | ||
152 | + | ||
153 | + private HomePatentTypeOutputDto.ReduceType getReduceTypeOutputDto(ReduceTypeEnum reduceTypeEnum) { | ||
154 | + HomePatentTypeOutputDto.ReduceType reduceType = new HomePatentTypeOutputDto.ReduceType(); | ||
155 | + reduceType.setId(reduceTypeEnum.getVal()); | ||
156 | + reduceType.setName(reduceTypeEnum.name()); | ||
157 | + reduceType.setTitle(reduceTypeEnum.getTitle()); | ||
158 | + reduceType.setDescription(reduceTypeEnum.getDescription()); | ||
159 | + return reduceType; | ||
160 | + } | ||
161 | +} |
src/main/java/com/canrd/patent/web/HelloController.java
@@ -109,7 +109,7 @@ public class HelloController { | @@ -109,7 +109,7 @@ public class HelloController { | ||
109 | @ResponseBody | 109 | @ResponseBody |
110 | @RequestMapping(value="/mybatis_auto_test") | 110 | @RequestMapping(value="/mybatis_auto_test") |
111 | public String auto_find(){ | 111 | public String auto_find(){ |
112 | - MybatisTest mybatisTest = mybatisTestMapper.selectByPrimaryKey(1); | 112 | + MybatisTest mybatisTest = mybatisTestMapper.selectByPrimaryKey(1l); |
113 | System.out.println(mybatisTest.getId()+","+mybatisTest.getName()+","+mybatisTest.getAge()); | 113 | System.out.println(mybatisTest.getId()+","+mybatisTest.getName()+","+mybatisTest.getAge()); |
114 | return "conn"; | 114 | return "conn"; |
115 | } | 115 | } |
src/main/java/com/canrd/patent/web/HomePatentController.java
0 → 100644
1 | +package com.canrd.patent.web; | ||
2 | + | ||
3 | +import com.canrd.patent.common.standard.StdJson; | ||
4 | +import com.canrd.patent.common.utils.TextUtils; | ||
5 | +import com.canrd.patent.dal.constant.FrontConstant; | ||
6 | +import com.canrd.patent.dal.dto.CaseInputDto; | ||
7 | +import com.canrd.patent.dal.enums.CaseTypeEnum; | ||
8 | +import com.canrd.patent.dal.enums.PaidTypeEnum; | ||
9 | +import com.canrd.patent.dal.enums.ReduceTypeEnum; | ||
10 | +import com.canrd.patent.dal.enums.ServiceTypeEnum; | ||
11 | +import com.canrd.patent.dal.model.Casement; | ||
12 | +import com.canrd.patent.service.CaseHandlingService; | ||
13 | +import com.canrd.patent.service.HomePatentService; | ||
14 | +import org.slf4j.Logger; | ||
15 | +import org.slf4j.LoggerFactory; | ||
16 | +import org.springframework.stereotype.Controller; | ||
17 | +import org.springframework.util.Assert; | ||
18 | +import org.springframework.util.StringUtils; | ||
19 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
20 | +import org.springframework.web.bind.annotation.ResponseBody; | ||
21 | + | ||
22 | +import javax.annotation.Resource; | ||
23 | +import java.util.List; | ||
24 | + | ||
25 | +/** | ||
26 | + * 调试的controller | ||
27 | + * Created by ouyangmao on 16/3/28. | ||
28 | + */ | ||
29 | +@Controller | ||
30 | +public class HomePatentController { | ||
31 | + private static final Logger logger = LoggerFactory.getLogger(HomePatentController.class); | ||
32 | + @Resource | ||
33 | + private HomePatentService homePatentService; | ||
34 | + @Resource | ||
35 | + private CaseHandlingService caseHandlingService; | ||
36 | + | ||
37 | + public static String MEMBER_ID="372e5fa0f46c42b0836d39091ebd07d0"; | ||
38 | + | ||
39 | + /*** | ||
40 | + * 计算价格 | ||
41 | + * @param caseType(不能为空) | ||
42 | + * @param serviceType(不能为空) | ||
43 | + * @param paidType(不能为空) | ||
44 | + * @param reduceType(可以为空) | ||
45 | + * @return | ||
46 | + */ | ||
47 | + @ResponseBody | ||
48 | + @RequestMapping(value="/caculate_price") | ||
49 | + public Object caculatePrice(String caseType,String serviceType,String paidType,String reduceType){ | ||
50 | + try { | ||
51 | + Assert.notNull(caseType, "castType不能为空"); | ||
52 | + Assert.notNull(serviceType, "serviceType不能为空"); | ||
53 | + Assert.notNull(paidType, "paidType不能为空"); | ||
54 | + CaseTypeEnum caseTypeEnum = CaseTypeEnum.valueOf(caseType); | ||
55 | + ServiceTypeEnum serviceTypeEnum = ServiceTypeEnum.valueOf(serviceType); | ||
56 | + PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(paidType); | ||
57 | + ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(reduceType) ? ReduceTypeEnum.valueOf(reduceType) : null; | ||
58 | + Long price = homePatentService.caculatePrice(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum); | ||
59 | + return StdJson.ok(price/100); | ||
60 | + }catch (Exception e){ | ||
61 | + logger.warn("[HomePatentController][caculatePrice] caculate price error ",e); | ||
62 | + return StdJson.err(-1,e.getMessage()); | ||
63 | + } | ||
64 | + } | ||
65 | + | ||
66 | + /*** | ||
67 | + * 获取所有类型 | ||
68 | + * @return | ||
69 | + */ | ||
70 | + @ResponseBody | ||
71 | + @RequestMapping(value="/home_patent_type_list") | ||
72 | + public Object homePatentTypeList(){ | ||
73 | + try { | ||
74 | + return StdJson.ok(homePatentService.homePatentTypeList()); | ||
75 | + }catch (Exception e){ | ||
76 | + logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e); | ||
77 | + return StdJson.err(-1,e.getMessage()); | ||
78 | + } | ||
79 | + } | ||
80 | + | ||
81 | + @ResponseBody | ||
82 | + @RequestMapping(value="/submit_case") | ||
83 | + public Object submitCase(CaseInputDto caseInputDto){ | ||
84 | + try { | ||
85 | + Assert.notNull(caseInputDto.getCaseType(), "castType不能为空"); | ||
86 | + Assert.notNull(caseInputDto.getServiceType(), "serviceType不能为空"); | ||
87 | + Assert.notNull(caseInputDto.getPaidType(), "paidType不能为空"); | ||
88 | + Assert.notNull(caseInputDto.getExpense(), "expense不能为空"); | ||
89 | + CaseTypeEnum caseTypeEnum = CaseTypeEnum.valueOf(caseInputDto.getCaseType()); | ||
90 | + ServiceTypeEnum serviceTypeEnum = ServiceTypeEnum.valueOf(caseInputDto.getServiceType()); | ||
91 | + PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(caseInputDto.getPaidType()); | ||
92 | + ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null; | ||
93 | + Long expense = Long.parseLong(caseInputDto.getExpense())*100; | ||
94 | + caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,MEMBER_ID); | ||
95 | + return StdJson.ok("添加成功"); | ||
96 | + }catch (Exception e){ | ||
97 | + logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e); | ||
98 | + return StdJson.err(-1,e.getMessage()); | ||
99 | + } | ||
100 | + } | ||
101 | + | ||
102 | + @ResponseBody | ||
103 | + @RequestMapping(value="/find_case_list") | ||
104 | + public Object findCasementList(CaseInputDto caseInputDto){ | ||
105 | + try { | ||
106 | + List<Casement> casementList = caseHandlingService.findCasementList(); | ||
107 | + return StdJson.ok(casementList); | ||
108 | + }catch (Exception e){ | ||
109 | + logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e); | ||
110 | + return StdJson.err(-1,e.getMessage()); | ||
111 | + } | ||
112 | + } | ||
113 | +} |
src/main/java/com/canrd/patent/web/IndexController.java
@@ -2,7 +2,6 @@ package com.canrd.patent.web; | @@ -2,7 +2,6 @@ package com.canrd.patent.web; | ||
2 | 2 | ||
3 | import com.canrd.patent.common.standard.StdJson; | 3 | import com.canrd.patent.common.standard.StdJson; |
4 | import com.canrd.patent.dal.constant.FrontConstant; | 4 | import com.canrd.patent.dal.constant.FrontConstant; |
5 | -import com.sun.tools.javac.code.Attribute; | ||
6 | import org.springframework.stereotype.Controller; | 5 | import org.springframework.stereotype.Controller; |
7 | import org.springframework.web.bind.annotation.RequestMapping; | 6 | import org.springframework.web.bind.annotation.RequestMapping; |
8 | import org.springframework.web.bind.annotation.ResponseBody; | 7 | import org.springframework.web.bind.annotation.ResponseBody; |
src/main/resources.local/props/jdbc.properties
1 | # \u3010DEV\u3011 | 1 | # \u3010DEV\u3011 |
2 | -jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/jfinalshop?characterEncoding=utf8 | 2 | +jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 |
3 | jdbc.canrd.username = root | 3 | jdbc.canrd.username = root |
4 | jdbc.canrd.password = miao.1201 | 4 | jdbc.canrd.password = miao.1201 |
5 | jdbc.canrd.max.conn = 10 | 5 | jdbc.canrd.max.conn = 10 |
src/main/resources/applicationContext.xml
@@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
10 | <!--配置数据源--> | 10 | <!--配置数据源--> |
11 | <import resource="classpath:spring/dao.xml" /> | 11 | <import resource="classpath:spring/dao.xml" /> |
12 | <!--添加定时任务--> | 12 | <!--添加定时任务--> |
13 | - <!--<import resource="classpath:spring/task.xml" />--> | 13 | + <import resource="classpath:spring/task.xml" /> |
14 | <!--tool.xml--> | 14 | <!--tool.xml--> |
15 | <import resource="classpath:spring/tool.xml" /> | 15 | <import resource="classpath:spring/tool.xml" /> |
16 | </beans> | 16 | </beans> |
src/main/resources/mapper/CasementMapper.xml
0 → 100644
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
3 | +<mapper namespace="com.canrd.patent.dal.mapper.CasementMapper"> | ||
4 | + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Casement"> | ||
5 | + <!-- | ||
6 | + WARNING - @mbggenerated | ||
7 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
8 | + --> | ||
9 | + <id column="id" jdbcType="BIGINT" property="id" /> | ||
10 | + <result column="name" jdbcType="VARCHAR" property="name" /> | ||
11 | + <result column="caseSn" jdbcType="VARCHAR" property="casesn" /> | ||
12 | + <result column="case_type" jdbcType="VARCHAR" property="caseType" /> | ||
13 | + <result column="service_type" jdbcType="VARCHAR" property="serviceType" /> | ||
14 | + <result column="paid_type" jdbcType="VARCHAR" property="paidType" /> | ||
15 | + <result column="reduce_type" jdbcType="VARCHAR" property="reduceType" /> | ||
16 | + <result column="expense" jdbcType="BIGINT" property="expense" /> | ||
17 | + <result column="order_status" jdbcType="VARCHAR" property="orderStatus" /> | ||
18 | + <result column="case_status" jdbcType="VARCHAR" property="caseStatus" /> | ||
19 | + <result column="member_id" jdbcType="VARCHAR" property="memberId" /> | ||
20 | + <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||
21 | + <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||
22 | + </resultMap> | ||
23 | + <sql id="Example_Where_Clause"> | ||
24 | + <!-- | ||
25 | + WARNING - @mbggenerated | ||
26 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
27 | + --> | ||
28 | + <where> | ||
29 | + <foreach collection="oredCriteria" item="criteria" separator="or"> | ||
30 | + <if test="criteria.valid"> | ||
31 | + <trim prefix="(" prefixOverrides="and" suffix=")"> | ||
32 | + <foreach collection="criteria.criteria" item="criterion"> | ||
33 | + <choose> | ||
34 | + <when test="criterion.noValue"> | ||
35 | + and ${criterion.condition} | ||
36 | + </when> | ||
37 | + <when test="criterion.singleValue"> | ||
38 | + and ${criterion.condition} #{criterion.value} | ||
39 | + </when> | ||
40 | + <when test="criterion.betweenValue"> | ||
41 | + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} | ||
42 | + </when> | ||
43 | + <when test="criterion.listValue"> | ||
44 | + and ${criterion.condition} | ||
45 | + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> | ||
46 | + #{listItem} | ||
47 | + </foreach> | ||
48 | + </when> | ||
49 | + </choose> | ||
50 | + </foreach> | ||
51 | + </trim> | ||
52 | + </if> | ||
53 | + </foreach> | ||
54 | + </where> | ||
55 | + </sql> | ||
56 | + <sql id="Update_By_Example_Where_Clause"> | ||
57 | + <!-- | ||
58 | + WARNING - @mbggenerated | ||
59 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
60 | + --> | ||
61 | + <where> | ||
62 | + <foreach collection="example.oredCriteria" item="criteria" separator="or"> | ||
63 | + <if test="criteria.valid"> | ||
64 | + <trim prefix="(" prefixOverrides="and" suffix=")"> | ||
65 | + <foreach collection="criteria.criteria" item="criterion"> | ||
66 | + <choose> | ||
67 | + <when test="criterion.noValue"> | ||
68 | + and ${criterion.condition} | ||
69 | + </when> | ||
70 | + <when test="criterion.singleValue"> | ||
71 | + and ${criterion.condition} #{criterion.value} | ||
72 | + </when> | ||
73 | + <when test="criterion.betweenValue"> | ||
74 | + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} | ||
75 | + </when> | ||
76 | + <when test="criterion.listValue"> | ||
77 | + and ${criterion.condition} | ||
78 | + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> | ||
79 | + #{listItem} | ||
80 | + </foreach> | ||
81 | + </when> | ||
82 | + </choose> | ||
83 | + </foreach> | ||
84 | + </trim> | ||
85 | + </if> | ||
86 | + </foreach> | ||
87 | + </where> | ||
88 | + </sql> | ||
89 | + <sql id="Base_Column_List"> | ||
90 | + <!-- | ||
91 | + WARNING - @mbggenerated | ||
92 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
93 | + --> | ||
94 | + id, name, caseSn, case_type, service_type, paid_type, reduce_type, expense, order_status, | ||
95 | + case_status, member_id, create_date, update_date | ||
96 | + </sql> | ||
97 | + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultMap="BaseResultMap"> | ||
98 | + <!-- | ||
99 | + WARNING - @mbggenerated | ||
100 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
101 | + --> | ||
102 | + select | ||
103 | + <if test="distinct"> | ||
104 | + distinct | ||
105 | + </if> | ||
106 | + <include refid="Base_Column_List" /> | ||
107 | + from casement | ||
108 | + <if test="_parameter != null"> | ||
109 | + <include refid="Example_Where_Clause" /> | ||
110 | + </if> | ||
111 | + <if test="orderByClause != null"> | ||
112 | + order by ${orderByClause} | ||
113 | + </if> | ||
114 | + </select> | ||
115 | + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> | ||
116 | + <!-- | ||
117 | + WARNING - @mbggenerated | ||
118 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
119 | + --> | ||
120 | + select | ||
121 | + <include refid="Base_Column_List" /> | ||
122 | + from casement | ||
123 | + where id = #{id,jdbcType=BIGINT} | ||
124 | + </select> | ||
125 | + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> | ||
126 | + <!-- | ||
127 | + WARNING - @mbggenerated | ||
128 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
129 | + --> | ||
130 | + delete from casement | ||
131 | + where id = #{id,jdbcType=BIGINT} | ||
132 | + </delete> | ||
133 | + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.CasementExample"> | ||
134 | + <!-- | ||
135 | + WARNING - @mbggenerated | ||
136 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
137 | + --> | ||
138 | + delete from casement | ||
139 | + <if test="_parameter != null"> | ||
140 | + <include refid="Example_Where_Clause" /> | ||
141 | + </if> | ||
142 | + </delete> | ||
143 | + <insert id="insert" parameterType="com.canrd.patent.dal.model.Casement"> | ||
144 | + <!-- | ||
145 | + WARNING - @mbggenerated | ||
146 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
147 | + --> | ||
148 | + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> | ||
149 | + SELECT LAST_INSERT_ID() | ||
150 | + </selectKey> | ||
151 | + insert into casement (name, caseSn, case_type, | ||
152 | + service_type, paid_type, reduce_type, | ||
153 | + expense, order_status, case_status, | ||
154 | + member_id, create_date, update_date | ||
155 | + ) | ||
156 | + values (#{name,jdbcType=VARCHAR}, #{casesn,jdbcType=VARCHAR}, #{caseType,jdbcType=VARCHAR}, | ||
157 | + #{serviceType,jdbcType=VARCHAR}, #{paidType,jdbcType=VARCHAR}, #{reduceType,jdbcType=VARCHAR}, | ||
158 | + #{expense,jdbcType=BIGINT}, #{orderStatus,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR}, | ||
159 | + #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP} | ||
160 | + ) | ||
161 | + </insert> | ||
162 | + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Casement"> | ||
163 | + <!-- | ||
164 | + WARNING - @mbggenerated | ||
165 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
166 | + --> | ||
167 | + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> | ||
168 | + SELECT LAST_INSERT_ID() | ||
169 | + </selectKey> | ||
170 | + insert into casement | ||
171 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
172 | + <if test="name != null"> | ||
173 | + name, | ||
174 | + </if> | ||
175 | + <if test="casesn != null"> | ||
176 | + caseSn, | ||
177 | + </if> | ||
178 | + <if test="caseType != null"> | ||
179 | + case_type, | ||
180 | + </if> | ||
181 | + <if test="serviceType != null"> | ||
182 | + service_type, | ||
183 | + </if> | ||
184 | + <if test="paidType != null"> | ||
185 | + paid_type, | ||
186 | + </if> | ||
187 | + <if test="reduceType != null"> | ||
188 | + reduce_type, | ||
189 | + </if> | ||
190 | + <if test="expense != null"> | ||
191 | + expense, | ||
192 | + </if> | ||
193 | + <if test="orderStatus != null"> | ||
194 | + order_status, | ||
195 | + </if> | ||
196 | + <if test="caseStatus != null"> | ||
197 | + case_status, | ||
198 | + </if> | ||
199 | + <if test="memberId != null"> | ||
200 | + member_id, | ||
201 | + </if> | ||
202 | + <if test="createDate != null"> | ||
203 | + create_date, | ||
204 | + </if> | ||
205 | + <if test="updateDate != null"> | ||
206 | + update_date, | ||
207 | + </if> | ||
208 | + </trim> | ||
209 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
210 | + <if test="name != null"> | ||
211 | + #{name,jdbcType=VARCHAR}, | ||
212 | + </if> | ||
213 | + <if test="casesn != null"> | ||
214 | + #{casesn,jdbcType=VARCHAR}, | ||
215 | + </if> | ||
216 | + <if test="caseType != null"> | ||
217 | + #{caseType,jdbcType=VARCHAR}, | ||
218 | + </if> | ||
219 | + <if test="serviceType != null"> | ||
220 | + #{serviceType,jdbcType=VARCHAR}, | ||
221 | + </if> | ||
222 | + <if test="paidType != null"> | ||
223 | + #{paidType,jdbcType=VARCHAR}, | ||
224 | + </if> | ||
225 | + <if test="reduceType != null"> | ||
226 | + #{reduceType,jdbcType=VARCHAR}, | ||
227 | + </if> | ||
228 | + <if test="expense != null"> | ||
229 | + #{expense,jdbcType=BIGINT}, | ||
230 | + </if> | ||
231 | + <if test="orderStatus != null"> | ||
232 | + #{orderStatus,jdbcType=VARCHAR}, | ||
233 | + </if> | ||
234 | + <if test="caseStatus != null"> | ||
235 | + #{caseStatus,jdbcType=VARCHAR}, | ||
236 | + </if> | ||
237 | + <if test="memberId != null"> | ||
238 | + #{memberId,jdbcType=VARCHAR}, | ||
239 | + </if> | ||
240 | + <if test="createDate != null"> | ||
241 | + #{createDate,jdbcType=TIMESTAMP}, | ||
242 | + </if> | ||
243 | + <if test="updateDate != null"> | ||
244 | + #{updateDate,jdbcType=TIMESTAMP}, | ||
245 | + </if> | ||
246 | + </trim> | ||
247 | + </insert> | ||
248 | + <select id="countByExample" parameterType="com.canrd.patent.dal.model.CasementExample" resultType="java.lang.Integer"> | ||
249 | + <!-- | ||
250 | + WARNING - @mbggenerated | ||
251 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
252 | + --> | ||
253 | + select count(*) from casement | ||
254 | + <if test="_parameter != null"> | ||
255 | + <include refid="Example_Where_Clause" /> | ||
256 | + </if> | ||
257 | + </select> | ||
258 | + <update id="updateByExampleSelective" parameterType="map"> | ||
259 | + <!-- | ||
260 | + WARNING - @mbggenerated | ||
261 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
262 | + --> | ||
263 | + update casement | ||
264 | + <set> | ||
265 | + <if test="record.id != null"> | ||
266 | + id = #{record.id,jdbcType=BIGINT}, | ||
267 | + </if> | ||
268 | + <if test="record.name != null"> | ||
269 | + name = #{record.name,jdbcType=VARCHAR}, | ||
270 | + </if> | ||
271 | + <if test="record.casesn != null"> | ||
272 | + caseSn = #{record.casesn,jdbcType=VARCHAR}, | ||
273 | + </if> | ||
274 | + <if test="record.caseType != null"> | ||
275 | + case_type = #{record.caseType,jdbcType=VARCHAR}, | ||
276 | + </if> | ||
277 | + <if test="record.serviceType != null"> | ||
278 | + service_type = #{record.serviceType,jdbcType=VARCHAR}, | ||
279 | + </if> | ||
280 | + <if test="record.paidType != null"> | ||
281 | + paid_type = #{record.paidType,jdbcType=VARCHAR}, | ||
282 | + </if> | ||
283 | + <if test="record.reduceType != null"> | ||
284 | + reduce_type = #{record.reduceType,jdbcType=VARCHAR}, | ||
285 | + </if> | ||
286 | + <if test="record.expense != null"> | ||
287 | + expense = #{record.expense,jdbcType=BIGINT}, | ||
288 | + </if> | ||
289 | + <if test="record.orderStatus != null"> | ||
290 | + order_status = #{record.orderStatus,jdbcType=VARCHAR}, | ||
291 | + </if> | ||
292 | + <if test="record.caseStatus != null"> | ||
293 | + case_status = #{record.caseStatus,jdbcType=VARCHAR}, | ||
294 | + </if> | ||
295 | + <if test="record.memberId != null"> | ||
296 | + member_id = #{record.memberId,jdbcType=VARCHAR}, | ||
297 | + </if> | ||
298 | + <if test="record.createDate != null"> | ||
299 | + create_date = #{record.createDate,jdbcType=TIMESTAMP}, | ||
300 | + </if> | ||
301 | + <if test="record.updateDate != null"> | ||
302 | + update_date = #{record.updateDate,jdbcType=TIMESTAMP}, | ||
303 | + </if> | ||
304 | + </set> | ||
305 | + <if test="_parameter != null"> | ||
306 | + <include refid="Update_By_Example_Where_Clause" /> | ||
307 | + </if> | ||
308 | + </update> | ||
309 | + <update id="updateByExample" parameterType="map"> | ||
310 | + <!-- | ||
311 | + WARNING - @mbggenerated | ||
312 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
313 | + --> | ||
314 | + update casement | ||
315 | + set id = #{record.id,jdbcType=BIGINT}, | ||
316 | + name = #{record.name,jdbcType=VARCHAR}, | ||
317 | + caseSn = #{record.casesn,jdbcType=VARCHAR}, | ||
318 | + case_type = #{record.caseType,jdbcType=VARCHAR}, | ||
319 | + service_type = #{record.serviceType,jdbcType=VARCHAR}, | ||
320 | + paid_type = #{record.paidType,jdbcType=VARCHAR}, | ||
321 | + reduce_type = #{record.reduceType,jdbcType=VARCHAR}, | ||
322 | + expense = #{record.expense,jdbcType=BIGINT}, | ||
323 | + order_status = #{record.orderStatus,jdbcType=VARCHAR}, | ||
324 | + case_status = #{record.caseStatus,jdbcType=VARCHAR}, | ||
325 | + member_id = #{record.memberId,jdbcType=VARCHAR}, | ||
326 | + create_date = #{record.createDate,jdbcType=TIMESTAMP}, | ||
327 | + update_date = #{record.updateDate,jdbcType=TIMESTAMP} | ||
328 | + <if test="_parameter != null"> | ||
329 | + <include refid="Update_By_Example_Where_Clause" /> | ||
330 | + </if> | ||
331 | + </update> | ||
332 | + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Casement"> | ||
333 | + <!-- | ||
334 | + WARNING - @mbggenerated | ||
335 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
336 | + --> | ||
337 | + update casement | ||
338 | + <set> | ||
339 | + <if test="name != null"> | ||
340 | + name = #{name,jdbcType=VARCHAR}, | ||
341 | + </if> | ||
342 | + <if test="casesn != null"> | ||
343 | + caseSn = #{casesn,jdbcType=VARCHAR}, | ||
344 | + </if> | ||
345 | + <if test="caseType != null"> | ||
346 | + case_type = #{caseType,jdbcType=VARCHAR}, | ||
347 | + </if> | ||
348 | + <if test="serviceType != null"> | ||
349 | + service_type = #{serviceType,jdbcType=VARCHAR}, | ||
350 | + </if> | ||
351 | + <if test="paidType != null"> | ||
352 | + paid_type = #{paidType,jdbcType=VARCHAR}, | ||
353 | + </if> | ||
354 | + <if test="reduceType != null"> | ||
355 | + reduce_type = #{reduceType,jdbcType=VARCHAR}, | ||
356 | + </if> | ||
357 | + <if test="expense != null"> | ||
358 | + expense = #{expense,jdbcType=BIGINT}, | ||
359 | + </if> | ||
360 | + <if test="orderStatus != null"> | ||
361 | + order_status = #{orderStatus,jdbcType=VARCHAR}, | ||
362 | + </if> | ||
363 | + <if test="caseStatus != null"> | ||
364 | + case_status = #{caseStatus,jdbcType=VARCHAR}, | ||
365 | + </if> | ||
366 | + <if test="memberId != null"> | ||
367 | + member_id = #{memberId,jdbcType=VARCHAR}, | ||
368 | + </if> | ||
369 | + <if test="createDate != null"> | ||
370 | + create_date = #{createDate,jdbcType=TIMESTAMP}, | ||
371 | + </if> | ||
372 | + <if test="updateDate != null"> | ||
373 | + update_date = #{updateDate,jdbcType=TIMESTAMP}, | ||
374 | + </if> | ||
375 | + </set> | ||
376 | + where id = #{id,jdbcType=BIGINT} | ||
377 | + </update> | ||
378 | + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Casement"> | ||
379 | + <!-- | ||
380 | + WARNING - @mbggenerated | ||
381 | + This element is automatically generated by MyBatis Generator, do not modify. | ||
382 | + --> | ||
383 | + update casement | ||
384 | + set name = #{name,jdbcType=VARCHAR}, | ||
385 | + caseSn = #{casesn,jdbcType=VARCHAR}, | ||
386 | + case_type = #{caseType,jdbcType=VARCHAR}, | ||
387 | + service_type = #{serviceType,jdbcType=VARCHAR}, | ||
388 | + paid_type = #{paidType,jdbcType=VARCHAR}, | ||
389 | + reduce_type = #{reduceType,jdbcType=VARCHAR}, | ||
390 | + expense = #{expense,jdbcType=BIGINT}, | ||
391 | + order_status = #{orderStatus,jdbcType=VARCHAR}, | ||
392 | + case_status = #{caseStatus,jdbcType=VARCHAR}, | ||
393 | + member_id = #{memberId,jdbcType=VARCHAR}, | ||
394 | + create_date = #{createDate,jdbcType=TIMESTAMP}, | ||
395 | + update_date = #{updateDate,jdbcType=TIMESTAMP} | ||
396 | + where id = #{id,jdbcType=BIGINT} | ||
397 | + </update> | ||
398 | +</mapper> | ||
0 | \ No newline at end of file | 399 | \ No newline at end of file |
src/main/resources/mapper/MybatisTestMapper.xml
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | WARNING - @mbggenerated | 6 | WARNING - @mbggenerated |
7 | This element is automatically generated by MyBatis Generator, do not modify. | 7 | This element is automatically generated by MyBatis Generator, do not modify. |
8 | --> | 8 | --> |
9 | - <id column="id" jdbcType="INTEGER" property="id" /> | 9 | + <id column="id" jdbcType="BIGINT" property="id" /> |
10 | <result column="name" jdbcType="VARCHAR" property="name" /> | 10 | <result column="name" jdbcType="VARCHAR" property="name" /> |
11 | <result column="age" jdbcType="INTEGER" property="age" /> | 11 | <result column="age" jdbcType="INTEGER" property="age" /> |
12 | </resultMap> | 12 | </resultMap> |
@@ -101,7 +101,7 @@ | @@ -101,7 +101,7 @@ | ||
101 | order by ${orderByClause} | 101 | order by ${orderByClause} |
102 | </if> | 102 | </if> |
103 | </select> | 103 | </select> |
104 | - <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | 104 | + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> |
105 | <!-- | 105 | <!-- |
106 | WARNING - @mbggenerated | 106 | WARNING - @mbggenerated |
107 | This element is automatically generated by MyBatis Generator, do not modify. | 107 | This element is automatically generated by MyBatis Generator, do not modify. |
@@ -109,15 +109,15 @@ | @@ -109,15 +109,15 @@ | ||
109 | select | 109 | select |
110 | <include refid="Base_Column_List" /> | 110 | <include refid="Base_Column_List" /> |
111 | from mybatis_test | 111 | from mybatis_test |
112 | - where id = #{id,jdbcType=INTEGER} | 112 | + where id = #{id,jdbcType=BIGINT} |
113 | </select> | 113 | </select> |
114 | - <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> | 114 | + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> |
115 | <!-- | 115 | <!-- |
116 | WARNING - @mbggenerated | 116 | WARNING - @mbggenerated |
117 | This element is automatically generated by MyBatis Generator, do not modify. | 117 | This element is automatically generated by MyBatis Generator, do not modify. |
118 | --> | 118 | --> |
119 | delete from mybatis_test | 119 | delete from mybatis_test |
120 | - where id = #{id,jdbcType=INTEGER} | 120 | + where id = #{id,jdbcType=BIGINT} |
121 | </delete> | 121 | </delete> |
122 | <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.MybatisTestExample"> | 122 | <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.MybatisTestExample"> |
123 | <!-- | 123 | <!-- |
@@ -134,7 +134,7 @@ | @@ -134,7 +134,7 @@ | ||
134 | WARNING - @mbggenerated | 134 | WARNING - @mbggenerated |
135 | This element is automatically generated by MyBatis Generator, do not modify. | 135 | This element is automatically generated by MyBatis Generator, do not modify. |
136 | --> | 136 | --> |
137 | - <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> | 137 | + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> |
138 | SELECT LAST_INSERT_ID() | 138 | SELECT LAST_INSERT_ID() |
139 | </selectKey> | 139 | </selectKey> |
140 | insert into mybatis_test (name, age) | 140 | insert into mybatis_test (name, age) |
@@ -145,7 +145,7 @@ | @@ -145,7 +145,7 @@ | ||
145 | WARNING - @mbggenerated | 145 | WARNING - @mbggenerated |
146 | This element is automatically generated by MyBatis Generator, do not modify. | 146 | This element is automatically generated by MyBatis Generator, do not modify. |
147 | --> | 147 | --> |
148 | - <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> | 148 | + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> |
149 | SELECT LAST_INSERT_ID() | 149 | SELECT LAST_INSERT_ID() |
150 | </selectKey> | 150 | </selectKey> |
151 | insert into mybatis_test | 151 | insert into mybatis_test |
@@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
184 | update mybatis_test | 184 | update mybatis_test |
185 | <set> | 185 | <set> |
186 | <if test="record.id != null"> | 186 | <if test="record.id != null"> |
187 | - id = #{record.id,jdbcType=INTEGER}, | 187 | + id = #{record.id,jdbcType=BIGINT}, |
188 | </if> | 188 | </if> |
189 | <if test="record.name != null"> | 189 | <if test="record.name != null"> |
190 | name = #{record.name,jdbcType=VARCHAR}, | 190 | name = #{record.name,jdbcType=VARCHAR}, |
@@ -203,7 +203,7 @@ | @@ -203,7 +203,7 @@ | ||
203 | This element is automatically generated by MyBatis Generator, do not modify. | 203 | This element is automatically generated by MyBatis Generator, do not modify. |
204 | --> | 204 | --> |
205 | update mybatis_test | 205 | update mybatis_test |
206 | - set id = #{record.id,jdbcType=INTEGER}, | 206 | + set id = #{record.id,jdbcType=BIGINT}, |
207 | name = #{record.name,jdbcType=VARCHAR}, | 207 | name = #{record.name,jdbcType=VARCHAR}, |
208 | age = #{record.age,jdbcType=INTEGER} | 208 | age = #{record.age,jdbcType=INTEGER} |
209 | <if test="_parameter != null"> | 209 | <if test="_parameter != null"> |
@@ -224,7 +224,7 @@ | @@ -224,7 +224,7 @@ | ||
224 | age = #{age,jdbcType=INTEGER}, | 224 | age = #{age,jdbcType=INTEGER}, |
225 | </if> | 225 | </if> |
226 | </set> | 226 | </set> |
227 | - where id = #{id,jdbcType=INTEGER} | 227 | + where id = #{id,jdbcType=BIGINT} |
228 | </update> | 228 | </update> |
229 | <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.MybatisTest"> | 229 | <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.MybatisTest"> |
230 | <!-- | 230 | <!-- |
@@ -234,6 +234,6 @@ | @@ -234,6 +234,6 @@ | ||
234 | update mybatis_test | 234 | update mybatis_test |
235 | set name = #{name,jdbcType=VARCHAR}, | 235 | set name = #{name,jdbcType=VARCHAR}, |
236 | age = #{age,jdbcType=INTEGER} | 236 | age = #{age,jdbcType=INTEGER} |
237 | - where id = #{id,jdbcType=INTEGER} | 237 | + where id = #{id,jdbcType=BIGINT} |
238 | </update> | 238 | </update> |
239 | </mapper> | 239 | </mapper> |
240 | \ No newline at end of file | 240 | \ No newline at end of file |
src/main/webapp/case-manage.jsp
@@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
103 | </td> | 103 | </td> |
104 | <td class="td-width-120"> | 104 | <td class="td-width-120"> |
105 | <div> | 105 | <div> |
106 | - <a href="javascript:" class="color-ff6642">案件详情</a> | 106 | + <a href="case-detail.jsp" class="color-ff6642">案件详情</a> |
107 | </div> | 107 | </div> |
108 | <div> | 108 | <div> |
109 | <a href="javascript:" class="color-ff6642">取消案件</a> | 109 | <a href="javascript:" class="color-ff6642">取消案件</a> |
@@ -149,7 +149,7 @@ | @@ -149,7 +149,7 @@ | ||
149 | </td> | 149 | </td> |
150 | <td class="td-width-120"> | 150 | <td class="td-width-120"> |
151 | <div> | 151 | <div> |
152 | - <a href="javascript:" class="color-ff6642">案件详情</a> | 152 | + <a href="case-detail.jsp" class="color-ff6642">案件详情</a> |
153 | </div> | 153 | </div> |
154 | <div> | 154 | <div> |
155 | <a href="javascript:" class="color-ff6642">取消案件</a> | 155 | <a href="javascript:" class="color-ff6642">取消案件</a> |
@@ -195,7 +195,7 @@ | @@ -195,7 +195,7 @@ | ||
195 | </td> | 195 | </td> |
196 | <td class="td-width-120"> | 196 | <td class="td-width-120"> |
197 | <div> | 197 | <div> |
198 | - <a href="javascript:" class="color-ff6642">案件详情</a> | 198 | + <a href="case-detail.jsp" class="color-ff6642">案件详情</a> |
199 | </div> | 199 | </div> |
200 | <div> | 200 | <div> |
201 | <a href="javascript:" class="color-ff6642">取消案件</a> | 201 | <a href="javascript:" class="color-ff6642">取消案件</a> |
src/main/webapp/css/home.css
0 → 100644
1 | +/*header.css*/ | ||
2 | +@charset "utf-8"; | ||
3 | +body { | ||
4 | + width: 100%; | ||
5 | + height: auto; | ||
6 | + margin: 0; | ||
7 | + padding: 0; | ||
8 | + font: 16px 'Hiragino Sans GB', 'Microsoft YaHei', 微软雅黑, arial, Tahoma, SimSun, sans-serif; | ||
9 | +} | ||
10 | + | ||
11 | +input, | ||
12 | +textarea, | ||
13 | +option { | ||
14 | + font-family:'Hiragino Sans GB', 'Microsoft YaHei', 微软雅黑, arial, Tahoma, SimSun, sans-serif; | ||
15 | +} | ||
16 | + | ||
17 | +a { | ||
18 | + text-decoration: none; | ||
19 | + color: #646464 | ||
20 | +} | ||
21 | + | ||
22 | +a:hover { | ||
23 | + color: #1287cd | ||
24 | +} | ||
25 | + | ||
26 | +ul { | ||
27 | + margin: 0; | ||
28 | + padding: 0; | ||
29 | +} | ||
30 | + | ||
31 | +li { | ||
32 | + list-style: none; | ||
33 | +} | ||
34 | + | ||
35 | +.home-wrap { | ||
36 | + position: relative; | ||
37 | + width: 100%; | ||
38 | + height: auto; | ||
39 | + border-top: 4px solid #1287cd; | ||
40 | + background-color: #f9f9f9; | ||
41 | + font-size: 12px; | ||
42 | +} | ||
43 | + | ||
44 | +.home-wrap>div{ | ||
45 | + position: relative; | ||
46 | + width: 1000px; | ||
47 | + min-height: 500px; | ||
48 | + height: auto; | ||
49 | + margin: 0 auto; | ||
50 | + color: #646464; | ||
51 | +} | ||
52 | + | ||
53 | +.home-wrap>div>div{ | ||
54 | + overflow: hidden; | ||
55 | +} | ||
56 | + | ||
57 | +.home-wrap>div>div ul{ | ||
58 | + overflow: hidden; | ||
59 | +} | ||
60 | + | ||
61 | +.home-wrap>div>div ul li{ | ||
62 | + float: left; | ||
63 | + padding-right: 50px; | ||
64 | +} | ||
0 | \ No newline at end of file | 65 | \ No newline at end of file |