kelude / canrd-patent · Commits

Commit dc258520ffe58852808ecdc15a8930e625192cde

Authored by maoyangou
1 parent 7c850db0
build: skipped

caseList info

Inline Side-by-side
Showing 17 changed files with 984 additions and 215 deletions
.idea/workspace.xml
  View file @dc25852
@@ -2,66 +2,17 @@ @@ -2,66 +2,17 @@
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" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/home_patent.jsp" afterPath="$PROJECT_DIR$/target/patent/home_patent.jsp" />
62 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> 15 <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" /> 16 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
66 </list> 17 </list>
67 <ignored path="patent.iws" /> 18 <ignored path="patent.iws" />
@@ -88,8 +39,28 @@ @@ -88,8 +39,28 @@
88 <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false"> 39 <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"> 40 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
90 <provider selected="true" editor-type-id="text-editor"> 41 <provider selected="true" editor-type-id="text-editor">
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" /> 42 + <state vertical-scroll-proportion="-6.490196">
  43 + <caret line="302" column="30" selection-start-line="302" selection-start-column="30" selection-end-line="302" selection-end-column="30" />
  44 + <folding />
  45 + </state>
  46 + </provider>
  47 + </entry>
  48 + </file>
  49 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="true">
  50 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  51 + <provider selected="true" editor-type-id="text-editor">
  52 + <state vertical-scroll-proportion="0.08941606">
  53 + <caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
  54 + <folding />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + <file leaf-file-name="header.jsp" pinned="false" current-in-tab="false">
  60 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  61 + <provider selected="true" editor-type-id="text-editor">
  62 + <state vertical-scroll-proportion="-5.0">
  63 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
93 <folding /> 64 <folding />
94 </state> 65 </state>
95 </provider> 66 </provider>
@@ -99,16 +70,91 @@ @@ -99,16 +70,91 @@
99 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java"> 70 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java">
100 <provider selected="true" editor-type-id="text-editor"> 71 <provider selected="true" editor-type-id="text-editor">
101 <state vertical-scroll-proportion="0.0"> 72 <state vertical-scroll-proportion="0.0">
102 - <caret line="57" column="52" selection-start-line="57" selection-start-column="52" selection-end-line="57" selection-end-column="52" /> 73 + <caret line="106" column="67" selection-start-line="106" selection-start-column="67" selection-end-line="106" selection-end-column="67" />
103 <folding /> 74 <folding />
104 </state> 75 </state>
105 </provider> 76 </provider>
106 </entry> 77 </entry>
107 </file> 78 </file>
108 - <file leaf-file-name="HomePatentService.java" pinned="false" current-in-tab="true"> 79 + <file leaf-file-name="CaseOutputDto.java" pinned="false" current-in-tab="false">
  80 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
  81 + <provider selected="true" editor-type-id="text-editor">
  82 + <state vertical-scroll-proportion="0.0">
  83 + <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
  84 + <folding>
  85 + <element signature="e#348#349#0" expanded="true" />
  86 + <element signature="e#373#374#0" expanded="true" />
  87 + <element signature="e#407#408#0" expanded="true" />
  88 + <element signature="e#435#436#0" expanded="true" />
  89 + <element signature="e#466#467#0" expanded="true" />
  90 + <element signature="e#493#494#0" expanded="true" />
  91 + <element signature="e#533#534#0" expanded="true" />
  92 + <element signature="e#565#566#0" expanded="true" />
  93 + <element signature="e#598#599#0" expanded="true" />
  94 + <element signature="e#627#628#0" expanded="true" />
  95 + <element signature="e#671#672#0" expanded="true" />
  96 + <element signature="e#707#708#0" expanded="true" />
  97 + <element signature="e#745#746#0" expanded="true" />
  98 + <element signature="e#779#780#0" expanded="true" />
  99 + <element signature="e#833#834#0" expanded="true" />
  100 + <element signature="e#879#880#0" expanded="true" />
  101 + <element signature="e#914#915#0" expanded="true" />
  102 + <element signature="e#945#946#0" expanded="true" />
  103 + <element signature="e#993#994#0" expanded="true" />
  104 + <element signature="e#1033#1034#0" expanded="true" />
  105 + <element signature="e#1065#1066#0" expanded="true" />
  106 + <element signature="e#1095#1096#0" expanded="true" />
  107 + <element signature="e#1139#1140#0" expanded="true" />
  108 + <element signature="e#1177#1178#0" expanded="true" />
  109 + <element signature="e#1214#1215#0" expanded="true" />
  110 + <element signature="e#1247#1248#0" expanded="true" />
  111 + <element signature="e#1299#1300#0" expanded="true" />
  112 + <element signature="e#1343#1344#0" expanded="true" />
  113 + </folding>
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file leaf-file-name="CaseHandlingService.java" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state vertical-scroll-proportion="0.0">
  122 + <caret line="105" column="62" selection-start-line="105" selection-start-column="62" selection-end-line="105" selection-end-column="62" />
  123 + <folding />
  124 + </state>
  125 + </provider>
  126 + </entry>
  127 + </file>
  128 + <file leaf-file-name="DateUtils.java" pinned="false" current-in-tab="false">
  129 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  130 + <provider selected="true" editor-type-id="text-editor">
  131 + <state vertical-scroll-proportion="0.0">
  132 + <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
  133 + <folding>
  134 + <element signature="e#0#6857#0" expanded="true" />
  135 + <element signature="e#895#896#0" expanded="true" />
  136 + <element signature="e#953#954#0" expanded="true" />
  137 + <element signature="e#1114#1115#0" expanded="true" />
  138 + <element signature="e#1173#1174#0" expanded="true" />
  139 + </folding>
  140 + </state>
  141 + </provider>
  142 + </entry>
  143 + </file>
  144 + <file leaf-file-name="CaseInputDto.java" pinned="false" current-in-tab="false">
  145 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
  146 + <provider selected="true" editor-type-id="text-editor">
  147 + <state vertical-scroll-proportion="0.0">
  148 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  149 + <folding />
  150 + </state>
  151 + </provider>
  152 + </entry>
  153 + </file>
  154 + <file leaf-file-name="HomePatentService.java" pinned="false" current-in-tab="false">
109 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java"> 155 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java">
110 <provider selected="true" editor-type-id="text-editor"> 156 <provider selected="true" editor-type-id="text-editor">
111 - <state vertical-scroll-proportion="0.33187774"> 157 + <state vertical-scroll-proportion="0.0">
112 <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> 158 <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
113 <folding /> 159 <folding />
114 </state> 160 </state>
@@ -139,8 +185,6 @@ @@ -139,8 +185,6 @@
139 <component name="IdeDocumentHistory"> 185 <component name="IdeDocumentHistory">
140 <option name="CHANGED_PATHS"> 186 <option name="CHANGED_PATHS">
141 <list> 187 <list>
142 - <option value="$PROJECT_DIR$/src/main/webapp/resources/style.css" />  
143 - <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/index.jsp" />  
144 <option value="$PROJECT_DIR$/src/main/webapp/css/service.css" /> 188 <option value="$PROJECT_DIR$/src/main/webapp/css/service.css" />
145 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" /> 189 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
146 <option value="$PROJECT_DIR$/src/main/webapp/case-detail.html" /> 190 <option value="$PROJECT_DIR$/src/main/webapp/case-detail.html" />
@@ -173,7 +217,6 @@ @@ -173,7 +217,6 @@
173 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java" /> 217 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java" />
174 <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> 218 <option value="$PROJECT_DIR$/doc/sql/ddl.sql" />
175 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java" /> 219 <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" /> 220 <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" />
178 <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> 221 <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" />
179 <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> 222 <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" />
@@ -183,13 +226,16 @@ @@ -183,13 +226,16 @@
183 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> 226 <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" /> 227 <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" /> 228 <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" /> 229 <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" /> 230 <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" /> 231 <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" /> 232 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" />
  233 + <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
  234 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
  235 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
  236 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
  237 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
  238 + <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
