0729

parent f634afe2
...@@ -9,21 +9,10 @@ ...@@ -9,21 +9,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment=""> <list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcRegionDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcRegionDao.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring-context.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring-context.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/spring-context.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/spring-context.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusTypeService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusTypeService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcRegionDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcRegionDao.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
</list> </list>
<ignored path="it-faq-manage.iws" /> <ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -77,89 +66,94 @@ ...@@ -77,89 +66,94 @@
<file leaf-file-name="reportTrack.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="reportTrack.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="192">
<caret line="731" column="10" lean-forward="true" selection-start-line="731" selection-start-column="10" selection-end-line="731" selection-end-column="10" /> <caret line="692" column="47" lean-forward="true" selection-start-line="692" selection-start-column="47" selection-end-line="692" selection-end-column="47" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ReportEntity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="spring-mvc.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring-mvc.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81"> <state relative-caret-position="2970">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" /> <caret line="110" column="29" lean-forward="false" selection-start-line="110" selection-start-column="29" selection-end-line="110" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="spring-context.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring-context.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TimedTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding> <folding>
<element signature="e#13898#13899#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#13938#13939#0" expanded="true" />
<element signature="e#14010#14011#0" expanded="true" />
<element signature="e#14068#14069#0" expanded="true" />
<element signature="e#14118#14119#0" expanded="true" />
<element signature="e#14158#14159#0" expanded="true" />
<element signature="e#14231#14232#0" expanded="true" />
<element signature="e#14289#14290#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CtBbtcRegionController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1428"> <state relative-caret-position="21303">
<caret line="105" column="35" lean-forward="true" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" /> <caret line="829" column="34" lean-forward="false" selection-start-line="829" selection-start-column="34" selection-end-line="829" selection-end-column="34" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CtBbtcBusTypeController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="405">
<caret line="29" column="58" lean-forward="false" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="58" /> <caret line="773" column="22" lean-forward="true" selection-start-line="773" selection-start-column="22" selection-end-line="773" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CtBbtcBusTypeDao.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="ExportExcel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/utils/excel/ExportExcel.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="10908">
<caret line="47" column="55" lean-forward="false" selection-start-line="47" selection-start-column="42" selection-end-line="47" selection-end-column="55" /> <caret line="459" column="27" lean-forward="false" selection-start-line="459" selection-start-column="27" selection-end-line="459" selection-end-column="27" />
<folding> <folding>
<marker date="1563421489885" expanded="true" signature="533:670" ph="SELECT FROM ct_bbtc_bus_type" /> <element signature="e#2551#2552#0" expanded="true" />
<marker date="1563421489885" expanded="true" signature="1368:1522" ph="SELECT FROM ct_bbtc_bus_type" /> <element signature="e#2594#2595#0" expanded="true" />
<marker date="1563421489885" expanded="true" signature="1944:2085" ph="INSERT INTO ct_bbtc_bus_type... " />
<marker date="1563421489885" expanded="true" signature="2123:2244" ph="UPDATE ct_bb... " />
<marker date="1563421489885" expanded="true" signature="2282:2329" ph="DELETE FROM " />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CtBbtcBusTypeDao.java" pinned="false" current-in-tab="false"> <file leaf-file-name="reportList.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="351">
<caret line="25" column="22" lean-forward="false" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="22" /> <caret line="13" column="77" lean-forward="false" selection-start-line="13" selection-start-column="71" selection-end-line="13" selection-end-column="77" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CtBbtcRegionService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="CtBbtcRegionController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="2187">
<caret line="23" column="42" lean-forward="false" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" /> <caret line="105" column="35" lean-forward="false" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
<folding> <folding />
<element signature="e#1167#1168#0" expanded="true" />
<element signature="e#1223#1224#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -170,18 +164,12 @@ ...@@ -170,18 +164,12 @@
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Jsp File" /> <option value="Jsp File" />
<option value="Class" />
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>supplementType</find>
<find>supplementarea</find>
<find>举报信息补充</find>
<find>内容</find>
<find>getGroupId</find>
<find>getRegion</find>
<find>ojdbc14</find>
<find>oracle.driver.version</find> <find>oracle.driver.version</find>
<find>project.basedir</find> <find>project.basedir</find>
<find>kingdee</find> <find>kingdee</find>
...@@ -205,6 +193,13 @@ ...@@ -205,6 +193,13 @@
<find>selectType</find> <find>selectType</find>
<find>reportProject</find> <find>reportProject</find>
<find>supplementArea</find> <find>supplementArea</find>
<find>&lt;mvc:view-controller</find>
<find>index</find>
<find>list</find>
<find>flag</find>
<find>excle</find>
<find>btnExport</find>
<find>export</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>${db.table.prefix}</replace> <replace>${db.table.prefix}</replace>
...@@ -236,8 +231,6 @@ ...@@ -236,8 +231,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/AreaDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
...@@ -256,11 +249,9 @@ ...@@ -256,11 +249,9 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/filter/CORSFilter.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/filter/CORSFilter.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/geoip/IPSeeker.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/geoip/IPSeeker.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" /> <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusCategoryDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusCategoryDao.java" />
...@@ -287,6 +278,10 @@ ...@@ -287,6 +278,10 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/spring-context.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -486,8 +481,9 @@ ...@@ -486,8 +481,9 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -958,15 +954,7 @@ ...@@ -958,15 +954,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="resources" /> <option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="report" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -991,6 +979,18 @@ ...@@ -991,6 +979,18 @@
<option name="myItemId" value="java" /> <option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ejweb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -1025,6 +1025,10 @@ ...@@ -1025,6 +1025,10 @@
<option name="myItemId" value="modules" /> <option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sys" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -1060,11 +1064,11 @@ ...@@ -1060,11 +1064,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="report" /> <option name="myItemId" value="sys" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="web" /> <option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -1106,7 +1110,7 @@ ...@@ -1106,7 +1110,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="service" /> <option name="myItemId" value="web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -1147,10 +1151,6 @@ ...@@ -1147,10 +1151,6 @@
<option name="myItemId" value="report" /> <option name="myItemId" value="report" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="entity" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -1190,7 +1190,7 @@ ...@@ -1190,7 +1190,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="dao" /> <option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -1252,7 +1252,6 @@ ...@@ -1252,7 +1252,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -1275,7 +1274,7 @@ ...@@ -1275,7 +1274,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555574142150" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555574142150" />
<property name="last_opened_file_path" value="G:/阜平智慧旅游扶贫大数据/fupin-bigdata/fupin-bigdata" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
...@@ -2242,7 +2241,13 @@ ...@@ -2242,7 +2241,13 @@
<workItem from="1563328228887" duration="2564000" /> <workItem from="1563328228887" duration="2564000" />
<workItem from="1563345395808" duration="16095000" /> <workItem from="1563345395808" duration="16095000" />
<workItem from="1563374178059" duration="1299000" /> <workItem from="1563374178059" duration="1299000" />
<workItem from="1563412553703" duration="14653000" /> <workItem from="1563412553703" duration="20469000" />
<workItem from="1563499567230" duration="4091000" />
<workItem from="1563517390868" duration="68000" />
<workItem from="1563518463039" duration="51000" />
<workItem from="1563530134402" duration="751000" />
<workItem from="1563758643287" duration="550000" />
<workItem from="1563776420096" duration="114000" />
</task> </task>
<task id="LOCAL-00069" summary="去掉对更新时间的修改,防止解决时间出错"> <task id="LOCAL-00069" summary="去掉对更新时间的修改,防止解决时间出错">
<created>1499152481830</created> <created>1499152481830</created>
...@@ -2591,7 +2596,7 @@ ...@@ -2591,7 +2596,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1046108000" /> <option name="totallyTimeSpent" value="1057549000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -2603,7 +2608,7 @@ ...@@ -2603,7 +2608,7 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1050" extended-state="7" /> <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -2618,9 +2623,8 @@ ...@@ -2618,9 +2623,8 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27426636" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27200902" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295711" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295711" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20316027" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
...@@ -2629,17 +2633,18 @@ ...@@ -2629,17 +2633,18 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30248308" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30248308" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295711" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295711" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18133047" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19742489" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299356" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299356" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20316027" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -2739,41 +2744,6 @@ ...@@ -2739,41 +2744,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportAttachmentEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusCategoryDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="3" column="36" lean-forward="false" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/Dict.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="49" column="17" lean-forward="false" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="20" column="28" lean-forward="false" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcRegionList.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcRegionList.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1404"> <state relative-caret-position="1404">
...@@ -2861,14 +2831,6 @@ ...@@ -2861,14 +2831,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13176">
<caret line="488" column="81" lean-forward="false" selection-start-line="488" selection-start-column="81" selection-end-line="488" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.2.RELEASE/spring-core-4.2.2.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.2.RELEASE/spring-core-4.2.2.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="170">
...@@ -2880,7 +2842,6 @@ ...@@ -2880,7 +2842,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1296"> <state relative-caret-position="1296">
<caret line="48" column="29" lean-forward="false" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" /> <caret line="48" column="29" lean-forward="false" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2902,7 +2863,6 @@ ...@@ -2902,7 +2863,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="154">
<caret line="54" column="58" lean-forward="false" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="58" /> <caret line="54" column="58" lean-forward="false" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="58" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2910,7 +2870,6 @@ ...@@ -2910,7 +2870,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="568"> <state relative-caret-position="568">
<caret line="54" column="45" lean-forward="false" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" /> <caret line="54" column="45" lean-forward="false" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2918,7 +2877,6 @@ ...@@ -2918,7 +2877,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-26"> <state relative-caret-position="-26">
<caret line="45" column="39" lean-forward="true" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" /> <caret line="45" column="39" lean-forward="true" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2926,7 +2884,6 @@ ...@@ -2926,7 +2884,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303"> <state relative-caret-position="303">
<caret line="135" column="70" lean-forward="false" selection-start-line="135" selection-start-column="70" selection-end-line="135" selection-end-column="70" /> <caret line="135" column="70" lean-forward="false" selection-start-line="135" selection-start-column="70" selection-end-line="135" selection-end-column="70" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2934,7 +2891,6 @@ ...@@ -2934,7 +2891,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1404"> <state relative-caret-position="1404">
<caret line="52" column="54" lean-forward="false" selection-start-line="52" selection-start-column="29" selection-end-line="52" selection-end-column="54" /> <caret line="52" column="54" lean-forward="false" selection-start-line="52" selection-start-column="29" selection-end-line="52" selection-end-column="54" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2942,28 +2898,6 @@ ...@@ -2942,28 +2898,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="270">
<caret line="14" column="25" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="25" /> <caret line="14" column="25" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="25" />
<folding>
<element signature="n#!!doc" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#634#635#0" expanded="false" />
<element signature="e#648#649#0" expanded="false" />
<element signature="e#682#683#0" expanded="false" />
<element signature="e#698#699#0" expanded="false" />
<element signature="e#784#785#0" expanded="false" />
<element signature="e#804#805#0" expanded="false" />
<element signature="e#845#846#0" expanded="false" />
<element signature="e#872#873#0" expanded="false" />
<element signature="e#959#960#0" expanded="false" />
<element signature="e#977#978#0" expanded="false" />
<element signature="e#1014#1015#0" expanded="false" />
<element signature="e#1037#1038#0" expanded="false" />
<element signature="e#1123#1124#0" expanded="false" />
<element signature="e#1142#1143#0" expanded="false" />
<element signature="e#1181#1182#0" expanded="false" />
<element signature="e#1206#1207#0" expanded="false" />
<element signature="e#1239#1240#0" expanded="false" />
<element signature="e#1262#1263#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2982,9 +2916,6 @@ ...@@ -2982,9 +2916,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5778"> <state relative-caret-position="5778">
<caret line="238" column="21" lean-forward="false" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" /> <caret line="238" column="21" lean-forward="false" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2999,7 +2930,6 @@ ...@@ -2999,7 +2930,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="73"> <state relative-caret-position="73">
<caret line="248" column="18" lean-forward="false" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" /> <caret line="248" column="18" lean-forward="false" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3007,7 +2937,6 @@ ...@@ -3007,7 +2937,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
<caret line="84" column="86" lean-forward="true" selection-start-line="84" selection-start-column="86" selection-end-line="84" selection-end-column="86" /> <caret line="84" column="86" lean-forward="true" selection-start-line="84" selection-start-column="86" selection-end-line="84" selection-end-column="86" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3015,9 +2944,6 @@ ...@@ -3015,9 +2944,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="174"> <state relative-caret-position="174">
<caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding>
<marker date="1517536968078" expanded="true" signature="320:557" ph="SELECT c.*, CT_BBTC_REPORT_NOTICE" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3070,28 +2996,6 @@ ...@@ -3070,28 +2996,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215"> <state relative-caret-position="215">
<caret line="112" column="26" lean-forward="true" selection-start-line="112" selection-start-column="26" selection-end-line="112" selection-end-column="26" /> <caret line="112" column="26" lean-forward="true" selection-start-line="112" selection-start-column="26" selection-end-line="112" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="349" column="7" lean-forward="true" selection-start-line="349" selection-start-column="7" selection-end-line="349" selection-end-column="7" />
<folding>
<element signature="e#36082#36083#0" expanded="true" />
<element signature="e#36135#36136#0" expanded="true" />
<element signature="e#36299#36300#0" expanded="true" />
<element signature="e#36359#36360#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="606" column="26" lean-forward="true" selection-start-line="606" selection-start-column="26" selection-end-line="606" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3099,31 +3003,20 @@ ...@@ -3099,31 +3003,20 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384"> <state relative-caret-position="384">
<caret line="25" column="69" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="25" selection-end-column="69" /> <caret line="25" column="69" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="25" selection-end-column="69" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="1269">
<caret line="47" column="55" lean-forward="false" selection-start-line="47" selection-start-column="42" selection-end-line="47" selection-end-column="55" /> <caret line="47" column="55" lean-forward="false" selection-start-line="47" selection-start-column="42" selection-end-line="47" selection-end-column="55" />
<folding>
<marker date="1563421489885" expanded="true" signature="533:670" ph="SELECT FROM ct_bbtc_bus_type" />
<marker date="1563421489885" expanded="true" signature="1368:1522" ph="SELECT FROM ct_bbtc_bus_type" />
<marker date="1563421489885" expanded="true" signature="1944:2085" ph="INSERT INTO ct_bbtc_bus_type... " />
<marker date="1563421489885" expanded="true" signature="2123:2244" ph="UPDATE ct_bb... " />
<marker date="1563421489885" expanded="true" signature="2282:2329" ph="DELETE FROM " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="459">
<caret line="25" column="22" lean-forward="false" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="22" /> <caret line="25" column="22" lean-forward="false" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3131,12 +3024,6 @@ ...@@ -3131,12 +3024,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="216">
<caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" /> <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
<folding>
<marker date="1563174029572" expanded="true" signature="525:674" ph="SELECT FROM ct_bbtc_bus_category" />
<marker date="1563174029572" expanded="true" signature="1756:1891" ph="INSERT INTO ct_bbtc_bus_category... " />
<marker date="1563174029572" expanded="true" signature="1929:2044" ph="UPDATE ct_bb... " />
<marker date="1563174029572" expanded="true" signature="2082:2133" ph="DELETE FROM " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3144,13 +3031,6 @@ ...@@ -3144,13 +3031,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243"> <state relative-caret-position="243">
<caret line="9" column="25" lean-forward="false" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" /> <caret line="9" column="25" lean-forward="false" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding>
<marker date="1563181206112" expanded="true" signature="529:662" ph="SELECT FROM ct_bbtc_region" />
<marker date="1563181206112" expanded="true" signature="731:881" ph="SELECT FROM ct_bbtc_region" />
<marker date="1563181206112" expanded="true" signature="1923:2062" ph="INSERT INTO ct_bbtc_region... " />
<marker date="1563181206112" expanded="true" signature="2100:2219" ph="UPDATE ct_bb... " />
<marker date="1563181206112" expanded="true" signature="2257:2302" ph="DELETE FROM " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3158,39 +3038,21 @@ ...@@ -3158,39 +3038,21 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="110">
<caret line="41" column="4" lean-forward="true" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" /> <caret line="41" column="4" lean-forward="true" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1528#1529#0" expanded="true" />
<element signature="e#1585#1586#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="351">
<caret line="23" column="42" lean-forward="false" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" /> <caret line="23" column="42" lean-forward="false" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" />
<folding>
<element signature="e#1167#1168#0" expanded="true" />
<element signature="e#1223#1224#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81"> <state relative-caret-position="1593">
<caret line="63" column="32" lean-forward="true" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" /> <caret line="63" column="32" lean-forward="false" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<folding> <folding />
<element signature="e#13898#13899#0" expanded="true" />
<element signature="e#13938#13939#0" expanded="true" />
<element signature="e#14010#14011#0" expanded="true" />
<element signature="e#14068#14069#0" expanded="true" />
<element signature="e#14118#14119#0" expanded="true" />
<element signature="e#14158#14159#0" expanded="true" />
<element signature="e#14231#14232#0" expanded="true" />
<element signature="e#14289#14290#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3198,9 +3060,6 @@ ...@@ -3198,9 +3060,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="505"> <state relative-caret-position="505">
<caret line="183" column="26" lean-forward="true" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" /> <caret line="183" column="26" lean-forward="true" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#7;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3208,18 +3067,6 @@ ...@@ -3208,18 +3067,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1517536968070" expanded="true" signature="2094:3124" ph="SELECT , rm.... " />
<marker date="1517536968070" expanded="true" signature="3194:3398" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="3470:3678" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="3752:4561" ph="SELECT , ro.... " />
<marker date="1517536968070" expanded="true" signature="4633:4969" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="5022:5750" ph="INSERT INTO ct_bbtc_sys_role... " />
<marker date="1517536968070" expanded="true" signature="5803:6217" ph="UPDATE ct_bb... " />
<marker date="1517536968070" expanded="true" signature="6278:6333" ph="DELETE FROM " />
<marker date="1517536968070" expanded="true" signature="6722:6779" ph="DELETE FROM " />
<marker date="1517536968070" expanded="true" signature="7170:7264" ph="UPDATE ct_bb... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -3233,16 +3080,84 @@ ...@@ -3233,16 +3080,84 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1428"> <state relative-caret-position="2187">
<caret line="105" column="35" lean-forward="true" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" /> <caret line="105" column="35" lean-forward="false" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring-mvc.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2970">
<caret line="110" column="29" lean-forward="false" selection-start-line="110" selection-start-column="29" selection-end-line="110" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring-context.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21303">
<caret line="829" column="34" lean-forward="false" selection-start-line="829" selection-start-column="34" selection-end-line="829" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="13" column="77" lean-forward="false" selection-start-line="13" selection-start-column="71" selection-end-line="13" selection-end-column="77" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://D:/java jdk/src.zip!/java/lang/Class.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1095">
<caret line="1972" column="20" lean-forward="false" selection-start-line="1972" selection-start-column="20" selection-end-line="1972" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/utils/excel/ExportExcel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10908">
<caret line="459" column="27" lean-forward="false" selection-start-line="459" selection-start-column="27" selection-end-line="459" selection-end-column="27" />
<folding>
<element signature="e#2551#2552#0" expanded="true" />
<element signature="e#2594#2595#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="773" column="22" lean-forward="true" selection-start-line="773" selection-start-column="22" selection-end-line="773" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="192">
<caret line="731" column="10" lean-forward="true" selection-start-line="731" selection-start-column="10" selection-end-line="731" selection-end-column="10" /> <caret line="692" column="47" lean-forward="true" selection-start-line="692" selection-start-column="47" selection-end-line="692" selection-end-column="47" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -900,7 +900,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -900,7 +900,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
/** /**
* 重新跟踪 * 重新跟踪
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
......
...@@ -757,7 +757,7 @@ public class ReportController extends BaseController { ...@@ -757,7 +757,7 @@ public class ReportController extends BaseController {
reportList = reportService.getReportList(reportEntity); reportList = reportService.getReportList(reportEntity);
} }
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose(); new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null; return null;
} catch (Exception e) { } catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败!失败信息:" + e.getMessage()); addMessage(redirectAttributes, "导出用户失败!失败信息:" + e.getMessage());
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:util="http://www.springframework.org/schema/util" xmlns:util="http://www.springframework.org/schema/util"
xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:util="http://www.springframework.org/schema/util" xmlns:util="http://www.springframework.org/schema/util"
xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment