Skip to content

S
sunac_report
Commit d8d5ce55 by sunxin
Options

人员管理修改区域二级显示 页面修整

parent 90c0afdf
Showing with 48 additions and 267 deletions
.idea/workspace.xml
...@@ -8,17 +8,13 @@ ...@@ -8,17 +8,13 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="人员管理修改区域二级显示 页面修整"> <list default="true" id="53177314-c31b-4a61-960c-eb18cd6b76b6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/spring-context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/spring-context.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/report_sunac.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac.war" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userList.jsp" afterDir="false" />
</list> </list>
<ignored path="it-faq-manage.iws" /> <ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -65,119 +61,34 @@ ...@@ -65,119 +61,34 @@
<option name="hideWarnings" value="true" /> <option name="hideWarnings" value="true" />
<option name="HIDE_WARNINGS" value="true" /> <option name="HIDE_WARNINGS" value="true" />
</component> </component>
<component name="FavoritesManager">
<favorites_list name="it-faq-manage" />
</component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.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="228">
<caret line="276" lean-forward="true" selection-start-line="247" selection-start-column="5" selection-end-line="276" /> <caret line="519" column="23" selection-start-line="519" selection-start-column="23" selection-end-line="519" selection-end-column="23" />
<folding>
<element signature="n#style#0;n#th#21;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="68">
<caret line="234" column="18" selection-start-line="234" selection-start-column="18" selection-end-line="234" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java"> <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="82"> <state relative-caret-position="190">
<caret line="119" column="63" lean-forward="true" selection-start-line="119" selection-start-column="63" selection-end-line="119" selection-end-column="63" /> <caret line="55" column="49" lean-forward="true" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#14934#14938#0" expanded="true" />
<element signature="e#14944#14948#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java"> <entry file="file://$PROJECT_DIR$/report_sunac.iml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74"> <state relative-caret-position="-1995" />
<caret line="72" selection-start-line="72" selection-end-line="72" />
<folding>
<element signature="e#1510#1511#0" expanded="true" />
<element signature="e#1553#1554#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="266" column="30" selection-start-line="266" selection-start-column="30" selection-end-line="266" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="1093" column="23" lean-forward="true" selection-start-line="1093" selection-start-column="23" selection-end-line="1093" selection-end-column="23" />
<folding>
<marker date="1564133039874" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564133039874" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564133039874" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564133039874" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564133039874" expanded="true" signature="22272:23093" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23154:23244" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23335:26264" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="26363:26781" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26446:26523" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26611:26688" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26858:26976" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="27056:27167" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564133039874" expanded="true" signature="27225:27715" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564133039874" expanded="true" signature="27776:28197" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="28317:28494" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564133039874" expanded="true" signature="28589:28848" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="28900:29216" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564133039874" expanded="true" signature="29380:30467" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="30631:31713" ph="select deal_... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="31858:32944" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="36324:38990" ph="SELECT * FRO... id" />
<marker date="1564133039874" expanded="true" signature="36347:38867" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="39188:41118" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="41179:41394" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41473:41542" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564133039874" expanded="true" signature="41602:41686" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41745:42071" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42135:42212" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42276:42353" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="43659:43710" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43765:43830" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43946:44047" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="44124:44240" ph="SELECT id AS... " />
</folding>
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
...@@ -329,7 +240,16 @@ ...@@ -329,7 +240,16 @@
<expand> <expand>
<path> <path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" /> <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="report_sunac Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="report_sunac Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" /> <item name="report_sunac Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -457,6 +377,7 @@ ...@@ -457,6 +377,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -464,160 +385,10 @@ ...@@ -464,160 +385,10 @@
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
</component> </component>
...@@ -1750,7 +1521,7 @@ ...@@ -1750,7 +1521,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1211217000" /> <option name="totallyTimeSpent" value="1211574000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1762,10 +1533,10 @@ ...@@ -1762,10 +1533,10 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1552" height="840" extended-state="0" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.32551908" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info id="Structure" order="1" weight="0.25" /> <window_info id="Structure" order="1" weight="0.25" />
<window_info id="Nl-Palette" order="2" /> <window_info id="Nl-Palette" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
...@@ -1776,15 +1547,15 @@ ...@@ -1776,15 +1547,15 @@
<window_info id="Capture Tool" order="8" /> <window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32894737" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32894737" />
<window_info anchor="bottom" id="Run" order="2" weight="0.37719297" /> <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.45014662" />
<window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.51900584" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.51900584" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.3295711" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.3295711" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5003349" side_tool="true" weight="0.4868421" /> <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5003349" side_tool="true" weight="0.4868421" />
<window_info anchor="bottom" id="Messages" order="8" weight="0.20175439" /> <window_info anchor="bottom" id="Messages" order="8" weight="0.20175439" />
<window_info anchor="bottom" id="Java Enterprise" order="9" /> <window_info anchor="bottom" id="Java Enterprise" order="9" />
<window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.4996651" weight="0.14327486" /> <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.4996651" weight="0.14222874" />
<window_info anchor="bottom" id="Spring" order="11" /> <window_info anchor="bottom" id="Spring" order="11" />
<window_info anchor="bottom" id="Terminal" order="12" weight="0.3295711" /> <window_info anchor="bottom" id="Terminal" order="12" weight="0.3295711" />
<window_info anchor="bottom" id="Application Servers" order="13" /> <window_info anchor="bottom" id="Application Servers" order="13" />
...@@ -1801,7 +1572,7 @@ ...@@ -1801,7 +1572,7 @@
<window_info anchor="right" id="Bean Validation" order="8" weight="0.3299356" /> <window_info anchor="right" id="Bean Validation" order="8" weight="0.3299356" />
<window_info anchor="right" id="Theme Preview" order="9" /> <window_info anchor="right" id="Theme Preview" order="9" />
<window_info anchor="right" id="Maven Projects" order="10" weight="0.3299356" /> <window_info anchor="right" id="Maven Projects" order="10" weight="0.3299356" />
<window_info anchor="right" id="Maven" order="11" weight="0.32953784" /> <window_info anchor="right" id="Maven" order="11" weight="0.19034852" />
<window_info anchor="right" id="JSON Utils" order="12" /> <window_info anchor="right" id="JSON Utils" order="12" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
...@@ -1848,6 +1619,16 @@ ...@@ -1848,6 +1619,16 @@
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
...@@ -2287,8 +2068,8 @@ ...@@ -2287,8 +2068,8 @@
</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="129"> <state relative-caret-position="228">
<caret line="1065" column="36" selection-start-line="1065" selection-start-column="36" selection-end-line="1065" selection-end-column="36" /> <caret line="519" column="23" selection-start-line="519" selection-start-column="23" selection-end-line="519" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/main/java/com/ejweb/modules/report/utils/TimedTask.java
...@@ -13,7 +13,7 @@ public class TimedTask { ...@@ -13,7 +13,7 @@ public class TimedTask {
@Scheduled(cron="0 0 0 * * ?") //每天晚上12点执行 @Scheduled(cron="0 0 0 * * ?") //每天晚上12点执行
public void job1() { public void job1() {
System.out.println("spring task 注解使用。。。任务进行中(每天下午6点触发)"); System.out.println("spring task 注解使用。。。任务进行中(每天12点触发)");
//获取所有转为线索的举报信息 //获取所有转为线索的举报信息
......
src/main/webapp/WEB-INF/classes/spring-context.xml
...@@ -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
......
target/report_sunac.war
No preview for this file type
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