193 </list> 239 </list>
194 </option> 240 </option>
195 </component> 241 </component>
@@ -321,6 +367,244 @@ @@ -321,6 +367,244 @@
321 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 367 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
322 </PATH_ELEMENT> 368 </PATH_ELEMENT>
323 </PATH> 369 </PATH>
  370 + <PATH>
  371 + <PATH_ELEMENT>
  372 + <option name="myItemId" value="patent" />
  373 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  374 + </PATH_ELEMENT>
  375 + <PATH_ELEMENT>
  376 + <option name="myItemId" value="canrd-patent" />
  377 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  378 + </PATH_ELEMENT>
  379 + <PATH_ELEMENT>
  380 + <option name="myItemId" value="src" />
  381 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  382 + </PATH_ELEMENT>
  383 + </PATH>
  384 + <PATH>
  385 + <PATH_ELEMENT>
  386 + <option name="myItemId" value="patent" />
  387 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  388 + </PATH_ELEMENT>
  389 + <PATH_ELEMENT>
  390 + <option name="myItemId" value="canrd-patent" />
  391 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  392 + </PATH_ELEMENT>
  393 + <PATH_ELEMENT>
  394 + <option name="myItemId" value="src" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="main" />
  399 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  400 + </PATH_ELEMENT>
  401 + <PATH_ELEMENT>
  402 + <option name="myItemId" value="webapp" />
  403 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  404 + </PATH_ELEMENT>
  405 + </PATH>
  406 + <PATH>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="patent" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  410 + </PATH_ELEMENT>
  411 + <PATH_ELEMENT>
  412 + <option name="myItemId" value="canrd-patent" />
  413 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  414 + </PATH_ELEMENT>
  415 + <PATH_ELEMENT>
  416 + <option name="myItemId" value="src" />
  417 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  418 + </PATH_ELEMENT>
  419 + <PATH_ELEMENT>
  420 + <option name="myItemId" value="main" />
  421 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  422 + </PATH_ELEMENT>
  423 + </PATH>
  424 + <PATH>
  425 + <PATH_ELEMENT>
  426 + <option name="myItemId" value="patent" />
  427 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  428 + </PATH_ELEMENT>
  429 + <PATH_ELEMENT>
  430 + <option name="myItemId" value="canrd-patent" />
  431 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  432 + </PATH_ELEMENT>
  433 + <PATH_ELEMENT>
  434 + <option name="myItemId" value="src" />
  435 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  436 + </PATH_ELEMENT>
  437 + <PATH_ELEMENT>
  438 + <option name="myItemId" value="main" />
  439 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  440 + </PATH_ELEMENT>
  441 + <PATH_ELEMENT>
  442 + <option name="myItemId" value="java" />
  443 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  444 + </PATH_ELEMENT>
  445 + <PATH_ELEMENT>
  446 + <option name="myItemId" value="patent" />
  447 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  448 + </PATH_ELEMENT>
  449 + <PATH_ELEMENT>
  450 + <option name="myItemId" value="web" />
  451 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  452 + </PATH_ELEMENT>
  453 + </PATH>
  454 + <PATH>
  455 + <PATH_ELEMENT>
  456 + <option name="myItemId" value="patent" />
  457 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  458 + </PATH_ELEMENT>
  459 + <PATH_ELEMENT>
  460 + <option name="myItemId" value="canrd-patent" />
  461 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  462 + </PATH_ELEMENT>
  463 + <PATH_ELEMENT>
  464 + <option name="myItemId" value="src" />
  465 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  466 + </PATH_ELEMENT>
  467 + <PATH_ELEMENT>
  468 + <option name="myItemId" value="main" />
  469 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  470 + </PATH_ELEMENT>
  471 + <PATH_ELEMENT>
  472 + <option name="myItemId" value="java" />
  473 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  474 + </PATH_ELEMENT>
  475 + <PATH_ELEMENT>
  476 + <option name="myItemId" value="patent" />
  477 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  478 + </PATH_ELEMENT>
  479 + </PATH>
  480 + <PATH>
  481 + <PATH_ELEMENT>
  482 + <option name="myItemId" value="patent" />
  483 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  484 + </PATH_ELEMENT>
  485 + <PATH_ELEMENT>
  486 + <option name="myItemId" value="canrd-patent" />
  487 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  488 + </PATH_ELEMENT>
  489 + <PATH_ELEMENT>
  490 + <option name="myItemId" value="src" />
  491 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  492 + </PATH_ELEMENT>
  493 + <PATH_ELEMENT>
  494 + <option name="myItemId" value="main" />
  495 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  496 + </PATH_ELEMENT>
  497 + <PATH_ELEMENT>
  498 + <option name="myItemId" value="java" />
  499 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  500 + </PATH_ELEMENT>
  501 + <PATH_ELEMENT>
  502 + <option name="myItemId" value="patent" />
  503 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  504 + </PATH_ELEMENT>
  505 + <PATH_ELEMENT>
  506 + <option name="myItemId" value="dal" />
  507 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  508 + </PATH_ELEMENT>
  509 + </PATH>
  510 + <PATH>
  511 + <PATH_ELEMENT>
  512 + <option name="myItemId" value="patent" />
  513 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  514 + </PATH_ELEMENT>
  515 + <PATH_ELEMENT>
  516 + <option name="myItemId" value="canrd-patent" />
  517 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  518 + </PATH_ELEMENT>
  519 + <PATH_ELEMENT>
  520 + <option name="myItemId" value="src" />
  521 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  522 + </PATH_ELEMENT>
  523 + <PATH_ELEMENT>
  524 + <option name="myItemId" value="main" />
  525 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  526 + </PATH_ELEMENT>
  527 + <PATH_ELEMENT>
  528 + <option name="myItemId" value="java" />
  529 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  530 + </PATH_ELEMENT>
  531 + <PATH_ELEMENT>
  532 + <option name="myItemId" value="patent" />
  533 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  534 + </PATH_ELEMENT>
  535 + <PATH_ELEMENT>
  536 + <option name="myItemId" value="dal" />
  537 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  538 + </PATH_ELEMENT>
  539 + <PATH_ELEMENT>
  540 + <option name="myItemId" value="dto" />
  541 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  542 + </PATH_ELEMENT>
  543 + </PATH>
  544 + <PATH>
  545 + <PATH_ELEMENT>
  546 + <option name="myItemId" value="patent" />
  547 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  548 + </PATH_ELEMENT>
  549 + <PATH_ELEMENT>
  550 + <option name="myItemId" value="canrd-patent" />
  551 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  552 + </PATH_ELEMENT>
  553 + <PATH_ELEMENT>
  554 + <option name="myItemId" value="src" />
  555 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  556 + </PATH_ELEMENT>
  557 + <PATH_ELEMENT>
  558 + <option name="myItemId" value="main" />
  559 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  560 + </PATH_ELEMENT>
  561 + <PATH_ELEMENT>
  562 + <option name="myItemId" value="java" />
  563 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  564 + </PATH_ELEMENT>
  565 + <PATH_ELEMENT>
  566 + <option name="myItemId" value="patent" />
  567 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  568 + </PATH_ELEMENT>
  569 + <PATH_ELEMENT>
  570 + <option name="myItemId" value="common" />
  571 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  572 + </PATH_ELEMENT>
  573 + <PATH_ELEMENT>
  574 + <option name="myItemId" value="utils" />
  575 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  576 + </PATH_ELEMENT>
  577 + </PATH>
  578 + <PATH>
  579 + <PATH_ELEMENT>
  580 + <option name="myItemId" value="patent" />
  581 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  582 + </PATH_ELEMENT>
  583 + <PATH_ELEMENT>
  584 + <option name="myItemId" value="canrd-patent" />
  585 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  586 + </PATH_ELEMENT>
  587 + <PATH_ELEMENT>
  588 + <option name="myItemId" value="src" />
  589 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  590 + </PATH_ELEMENT>
  591 + <PATH_ELEMENT>
  592 + <option name="myItemId" value="main" />
  593 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  594 + </PATH_ELEMENT>
  595 + <PATH_ELEMENT>
  596 + <option name="myItemId" value="java" />
  597 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  598 + </PATH_ELEMENT>
  599 + <PATH_ELEMENT>
  600 + <option name="myItemId" value="patent" />
  601 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  602 + </PATH_ELEMENT>
  603 + <PATH_ELEMENT>
  604 + <option name="myItemId" value="common" />
  605 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  606 + </PATH_ELEMENT>
  607 + </PATH>
324 </subPane> 608 </subPane>
325 </pane> 609 </pane>
326 </panes> 610 </panes>
@@ -804,12 +1088,12 @@ @@ -804,12 +1088,12 @@
804 <workItem from="1468542212525" duration="929000" /> 1088 <workItem from="1468542212525" duration="929000" />
805 <workItem from="1468640565571" duration="23833000" /> 1089 <workItem from="1468640565571" duration="23833000" />
806 <workItem from="1468748693910" duration="7618000" /> 1090 <workItem from="1468748693910" duration="7618000" />
807 - <workItem from="1468885739175" duration="7592000" /> 1091 + <workItem from="1468885739175" duration="14388000" />
808 </task> 1092 </task>
809 <servers /> 1093 <servers />
810 </component> 1094 </component>
811 <component name="TimeTrackingManager"> 1095 <component name="TimeTrackingManager">
812 - <option name="totallyTimeSpent" value="57776000" /> 1096 + <option name="totallyTimeSpent" value="64572000" />
813 </component> 1097 </component>
814 <component name="ToolWindowManager"> 1098 <component name="ToolWindowManager">
815 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> 1099 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
@@ -818,13 +1102,13 @@ @@ -818,13 +1102,13 @@
818 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 1102 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
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" /> 1103 <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" />
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" /> 1104 <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" />
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" /> 1105 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38065523" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
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" /> 1106 <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" />
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" /> 1107 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3834197" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
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" /> 1108 <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" />
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" /> 1109 <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" />
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" /> 1110 <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" />
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" /> 1111 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.37823835" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
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" /> 1112 <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" />
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" /> 1113 <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" />
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" /> 1114 <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" />
@@ -834,7 +1118,7 @@ @@ -834,7 +1118,7 @@
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" /> 1118 <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" />
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" /> 1119 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.08642972" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
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" /> 1120 <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" />
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" /> 1121 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1970181" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
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" /> 1122 <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" />
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" /> 1123 <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" />
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" /> 1124 <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" />
@@ -900,21 +1184,6 @@ @@ -900,21 +1184,6 @@
900 <option name="FILTER_TARGETS" value="false" /> 1184 <option name="FILTER_TARGETS" value="false" />
901 </component> 1185 </component>
902 <component name="editorHistoryManager"> 1186 <component name="editorHistoryManager">
903 - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js">  
904 - <provider selected="true" editor-type-id="text-editor">  
905 - <state vertical-scroll-proportion="0.0">  
906 - <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" />  
907 - <folding />  
908 - </state>  
909 - </provider>  
910 - </entry>  
911 - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/alipay.properties">  
912 - <provider selected="true" editor-type-id="text-editor">  
913 - <state vertical-scroll-proportion="0.0">  
914 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> 1187 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
919 <provider selected="true" editor-type-id="text-editor"> 1188 <provider selected="true" editor-type-id="text-editor">
920 <state vertical-scroll-proportion="0.0"> 1189 <state vertical-scroll-proportion="0.0">
@@ -948,6 +1217,7 @@ @@ -948,6 +1217,7 @@
948 <provider selected="true" editor-type-id="text-editor"> 1217 <provider selected="true" editor-type-id="text-editor">
949 <state vertical-scroll-proportion="0.0"> 1218 <state vertical-scroll-proportion="0.0">
950 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1219 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1220 + <folding />
951 </state> 1221 </state>
952 </provider> 1222 </provider>
953 </entry> 1223 </entry>
@@ -980,6 +1250,7 @@ @@ -980,6 +1250,7 @@
980 <provider selected="true" editor-type-id="text-editor"> 1250 <provider selected="true" editor-type-id="text-editor">
981 <state vertical-scroll-proportion="0.0"> 1251 <state vertical-scroll-proportion="0.0">
982 <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" /> 1252 <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
  1253 + <folding />
983 </state> 1254 </state>
984 </provider> 1255 </provider>
985 </entry> 1256 </entry>
@@ -987,6 +1258,10 @@ @@ -987,6 +1258,10 @@
987 <provider selected="true" editor-type-id="text-editor"> 1258 <provider selected="true" editor-type-id="text-editor">
988 <state vertical-scroll-proportion="0.0"> 1259 <state vertical-scroll-proportion="0.0">
989 <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" /> 1260 <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
  1261 + <folding>
  1262 + <element signature="e#2894#2895#0" expanded="false" />
  1263 + <element signature="e#2939#2940#0" expanded="false" />
  1264 + </folding>
990 </state> 1265 </state>
991 </provider> 1266 </provider>
992 </entry> 1267 </entry>
@@ -1080,6 +1355,7 @@ @@ -1080,6 +1355,7 @@
1080 <provider selected="true" editor-type-id="text-editor"> 1355 <provider selected="true" editor-type-id="text-editor">
1081 <state vertical-scroll-proportion="0.0"> 1356 <state vertical-scroll-proportion="0.0">
1082 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1357 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1358 + <folding />
1083 </state> 1359 </state>
1084 </provider> 1360 </provider>
1085 </entry> 1361 </entry>
@@ -1090,14 +1366,6 @@ @@ -1090,14 +1366,6 @@
1090 </state> 1366 </state>
1091 </provider> 1367 </provider>
1092 </entry> 1368 </entry>
1093 - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">  
1094 - <provider selected="true" editor-type-id="text-editor">  
1095 - <state vertical-scroll-proportion="0.0">  
1096 - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />  
1097 - <folding />  
1098 - </state>  
1099 - </provider>  
1100 - </entry>  
1101 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp"> 1369 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp">
1102 <provider selected="true" editor-type-id="text-editor"> 1370 <provider selected="true" editor-type-id="text-editor">
1103 <state vertical-scroll-proportion="0.0"> 1371 <state vertical-scroll-proportion="0.0">
@@ -1110,6 +1378,7 @@ @@ -1110,6 +1378,7 @@
1110 <provider selected="true" editor-type-id="text-editor"> 1378 <provider selected="true" editor-type-id="text-editor">
1111 <state vertical-scroll-proportion="0.0"> 1379 <state vertical-scroll-proportion="0.0">
1112 <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="101" selection-end-column="1" /> 1380 <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="101" selection-end-column="1" />
  1381 + <folding />
1113 </state> 1382 </state>
1114 </provider> 1383 </provider>
1115 </entry> 1384 </entry>
@@ -1144,18 +1413,11 @@ @@ -1144,18 +1413,11 @@
1144 </state> 1413 </state>
1145 </provider> 1414 </provider>
1146 </entry> 1415 </entry>
1147 - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">  
1148 - <provider selected="true" editor-type-id="text-editor">  
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 />  
1152 - </state>  
1153 - </provider>  
1154 - </entry>  
1155 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> 1416 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
1156 <provider selected="true" editor-type-id="text-editor"> 1417 <provider selected="true" editor-type-id="text-editor">
1157 <state vertical-scroll-proportion="0.0"> 1418 <state vertical-scroll-proportion="0.0">
1158 <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" /> 1419 <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
  1420 + <folding />
1159 </state> 1421 </state>
1160 </provider> 1422 </provider>
1161 </entry> 1423 </entry>
@@ -1218,13 +1480,6 @@ @@ -1218,13 +1480,6 @@
1218 </state> 1480 </state>
1219 </provider> 1481 </provider>
1220 </entry> 1482 </entry>
1221 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">  
1222 - <provider selected="true" editor-type-id="text-editor">  
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" />  
1225 - </state>  
1226 - </provider>  
1227 - </entry>  
1228 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java"> 1483 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java">
1229 <provider selected="true" editor-type-id="text-editor"> 1484 <provider selected="true" editor-type-id="text-editor">
1230 <state vertical-scroll-proportion="0.0"> 1485 <state vertical-scroll-proportion="0.0">
@@ -1248,6 +1503,7 @@ @@ -1248,6 +1503,7 @@
1248 <provider selected="true" editor-type-id="text-editor"> 1503 <provider selected="true" editor-type-id="text-editor">
1249 <state vertical-scroll-proportion="0.0"> 1504 <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" /> 1505 <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />
  1506 + <folding />
1251 </state> 1507 </state>
1252 </provider> 1508 </provider>
1253 </entry> 1509 </entry>
@@ -1255,6 +1511,56 @@ @@ -1255,6 +1511,56 @@
1255 <provider selected="true" editor-type-id="text-editor"> 1511 <provider selected="true" editor-type-id="text-editor">
1256 <state vertical-scroll-proportion="0.0"> 1512 <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" /> 1513 <caret line="202" column="13" selection-start-line="202" selection-start-column="13" selection-end-line="202" selection-end-column="13" />
  1514 + <folding>
  1515 + <element signature="e#2917#2918#0" expanded="false" />
  1516 + <element signature="e#2942#2943#0" expanded="false" />
  1517 + <element signature="e#3194#3195#0" expanded="false" />
  1518 + <element signature="e#3222#3223#0" expanded="false" />
  1519 + <element signature="e#3475#3476#0" expanded="false" />
  1520 + <element signature="e#3502#3503#0" expanded="false" />
  1521 + <element signature="e#3766#3767#0" expanded="false" />
  1522 + <element signature="e#3827#3828#0" expanded="false" />
  1523 + <element signature="e#4086#4087#0" expanded="false" />
  1524 + <element signature="e#4115#4116#0" expanded="false" />
  1525 + <element signature="e#4389#4390#0" expanded="false" />
  1526 + <element signature="e#4456#4457#0" expanded="false" />
  1527 + <element signature="e#4723#4724#0" expanded="false" />
  1528 + <element signature="e#4754#4755#0" expanded="false" />
  1529 + <element signature="e#5040#5041#0" expanded="false" />
  1530 + <element signature="e#5113#5114#0" expanded="false" />
  1531 + <element signature="e#5389#5390#0" expanded="false" />
  1532 + <element signature="e#5423#5424#0" expanded="false" />
  1533 + <element signature="e#6073#6074#0" expanded="false" />
  1534 + <element signature="e#6104#6105#0" expanded="false" />
  1535 + <element signature="e#6390#6391#0" expanded="false" />
  1536 + <element signature="e#6463#6464#0" expanded="false" />
  1537 + <element signature="e#6736#6737#0" expanded="false" />
  1538 + <element signature="e#6769#6770#0" expanded="false" />
  1539 + <element signature="e#7065#7066#0" expanded="false" />
  1540 + <element signature="e#7144#7145#0" expanded="false" />
  1541 + <element signature="e#7404#7405#0" expanded="false" />
  1542 + <element signature="e#7434#7435#0" expanded="false" />
  1543 + <element signature="e#7711#7712#0" expanded="false" />
  1544 + <element signature="e#7749#7750#0" expanded="false" />
  1545 + <element signature="e#8025#8026#0" expanded="false" />
  1546 + <element signature="e#8059#8060#0" expanded="false" />
  1547 + <element signature="e#8715#8716#0" expanded="false" />
  1548 + <element signature="e#8748#8749#0" expanded="false" />
  1549 + <element signature="e#9044#9045#0" expanded="false" />
  1550 + <element signature="e#9123#9124#0" expanded="false" />
  1551 + <element signature="e#9390#9391#0" expanded="false" />
  1552 + <element signature="e#9421#9422#0" expanded="false" />
  1553 + <element signature="e#9707#9708#0" expanded="false" />
  1554 + <element signature="e#9780#9781#0" expanded="false" />
  1555 + <element signature="e#10051#10052#0" expanded="false" />
  1556 + <element signature="e#10084#10085#0" expanded="false" />
  1557 + <element signature="e#10378#10379#0" expanded="false" />
  1558 + <element signature="e#10422#10423#0" expanded="false" />
  1559 + <element signature="e#10693#10694#0" expanded="false" />
  1560 + <element signature="e#10726#10727#0" expanded="false" />
  1561 + <element signature="e#11020#11021#0" expanded="false" />
  1562 + <element signature="e#11064#11065#0" expanded="false" />
  1563 + </folding>
1258 </state> 1564 </state>
1259 </provider> 1565 </provider>
1260 </entry> 1566 </entry>
@@ -1263,18 +1569,18 @@ @@ -1263,18 +1569,18 @@
1263 <state vertical-scroll-proportion="0.0"> 1569 <state vertical-scroll-proportion="0.0">
1264 <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" /> 1570 <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
1265 <folding> 1571 <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" /> 1572 + <element signature="e#532#533#0" expanded="false" />
  1573 + <element signature="e#558#559#0" expanded="false" />
  1574 + <element signature="e#593#594#0" expanded="false" />
  1575 + <element signature="e#623#624#0" expanded="false" />
  1576 + <element signature="e#669#670#0" expanded="false" />
  1577 + <element signature="e#697#698#0" expanded="false" />
  1578 + <element signature="e#739#740#0" expanded="false" />
  1579 + <element signature="e#773#774#0" expanded="false" />
  1580 + <element signature="e#825#826#0" expanded="false" />
  1581 + <element signature="e#859#860#0" expanded="false" />
  1582 + <element signature="e#913#914#0" expanded="false" />
  1583 + <element signature="e#959#960#0" expanded="false" />
1278 </folding> 1584 </folding>
1279 </state> 1585 </state>
1280 </provider> 1586 </provider>
@@ -1299,44 +1605,117 @@ @@ -1299,44 +1605,117 @@
1299 <state vertical-scroll-proportion="0.0"> 1605 <state vertical-scroll-proportion="0.0">
1300 <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" /> 1606 <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
1301 <folding> 1607 <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" /> 1608 + <element signature="e#442#443#0" expanded="false" />
  1609 + <element signature="e#468#469#0" expanded="false" />
  1610 + <element signature="e#503#504#0" expanded="false" />
  1611 + <element signature="e#533#534#0" expanded="false" />
  1612 + <element signature="e#579#580#0" expanded="false" />
  1613 + <element signature="e#607#608#0" expanded="false" />
  1614 + <element signature="e#649#650#0" expanded="false" />
  1615 + <element signature="e#683#684#0" expanded="false" />
  1616 + <element signature="e#735#736#0" expanded="false" />
  1617 + <element signature="e#769#770#0" expanded="false" />
  1618 + <element signature="e#823#824#0" expanded="false" />
  1619 + <element signature="e#869#870#0" expanded="false" />
1314 </folding> 1620 </folding>
1315 </state> 1621 </state>
1316 </provider> 1622 </provider>
1317 </entry> 1623 </entry>
1318 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java"> 1624 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
  1625 + <provider selected="true" editor-type-id="text-editor">
  1626 + <state vertical-scroll-proportion="0.0">
  1627 + <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
  1628 + <folding />
  1629 + </state>
  1630 + </provider>
  1631 + </entry>
  1632 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java">
  1633 + <provider selected="true" editor-type-id="text-editor">
  1634 + <state vertical-scroll-proportion="0.0">
  1635 + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
  1636 + <folding />
  1637 + </state>
  1638 + </provider>
  1639 + </entry>
  1640 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1641 + <provider selected="true" editor-type-id="text-editor">
  1642 + <state vertical-scroll-proportion="-5.0">
  1643 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
  1644 + <folding />
  1645 + </state>
  1646 + </provider>
  1647 + </entry>
  1648 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
1319 <provider selected="true" editor-type-id="text-editor"> 1649 <provider selected="true" editor-type-id="text-editor">
1320 <state vertical-scroll-proportion="0.0"> 1650 <state vertical-scroll-proportion="0.0">
1321 - <caret line="47" column="47" selection-start-line="47" selection-start-column="47" selection-end-line="47" selection-end-column="47" /> 1651 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1652 + <folding />
  1653 + </state>
  1654 + </provider>
  1655 + </entry>
  1656 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  1657 + <provider selected="true" editor-type-id="text-editor">
  1658 + <state vertical-scroll-proportion="0.0">
  1659 + <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
1322 <folding> 1660 <folding>
1323 - <element signature="imports" expanded="true" /> 1661 + <element signature="e#0#6857#0" expanded="true" />
  1662 + <element signature="e#895#896#0" expanded="true" />
  1663 + <element signature="e#953#954#0" expanded="true" />
  1664 + <element signature="e#1114#1115#0" expanded="true" />
  1665 + <element signature="e#1173#1174#0" expanded="true" />
1324 </folding> 1666 </folding>
1325 </state> 1667 </state>
1326 </provider> 1668 </provider>
1327 </entry> 1669 </entry>
1328 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> 1670 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1329 <provider selected="true" editor-type-id="text-editor"> 1671 <provider selected="true" editor-type-id="text-editor">
1330 <state vertical-scroll-proportion="0.0"> 1672 <state vertical-scroll-proportion="0.0">
1331 - <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" /> 1673 + <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
  1674 + <folding>
  1675 + <element signature="e#348#349#0" expanded="true" />
  1676 + <element signature="e#373#374#0" expanded="true" />
  1677 + <element signature="e#407#408#0" expanded="true" />
  1678 + <element signature="e#435#436#0" expanded="true" />
  1679 + <element signature="e#466#467#0" expanded="true" />
  1680 + <element signature="e#493#494#0" expanded="true" />
  1681 + <element signature="e#533#534#0" expanded="true" />
  1682 + <element signature="e#565#566#0" expanded="true" />
  1683 + <element signature="e#598#599#0" expanded="true" />
  1684 + <element signature="e#627#628#0" expanded="true" />
  1685 + <element signature="e#671#672#0" expanded="true" />
  1686 + <element signature="e#707#708#0" expanded="true" />
  1687 + <element signature="e#745#746#0" expanded="true" />
  1688 + <element signature="e#779#780#0" expanded="true" />
  1689 + <element signature="e#833#834#0" expanded="true" />
  1690 + <element signature="e#879#880#0" expanded="true" />
  1691 + <element signature="e#914#915#0" expanded="true" />
  1692 + <element signature="e#945#946#0" expanded="true" />
  1693 + <element signature="e#993#994#0" expanded="true" />
  1694 + <element signature="e#1033#1034#0" expanded="true" />
  1695 + <element signature="e#1065#1066#0" expanded="true" />
  1696 + <element signature="e#1095#1096#0" expanded="true" />
  1697 + <element signature="e#1139#1140#0" expanded="true" />
  1698 + <element signature="e#1177#1178#0" expanded="true" />
  1699 + <element signature="e#1214#1215#0" expanded="true" />
  1700 + <element signature="e#1247#1248#0" expanded="true" />
  1701 + <element signature="e#1299#1300#0" expanded="true" />
  1702 + <element signature="e#1343#1344#0" expanded="true" />
  1703 + </folding>
  1704 + </state>
  1705 + </provider>
  1706 + </entry>
  1707 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  1708 + <provider selected="true" editor-type-id="text-editor">
  1709 + <state vertical-scroll-proportion="0.0">
  1710 + <caret line="105" column="62" selection-start-line="105" selection-start-column="62" selection-end-line="105" selection-end-column="62" />
1332 <folding /> 1711 <folding />
1333 </state> 1712 </state>
1334 </provider> 1713 </provider>
1335 </entry> 1714 </entry>
1336 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 1715 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
1337 <provider selected="true" editor-type-id="text-editor"> 1716 <provider selected="true" editor-type-id="text-editor">
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" /> 1717 + <state vertical-scroll-proportion="-6.490196">
  1718 + <caret line="302" column="30" selection-start-line="302" selection-start-column="30" selection-end-line="302" selection-end-column="30" />
1340 <folding /> 1719 <folding />
1341 </state> 1720 </state>
1342 </provider> 1721 </provider>
@@ -1344,15 +1723,15 @@ @@ -1344,15 +1723,15 @@
1344 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java"> 1723 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java">
1345 <provider selected="true" editor-type-id="text-editor"> 1724 <provider selected="true" editor-type-id="text-editor">
1346 <state vertical-scroll-proportion="0.0"> 1725 <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" /> 1726 + <caret line="106" column="67" selection-start-line="106" selection-start-column="67" selection-end-line="106" selection-end-column="67" />
1348 <folding /> 1727 <folding />
1349 </state> 1728 </state>
1350 </provider> 1729 </provider>
1351 </entry> 1730 </entry>
1352 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java"> 1731 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1353 <provider selected="true" editor-type-id="text-editor"> 1732 <provider selected="true" editor-type-id="text-editor">
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" /> 1733 + <state vertical-scroll-proportion="0.08941606">
  1734 + <caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
1356 <folding /> 1735 <folding />
1357 </state> 1736 </state>
1358 </provider> 1737 </provider>
src/main/java/com/canrd/patent/common/utils/DateUtils.java 0 → 100644
  View file @dc25852
  1 +/*
  2 + * Copyright 2014 Qunar.com All right reserved. This software is the
  3 + * confidential and proprietary information of Qunar.com ("Confidential
  4 + * Information"). You shall not disclose such Confidential Information and shall
  5 + * use it only in accordance with the terms of the license agreement you entered
  6 + * into with Qunar.com.
  7 + */
  8 +package com.canrd.patent.common.utils;
  9 +
  10 +import org.apache.commons.lang.StringUtils;
  11 +import org.joda.time.DateTime;
  12 +import org.joda.time.LocalTime;
  13 +import org.joda.time.Period;
  14 +
  15 +import java.text.SimpleDateFormat;
  16 +import java.util.Calendar;
  17 +import java.util.Date;
  18 +import java.util.concurrent.TimeUnit;
  19 +
  20 +/**
  21 + * 实现描述：日期处理工具
  22 + *
  23 + * @author chaoyi.he
  24 + * @version v1.0.0
  25 + * @see
  26 + * @since 2014年8月13日 上午10:48:36
  27 + */
  28 +public abstract class DateUtils {
  29 +
  30 + public static String now() {
  31 + return format(new Date());
  32 + }
  33 +
  34 + public static String format(Date time) {
  35 + return format(time, "yyyy-MM-dd HH:mm:ss");
  36 + }
  37 +
  38 + public static String formatDate(Date date) {
  39 + return format(date, "yyyy-MM-dd");
  40 + }
  41 +
  42 + public static String format(Date time, String pattern) {
  43 + return new DateTime(time).toString(pattern);
  44 + }
  45 +
  46 + public static Date parse(String time) {
  47 + return DateTime.parse(time.replace(' ', 'T')).toDate();
  48 + }
  49 +
  50 + public static Date parseTime(String time) {
  51 + if (time.startsWith("24:00"))
  52 + return new DateTime().plusDays(1).withTimeAtStartOfDay().minusMillis(1).toDate();
  53 + return LocalTime.parse(time).toDateTimeToday().toDate();
  54 + }
  55 +
  56 + public static String formatToHMS(Date start, Date finish) {
  57 + Period period = new Period(start.getTime(), finish.getTime());
  58 + return String.format("%02d:%02d:%02d.%03d", period.toStandardHours().getHours(), period.getMinutes(),
  59 + period.getSeconds(), period.getMillis());
  60 + }
  61 +
  62 + public static String formatToHMS(int millis) {
  63 + Period period = new Period(millis);
  64 + return String.format("%02d:%02d:%02d.%03d", period.toStandardHours().getHours(), period.getMinutes(),
  65 + period.getSeconds(), period.getMillis());
  66 + }
  67 +
  68 + public static String formatToMS(Date start, Date finish) {
  69 + Period period = new Period(start.getTime(), finish.getTime());
  70 + return String.format("%02d:%02d.%03d", period.toStandardMinutes().getMinutes(), period.getSeconds(),
  71 + period.getMillis());
  72 + }
  73 +
  74 + public static String formatToMS(int millis) {
  75 + Period period = new Period(millis);
  76 + return String.format("%02d:%02d.%03d", period.toStandardMinutes().getMinutes(), period.getSeconds(),
  77 + period.getMillis());
  78 + }
  79 +
  80 + public static int dateRange(Date startDate, Date endDate) {
  81 + Period period = new Period(new DateTime(startDate).withTimeAtStartOfDay(),
  82 + new DateTime(endDate).withTimeAtStartOfDay());
  83 + return period.toStandardDays().getDays() + 1;
  84 + }
  85 +
  86 + public static int minutesAgo(Date time) {
  87 + Period period = new Period(new DateTime(time), new DateTime());
  88 + return period.toStandardMinutes().getMinutes();
  89 + }
  90 +
  91 + /**
  92 + * 将日期或者时间字符串转化为日期对象
  93 + *
  94 + * @param date 日期字符串
  95 + * @param pattern 格式字符串</br> yyyy-MM-DD, yyyy/MM/DD, yyyyMMdd</br> yyyy-MM-dd-HH:mm:ss, yyyy-MM-dd HH:mm:ss
  96 + * 格式字符串可选字符："GyMdkHmsSEDFwWahKzZ"
  97 + * @return Date
  98 + * @see java.text.DateFormatSymbols
  99 + */
  100 + public static Date convertDate(String date, String pattern) {
  101 + try {
  102 + if (StringUtils.isEmpty(pattern) || StringUtils.isEmpty(date)) {
  103 + String msg = "the date or pattern is empty.";
  104 + throw new IllegalArgumentException(msg);
  105 + }
  106 + SimpleDateFormat df = new SimpleDateFormat(pattern.trim());
  107 + return df.parse(date.trim());
  108 + } catch (Exception e) {
  109 + throw new IllegalArgumentException("Method===DateUtils.convertDate error!", e);
  110 + }
  111 + }
  112 +
  113 + public static int diffDate(Date date1, Date date2) {
  114 + return (int) ((date1.getTime() - date2.getTime()) / TimeUnit.DAYS.toMillis(1L));
  115 + }
  116 +
  117 + public static Date beforeDay(Integer c) {
  118 + Calendar calendar = Calendar.getInstance();// 此时打印它获取的是系统当前时间
  119 + calendar.add(Calendar.DATE, -c); // 得到前一天
  120 + String yestedayDate = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
  121 + return convertDate(yestedayDate, "yyyy-MM-dd");
  122 + }
  123 +
  124 + public static Date beforeTime(Integer c) {
  125 + Calendar calendar = Calendar.getInstance();// 此时打印它获取的是系统当前时间
  126 + calendar.add(Calendar.DATE, -c); // 得到前一天
  127 + String yestedayDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
  128 + return convertDate(yestedayDate, "yyyy-MM-dd HH:mm:ss");
  129 + }
  130 +
  131 + public static String todayDate() {
  132 + return format(today(), "yyyy-MM-dd");
  133 + }
  134 +
  135 + public static String nextDays(Integer c) {
  136 + return format(nextDay(c), "yyyy-MM-dd");
  137 + }
  138 +
  139 + public static Date today() {
  140 + return new Date();
  141 + }
  142 +
  143 + public static Date nextDay(Integer c) {
  144 + Calendar calendar = Calendar.getInstance();// 此时打印它获取的是系统当前时间
  145 + calendar.add(Calendar.DATE, c); // 得到前一天
  146 + String yestedayDate = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
  147 + return convertDate(yestedayDate, "yyyy-MM-dd");
  148 + }
  149 +
  150 + public static Date nextDayByOneDay(Date date, Integer c) {
  151 + Calendar calendar = Calendar.getInstance();
  152 + calendar.setTime(date);
  153 + int day = calendar.get(Calendar.DATE);
  154 + calendar.set(Calendar.DATE, day + c);
  155 + return calendar.getTime();
  156 + }
  157 +
  158 + public static String nextDay(Date date, int c) {
  159 + return format(nextDayByOneDay(date, c), "yyyy-MM-dd");
  160 + }
  161 +
  162 + /**
  163 + * 获得指定日期的前一天
  164 + * @param specifiedDay
  165 + * @return
  166 + * @throws Exception
  167 + */
  168 + public static String dayBefore(String specifiedDay) {
  169 + return DateTime.parse("yyyy-MM-dd").minusDays(1).toString("yyyy-MM-dd");
  170 + }
  171 +
  172 + public static String dayBefore(Date d) {
  173 + return dayBefore(new SimpleDateFormat("yyyy-MM-dd").format(d));
  174 + }
  175 +
  176 + /**
  177 + * 返回日期是星期几(整形数字)，按照国内的记法
  178 + * 例如:星期一是1,星期二是2
  179 + * @return
  180 + */
  181 + public static int dayOfWeek(Date d) {
  182 + Calendar cal = Calendar.getInstance();
  183 + cal.setTime(d);
  184 + int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
  185 + if (w == 0) {
  186 + w = 7;
  187 + }
  188 + return w;
  189 + }
  190 +
  191 + /**
  192 + * 返回日期是星期几(中文)，按照国内的记法
  193 + *
  194 + * @return
  195 + */
  196 + public static String weekOfDate(Date dt) {
  197 + String[] weekDays = { "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日" };
  198 + Calendar cal = Calendar.getInstance();
  199 + cal.setTime(dt);
  200 + int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
  201 + if (w == 0) {
  202 + w = 7;
  203 + }
  204 + return weekDays[w - 1];
  205 + }
  206 +
  207 +}
src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java 0 → 100644
  View file @dc25852
  1 +package com.canrd.patent.dal.dto;
  2 +
  3 +import java.util.Date;
  4 +
  5 +/**
  6 + * Created by ouyangmao on 16/7/20.
  7 + */
  8 +public class CaseOutputDto {
  9 + private Long id;
  10 + private String name;
  11 + private String caseSn;
  12 + private String contractNum;
  13 + private String caseType;
  14 + private Long expense;
  15 + private String createDate;
  16 +
  17 + public Long getId() {
  18 + return id;
  19 + }
  20 +
  21 + public void setId(Long id) {
  22 + this.id = id;
  23 + }
  24 +
  25 + public String getName() {
  26 + return name;
  27 + }
  28 +
  29 + public void setName(String name) {
  30 + this.name = name;
  31 + }
  32 +
  33 + public String getCaseSn() {
  34 + return caseSn;
  35 + }
  36 +
  37 + public void setCaseSn(String caseSn) {
  38 + this.caseSn = caseSn;
  39 + }
  40 +
  41 + public String getContractNum() {
  42 + return contractNum;
  43 + }
  44 +
  45 + public void setContractNum(String contractNum) {
  46 + this.contractNum = contractNum;
  47 + }
  48 +
  49 + public String getCaseType() {
  50 + return caseType;
  51 + }
  52 +
  53 + public void setCaseType(String caseType) {
  54 + this.caseType = caseType;
  55 + }
  56 +
  57 + public Long getExpense() {
  58 + return expense;
  59 + }
  60 +
  61 + public void setExpense(Long expense) {
  62 + this.expense = expense;
  63 + }
  64 +
  65 + public String getCreateDate() {
  66 + return createDate;
  67 + }
  68 +
  69 + public void setCreateDate(String createDate) {
  70 + this.createDate = createDate;
  71 + }
  72 +}
src/main/java/com/canrd/patent/service/CaseHandlingService.java
  View file @dc25852
1 package com.canrd.patent.service; 1 package com.canrd.patent.service;
2 2
  3 +import com.canrd.patent.common.utils.DateUtils;
  4 +import com.canrd.patent.dal.dto.CaseOutputDto;
  5 +import com.canrd.patent.dal.dto.HomePatentTypeOutputDto;
3 import com.canrd.patent.dal.enums.*; 6 import com.canrd.patent.dal.enums.*;
4 import com.canrd.patent.dal.mapper.CasementMapper; 7 import com.canrd.patent.dal.mapper.CasementMapper;
5 import com.canrd.patent.dal.model.Casement; 8 import com.canrd.patent.dal.model.Casement;
6 import com.canrd.patent.dal.model.CasementExample; 9 import com.canrd.patent.dal.model.CasementExample;
  10 +import com.google.common.collect.Lists;
7 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
8 import org.springframework.transaction.annotation.Isolation; 12 import org.springframework.transaction.annotation.Isolation;
9 import org.springframework.transaction.annotation.Propagation; 13 import org.springframework.transaction.annotation.Propagation;
@@ -31,8 +35,8 @@ public class CaseHandlingService { @@ -31,8 +35,8 @@ public class CaseHandlingService {
31 * @param reduceTypeEnum 35 * @param reduceTypeEnum
32 * @param expense 36 * @param expense
33 */ 37 */
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); 38 + public int saveCase(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense,String memberId){
  39 + Casement preCasement = findCasement(caseTypeEnum, serviceTypeEnum, paidTypeEnum, reduceTypeEnum, expense,memberId);
36 if(StringUtils.isEmpty(preCasement)) { 40 if(StringUtils.isEmpty(preCasement)) {
37 Casement casement = new Casement(); 41 Casement casement = new Casement();
38 casement.setCaseType(caseTypeEnum.name()); 42 casement.setCaseType(caseTypeEnum.name());
@@ -46,7 +50,9 @@ public class CaseHandlingService { @@ -46,7 +50,9 @@ public class CaseHandlingService {
46 casement.setMemberId(memberId); 50 casement.setMemberId(memberId);
47 casement.setCreateDate(new Date()); 51 casement.setCreateDate(new Date());
48 casement.setUpdateDate(new Date()); 52 casement.setUpdateDate(new Date());
49 - casementMapper.insertSelective(casement); 53 + return casementMapper.insertSelective(casement);
  54 + }else{
  55 + return 0;
50 } 56 }
51 } 57 }
52 58
@@ -59,7 +65,7 @@ public class CaseHandlingService { @@ -59,7 +65,7 @@ public class CaseHandlingService {
59 * @param expense 65 * @param expense
60 * @return 66 * @return
61 */ 67 */
62 - public Casement findCasement(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense){ 68 + public Casement findCasement(CaseTypeEnum caseTypeEnum,ServiceTypeEnum serviceTypeEnum,PaidTypeEnum paidTypeEnum,ReduceTypeEnum reduceTypeEnum,Long expense,String memberId){
63 CasementExample casementExample = new CasementExample(); 69 CasementExample casementExample = new CasementExample();
64 CasementExample.Criteria criteria = casementExample.createCriteria(); 70 CasementExample.Criteria criteria = casementExample.createCriteria();
65 criteria.andCaseTypeEqualTo(caseTypeEnum.name()); 71 criteria.andCaseTypeEqualTo(caseTypeEnum.name());
@@ -68,6 +74,9 @@ public class CaseHandlingService { @@ -68,6 +74,9 @@ public class CaseHandlingService {
68 if(reduceTypeEnum != null) { 74 if(reduceTypeEnum != null) {
69 criteria.andReduceTypeEqualTo(reduceTypeEnum.name() ); 75 criteria.andReduceTypeEqualTo(reduceTypeEnum.name() );
70 } 76 }
  77 + if(memberId != null){
  78 + criteria.andMemberIdEqualTo(memberId);
  79 + }
71 criteria.andExpenseEqualTo(expense); 80 criteria.andExpenseEqualTo(expense);
72 List<Casement> casementList = casementMapper.selectByExample(casementExample); 81 List<Casement> casementList = casementMapper.selectByExample(casementExample);
73 if(CollectionUtils.isEmpty(casementList)){ 82 if(CollectionUtils.isEmpty(casementList)){
@@ -81,9 +90,24 @@ public class CaseHandlingService { @@ -81,9 +90,24 @@ public class CaseHandlingService {
81 * 查询所有案件列表 90 * 查询所有案件列表
82 * @return 91 * @return
83 */ 92 */
84 - public List<Casement> findCasementList(){ 93 + public List<CaseOutputDto> findCasementList(String memberId){
85 CasementExample casementExample = new CasementExample(); 94 CasementExample casementExample = new CasementExample();
86 - return casementMapper.selectByExample(casementExample); 95 + CasementExample.Criteria criteria = casementExample.createCriteria();
  96 + criteria.andMemberIdEqualTo(memberId);
  97 + List<Casement> casementList = casementMapper.selectByExample(casementExample);
  98 + List<CaseOutputDto> caseOutputDtoList = Lists.newArrayList();
  99 + for(Casement casement:casementList){
  100 + CaseOutputDto caseOutputDto = new CaseOutputDto();
  101 + caseOutputDto.setId(casement.getId());
  102 + caseOutputDto.setName(casement.getName());
  103 + caseOutputDto.setCaseType(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
  104 + caseOutputDto.setCaseSn(casement.getCasesn());
  105 + caseOutputDto.setContractNum(casement.getCasesn());
  106 + caseOutputDto.setExpense(casement.getExpense()/100);
  107 + caseOutputDto.setCreateDate(DateUtils.format(casement.getCreateDate()));
  108 + caseOutputDtoList.add(caseOutputDto);
  109 + }
  110 + return caseOutputDtoList;
87 } 111 }
88 112
89 /*** 113 /***
@@ -100,7 +124,7 @@ public class CaseHandlingService { @@ -100,7 +124,7 @@ public class CaseHandlingService {
100 int sn = Integer.parseInt(caseSn.substring(2, caseSn.length())); 124 int sn = Integer.parseInt(caseSn.substring(2, caseSn.length()));
101 return caseSn.substring(0,2)+(sn+1); 125 return caseSn.substring(0,2)+(sn+1);
102 }else { 126 }else {
103 - return "KC"+"00000000"; 127 + return "KC"+"10000000";
104 } 128 }
105 } 129 }
106 } 130 }
src/main/java/com/canrd/patent/web/HomePatentController.java
  View file @dc25852
@@ -4,6 +4,7 @@ import com.canrd.patent.common.standard.StdJson; @@ -4,6 +4,7 @@ import com.canrd.patent.common.standard.StdJson;
4 import com.canrd.patent.common.utils.TextUtils; 4 import com.canrd.patent.common.utils.TextUtils;
5 import com.canrd.patent.dal.constant.FrontConstant; 5 import com.canrd.patent.dal.constant.FrontConstant;
6 import com.canrd.patent.dal.dto.CaseInputDto; 6 import com.canrd.patent.dal.dto.CaseInputDto;
  7 +import com.canrd.patent.dal.dto.CaseOutputDto;
7 import com.canrd.patent.dal.enums.CaseTypeEnum; 8 import com.canrd.patent.dal.enums.CaseTypeEnum;
8 import com.canrd.patent.dal.enums.PaidTypeEnum; 9 import com.canrd.patent.dal.enums.PaidTypeEnum;
9 import com.canrd.patent.dal.enums.ReduceTypeEnum; 10 import com.canrd.patent.dal.enums.ReduceTypeEnum;
@@ -91,8 +92,8 @@ public class HomePatentController { @@ -91,8 +92,8 @@ public class HomePatentController {
91 PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(caseInputDto.getPaidType()); 92 PaidTypeEnum paidTypeEnum = PaidTypeEnum.valueOf(caseInputDto.getPaidType());
92 ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null; 93 ReduceTypeEnum reduceTypeEnum = TextUtils.isNotEmpty(caseInputDto.getReduceType()) ? ReduceTypeEnum.valueOf(caseInputDto.getReduceType()) : null;
93 Long expense = Long.parseLong(caseInputDto.getExpense())*100; 94 Long expense = Long.parseLong(caseInputDto.getExpense())*100;
94 - caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,MEMBER_ID);  
95 - return StdJson.ok("添加成功"); 95 + int res = caseHandlingService.saveCase(caseTypeEnum,serviceTypeEnum,paidTypeEnum,reduceTypeEnum,expense,MEMBER_ID);
  96 + return StdJson.ok(res==1?"添加成功":"已添加过");
96 }catch (Exception e){ 97 }catch (Exception e){
97 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e); 98 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
98 return StdJson.err(-1,e.getMessage()); 99 return StdJson.err(-1,e.getMessage());
@@ -103,7 +104,7 @@ public class HomePatentController { @@ -103,7 +104,7 @@ public class HomePatentController {
103 @RequestMapping(value="/find_case_list") 104 @RequestMapping(value="/find_case_list")
104 public Object findCasementList(CaseInputDto caseInputDto){ 105 public Object findCasementList(CaseInputDto caseInputDto){
105 try { 106 try {
106 - List<Casement> casementList = caseHandlingService.findCasementList(); 107 + List<CaseOutputDto> casementList = caseHandlingService.findCasementList(MEMBER_ID);
107 return StdJson.ok(casementList); 108 return StdJson.ok(casementList);
108 }catch (Exception e){ 109 }catch (Exception e){
109 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e); 110 logger.warn("[HomePatentController][homePatentTypeList] get home patent type list error ",e);
src/main/webapp/home_patent.jsp
  View file @dc25852
@@ -31,8 +31,16 @@ @@ -31,8 +31,16 @@
31 <p></p> 31 <p></p>
32 </div> 32 </div>
33 <div> 33 <div>
34 - <span class="expense">3900</span> 34 + <span class="expense"></span>
35 <button class="submit_case">提交案件</button> 35 <button class="submit_case">提交案件</button>
  36 + <%--<form style="display: inline" id="submit_form" method="post">
  37 + <input type="hidden" name="caseType" id="input_ct">
  38 + <input type="hidden" name="serviceType" id="input_st">
  39 + <input type="hidden" name="paidType" id="input_pt">
  40 + <input type="hidden" name="reduceType" id="input_rt">
  41 + <input type="hidden" name="expense" id="input_es">
  42 + <button class="submit_case">提交案件</button>
  43 + </form>--%>
36 </div> 44 </div>
37 </div> 45 </div>
38 </div> 46 </div>
@@ -263,6 +271,22 @@ @@ -263,6 +271,22 @@
263 }); 271 });
264 272
265 function submit(caseType,serviceType,paidType,reduceType,expense){ 273 function submit(caseType,serviceType,paidType,reduceType,expense){
  274 + /*$("input#input_ct").val(caseType);
  275 + $("input#input_st").val(serviceType);
  276 + $("input#input_pt").val(paidType);
  277 + $("input#input_rt").val(reduceType);
  278 + $("input#input_es").val(expense);
  279 + /!*$("form#submit_form").attr("action","/submit_case");*!/
  280 + $("form#submit_form").ajaxSubmit({
  281 + url:"/submit_case",
  282 + dataType:"JSON",
  283 + success:function(res){
  284 + alert(res.data);
  285 + },
  286 + error:function(err){
  287 +
  288 + }
  289 + });*/
266 $.ajax({ 290 $.ajax({
267 url:"/submit_case", 291 url:"/submit_case",
268 type:"POST", 292 type:"POST",
@@ -277,9 +301,10 @@ @@ -277,9 +301,10 @@
277 }, 301 },
278 success:function(res){ 302 success:function(res){
279 alert(res.data); 303 alert(res.data);
  304 + location.href = "/pay.jsp";
280 }, 305 },
281 error:function(err){ 306 error:function(err){
282 - 307 + alert(err);
283 } 308 }
284 }); 309 });
285 } 310 }
src/main/webapp/pay.jsp
  View file @dc25852
@@ -30,31 +30,12 @@ @@ -30,31 +30,12 @@
30 <th>费用</th> 30 <th>费用</th>
31 </tr> 31 </tr>
32 </thead> 32 </thead>
33 - <tbody>  
34 - <tr>  
35 - <td>  
36 - <span>发明专利</span> 33 + <tbody class="case_list_body">
  34 +
  35 + </tbody>
  36 + </table>
37 </div> 37 </div>
38 - </td>  
39 - <td>  
40 - <span>暂无名称</span>  
41 - </td>  
42 - <td>  
43 - GG1603754CA  
44 - </td>  
45 - <td>  
46 - <span>3800</span>  
47 - </td>  
48 - </tr>  
49 - <tr class="case-list-item-bottom-tr">  
50 - <td colspan="4">  
51 - <span>合同号：<span>466686664696562</span></span>  
52 - <span>立案时间：<span>2016-05-13 22:40:53</span></span>  
53 - </td>  
54 - </tr>  
55 - </tbody>  
56 - </table>  
57 - </div> 38 + </div>
58 <div class="recev-addr"> 39 <div class="recev-addr">
59 <h2>收件信息</h2> 40 <h2>收件信息</h2>
60 41
@@ -126,8 +107,45 @@ @@ -126,8 +107,45 @@
126 </div> 107 </div>
127 </div> 108 </div>
128 <jsp:include page="/include/footer.jsp" flush="true"/> 109 <jsp:include page="/include/footer.jsp" flush="true"/>
  110 +</body>
  111 +</html>
129 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script> 112 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
130 <script type="text/javascript" src="/js/pay.js"></script> 113 <script type="text/javascript" src="/js/pay.js"></script>
131 -</body> 114 +<script>
  115 + var case_list_body=$(".case_list_body");
  116 + $.ajax({
  117 + url:"/find_case_list",
  118 + type:"POST",
  119 + dataType:"JSON",
  120 + async:false,
  121 + success:function(res){
  122 + var data = res.data;
  123 + $.each(data,function(i,casement){
  124 + var trMain = $("<tr></tr>").appendTo(case_list_body);
  125 + //类型
  126 + var tdType = $("<td></td>").appendTo(trMain);
  127 + var spanType = $("<span></span>").text(casement['caseType']).appendTo(tdType);
132 128
133 -</html> 129 + //名称
  130 + var tdName = $("<td></td>").appendTo(trMain);
  131 + var spanName = $("<span></span>").text(casement['name']).appendTo(tdName);
  132 +
  133 + //编号
  134 + var tdSn = $("<td></td>").appendTo(trMain);
  135 + var spanSn = $("<span></span>").text(casement['caseSn']).appendTo(tdSn);
  136 +
  137 + //费用
  138 + var tdExpense = $("<td></td>").appendTo(trMain);
  139 + var spanExpense = $("<span></span>").text(casement['expense']).appendTo(tdExpense);
  140 + //footer信息
  141 + var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);
  142 + var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);
  143 + $("<span>合同号：<span>"+casement['caseSn']+"</span></span>").appendTo(tdFooter);
  144 + $("<span>立案时间：<span>"+casement['createDate']+"</span></span>").appendTo(tdFooter);
  145 + });
  146 + },
  147 + error:function(err){
  148 + alert(err);
  149 + }
  150 + });
  151 +</script>
target/classes/com/canrd/patent/common/utils/DateUtils.class 0 → 100644
View file @dc25852
No preview for this file type
target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class 0 → 100644
View file @dc25852
No preview for this file type
target/classes/com/canrd/patent/service/CaseHandlingService.class
View file @dc25852
No preview for this file type
target/classes/com/canrd/patent/web/HomePatentController.class
View file @dc25852
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/common/utils/DateUtils.class 0 → 100644
View file @dc25852
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class 0 → 100644
View file @dc25852
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class
View file @dc25852
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class
View file @dc25852
No preview for this file type
target/patent/home_patent.jsp
  View file @dc25852
@@ -31,8 +31,16 @@ @@ -31,8 +31,16 @@
31 <p></p> 31 <p></p>
32 </div> 32 </div>
33 <div> 33 <div>
34 - <span class="expense">3900</span> 34 + <span class="expense"></span>
35 <button class="submit_case">提交案件</button> 35 <button class="submit_case">提交案件</button>
  36 + <%--<form style="display: inline" id="submit_form" method="post">
  37 + <input type="hidden" name="caseType" id="input_ct">
  38 + <input type="hidden" name="serviceType" id="input_st">
  39 + <input type="hidden" name="paidType" id="input_pt">
  40 + <input type="hidden" name="reduceType" id="input_rt">
  41 + <input type="hidden" name="expense" id="input_es">
  42 + <button class="submit_case">提交案件</button>
  43 + </form>--%>
36 </div> 44 </div>
37 </div> 45 </div>
38 </div> 46 </div>
@@ -263,6 +271,22 @@ @@ -263,6 +271,22 @@
263 }); 271 });
264 272
265 function submit(caseType,serviceType,paidType,reduceType,expense){ 273 function submit(caseType,serviceType,paidType,reduceType,expense){
  274 + /*$("input#input_ct").val(caseType);
  275 + $("input#input_st").val(serviceType);
  276 + $("input#input_pt").val(paidType);
  277 + $("input#input_rt").val(reduceType);
  278 + $("input#input_es").val(expense);
  279 + /!*$("form#submit_form").attr("action","/submit_case");*!/
  280 + $("form#submit_form").ajaxSubmit({
  281 + url:"/submit_case",
  282 + dataType:"JSON",
  283 + success:function(res){
  284 + alert(res.data);
  285 + },
  286 + error:function(err){
  287 +
  288 + }
  289 + });*/
266 $.ajax({ 290 $.ajax({
267 url:"/submit_case", 291 url:"/submit_case",
268 type:"POST", 292 type:"POST",
@@ -277,9 +301,10 @@ @@ -277,9 +301,10 @@
277 }, 301 },
278 success:function(res){ 302 success:function(res){
279 alert(res.data); 303 alert(res.data);
  304 + location.href = "/pay.jsp";
280 }, 305 },
281 error:function(err){ 306 error:function(err){
282 - 307 + alert(err);
283 } 308 }
284 }); 309 });
285 } 310 }
target/patent/pay.jsp
  View file @dc25852
@@ -30,31 +30,12 @@ @@ -30,31 +30,12 @@
30 <th>费用</th> 30 <th>费用</th>
31 </tr> 31 </tr>
32 </thead> 32 </thead>
33 - <tbody>  
34 - <tr>  
35 - <td>  
36 - <span>发明专利</span> 33 + <tbody class="case_list_body">
  34 +
  35 + </tbody>
  36 + </table>
37 </div> 37 </div>
38 - </td>  
39 - <td>  
40 - <span>暂无名称</span>  
41 - </td>  
42 - <td>  
43 - GG1603754CA  
44 - </td>  
45 - <td>  
46 - <span>3800</span>  
47 - </td>  
48 - </tr>  
49 - <tr class="case-list-item-bottom-tr">  
50 - <td colspan="4">  
51 - <span>合同号：<span>466686664696562</span></span>  
52 - <span>立案时间：<span>2016-05-13 22:40:53</span></span>  
53 - </td>  
54 - </tr>  
55 - </tbody>  
56 - </table>  
57 - </div> 38 + </div>
58 <div class="recev-addr"> 39 <div class="recev-addr">
59 <h2>收件信息</h2> 40 <h2>收件信息</h2>
60 41
@@ -126,8 +107,45 @@ @@ -126,8 +107,45 @@
126 </div> 107 </div>
127 </div> 108 </div>
128 <jsp:include page="/include/footer.jsp" flush="true"/> 109 <jsp:include page="/include/footer.jsp" flush="true"/>
  110 +</body>
  111 +</html>
129 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script> 112 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
130 <script type="text/javascript" src="/js/pay.js"></script> 113 <script type="text/javascript" src="/js/pay.js"></script>
131 -</body> 114 +<script>
  115 + var case_list_body=$(".case_list_body");
  116 + $.ajax({
  117 + url:"/find_case_list",
  118 + type:"POST",
  119 + dataType:"JSON",
  120 + async:false,
  121 + success:function(res){
  122 + var data = res.data;
  123 + $.each(data,function(i,casement){
  124 + var trMain = $("<tr></tr>").appendTo(case_list_body);
  125 + //类型
  126 + var tdType = $("<td></td>").appendTo(trMain);
  127 + var spanType = $("<span></span>").text(casement['caseType']).appendTo(tdType);
132 128
133 -</html> 129 + //名称
  130 + var tdName = $("<td></td>").appendTo(trMain);
  131 + var spanName = $("<span></span>").text(casement['name']).appendTo(tdName);
  132 +
  133 + //编号
  134 + var tdSn = $("<td></td>").appendTo(trMain);
  135 + var spanSn = $("<span></span>").text(casement['caseSn']).appendTo(tdSn);
  136 +
  137 + //费用
  138 + var tdExpense = $("<td></td>").appendTo(trMain);
  139 + var spanExpense = $("<span></span>").text(casement['expense']).appendTo(tdExpense);
  140 + //footer信息
  141 + var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);
  142 + var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);
  143 + $("<span>合同号：<span>"+casement['caseSn']+"</span></span>").appendTo(tdFooter);
  144 + $("<span>立案时间：<span>"+casement['createDate']+"</span></span>").appendTo(tdFooter);
  145 + });
  146 + },
  147 + error:function(err){
  148 + alert(err);
  149 + }
  150 + });
  151 +</script>