Skip to content

S
sunac_report
Commit 9d319e6a by sunxin
Options

定时任务，线索定时转换

parent d8d5ce55
Showing with 708 additions and 226 deletions
.idea/workspace.xml
...@@ -10,11 +10,31 @@ ...@@ -10,11 +10,31 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="53177314-c31b-4a61-960c-eb18cd6b76b6" name="Default Changelist" 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/java/com/ejweb/modules/report/dao/ReportDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" 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/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/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/java/com/ejweb/modules/report/web/ReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" 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/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/webapp/WEB-INF/classes/com/ejweb/modules/front/upload/api/FrontUploadController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/front/upload/util/ReportAttachmentUtils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/dao/ReportDao.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/entity/ReportEntity.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/CtBbtcBusCategoryController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/CtBbtcBusTypeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/CtBbtcRegionController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportToPdfController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportToWordController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/workbench/service/WorkbenchService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/workbench/web/NoticeController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/workbench/web/WorkbenchController.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/report/ReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/report/ReportDao.xml" 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$/target/report_sunac.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac.war" 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/mappings/modules/report/ReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/report/ReportDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/report/reportList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/report/reportList.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/report/reportQyList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/report/reportQyList.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" />
...@@ -64,31 +84,117 @@ ...@@ -64,31 +84,117 @@
<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/reportTrack.jsp"> <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="228"> <state relative-caret-position="170">
<caret line="519" column="23" selection-start-line="519" selection-start-column="23" selection-end-line="519" selection-end-column="23" /> <caret line="923" column="18" selection-start-line="923" selection-start-column="18" selection-end-line="923" 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="false">
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190"> <state relative-caret-position="335">
<caret line="55" column="49" lean-forward="true" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" /> <caret line="1112" column="49" lean-forward="true" selection-start-line="1112" selection-start-column="49" selection-end-line="1112" selection-end-column="49" />
<folding> <folding>
<element signature="e#14934#14938#0" expanded="true" /> <marker date="1564392243567" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<element signature="e#14944#14948#0" expanded="true" /> <marker date="1564392243567" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564392243567" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564392243567" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564392243567" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564392243567" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564392243567" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564392243567" expanded="true" signature="22272:23182" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="23243:23333" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="23424:26353" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564392243567" expanded="true" signature="26452:26870" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564392243567" expanded="true" signature="26535:26612" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564392243567" expanded="true" signature="26700:26777" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564392243567" expanded="true" signature="26947:27065" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564392243567" expanded="true" signature="27145:27256" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564392243567" expanded="true" signature="27314:27804" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564392243567" expanded="true" signature="27865:28286" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="28406:28583" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564392243567" expanded="true" signature="28678:28937" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564392243567" expanded="true" signature="28989:29305" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564392243567" expanded="true" signature="29469:30556" ph="select repor... ct_bbtc_report" />
<marker date="1564392243567" expanded="true" signature="30720:31802" ph="select deal_... ct_bbtc_report" />
<marker date="1564392243567" expanded="true" signature="31947:33033" ph="select repor... ct_bbtc_report" />
<marker date="1564392243567" expanded="true" signature="36413:39079" ph="SELECT * FRO... id" />
<marker date="1564392243567" expanded="true" signature="36436:38956" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564392243567" expanded="true" signature="39277:41207" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564392243567" expanded="true" signature="41268:41483" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="41562:41631" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564392243567" expanded="true" signature="41691:41775" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="41834:42160" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="42224:42301" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="42365:42442" ph="UPDATE ct_bb... " />
<marker date="1564392243567" expanded="true" signature="43748:43799" ph="delete from " />
<marker date="1564392243567" expanded="true" signature="43854:43919" ph="delete from " />
<marker date="1564392243567" expanded="true" signature="44035:44136" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564392243567" expanded="true" signature="44213:44329" ph="SELECT id AS... " />
</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$/report_sunac.iml"> <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="-1995" /> <state relative-caret-position="113">
<caret line="90" column="34" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<folding>
<element signature="imports" 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/sys/utils/UserUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="101">
<caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="145" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188">
<caret line="410" column="16" selection-start-line="410" selection-start-column="16" selection-end-line="410" selection-end-column="16" />
<folding>
<element signature="e#2936#2937#0" expanded="true" />
<element signature="e#2968#2969#0" expanded="true" />
<element signature="e#3016#3017#0" expanded="true" />
<element signature="e#3058#3059#0" expanded="true" />
<element signature="e#10727#10728#0" expanded="true" />
<element signature="e#10785#10786#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="480">
<caret line="274" column="53" lean-forward="true" selection-start-line="274" selection-start-column="53" selection-end-line="274" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="108">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
...@@ -104,19 +210,9 @@ ...@@ -104,19 +210,9 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>集合</find>
<find>getBusCategory</find>
<find>send</find>
<find>export</find>
<find>getBusCategoryList</find>
<find>supplementAreaDiv</find>
<find>supplementArea</find>
<find>reportEntity</find>
<find>exch</find>
<find>reportTime</find> <find>reportTime</find>
<find>reportD</find> <find>reportD</find>
<find>业务</find> <find>业务</find>
<find>save</find>
<find>dealR</find> <find>dealR</find>
<find>setExchangeAfterUser</find> <find>setExchangeAfterUser</find>
<find>saveR</find> <find>saveR</find>
...@@ -124,7 +220,6 @@ ...@@ -124,7 +220,6 @@
<find>isadmin</find> <find>isadmin</find>
<find>isAdmin</find> <find>isAdmin</find>
<find>createBy</find> <find>createBy</find>
<find>reportDao</find>
<find>transferDepartmentid</find> <find>transferDepartmentid</find>
<find>transferDepartment</find> <find>transferDepartment</find>
<find>area</find> <find>area</find>
...@@ -134,6 +229,17 @@ ...@@ -134,6 +229,17 @@
<find>移交部门</find> <find>移交部门</find>
<find>list</find> <find>list</find>
<find>getR</find> <find>getR</find>
<find>transferGroup</find>
<find>findP</find>
<find>reportDao</find>
<find>findLi</find>
<find>trans</find>
<find>addTra</find>
<find>task</find>
<find>save</find>
<find>add</find>
<find>saveTr</find>
<find>addR</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>${db.table.prefix}</replace> <replace>${db.table.prefix}</replace>
...@@ -160,7 +266,6 @@ ...@@ -160,7 +266,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java" />
<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/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/core/geoip/IPSeeker.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/geoip/IPSeeker.java" />
...@@ -180,7 +285,6 @@ ...@@ -180,7 +285,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusTypeService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusTypeService.java" />
<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" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusCategoryService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/CtBbtcBusCategoryService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/TimerTask.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/TimerTask.java" />
...@@ -190,7 +294,6 @@ ...@@ -190,7 +294,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.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/web/CtBbtcRegionController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml" />
...@@ -199,18 +302,21 @@ ...@@ -199,18 +302,21 @@
<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/ctBbtcBusCategoryForm.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.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/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/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/java/com/ejweb/modules/report/web/ReportController.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" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.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/service/ReportService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -255,7 +361,7 @@ ...@@ -255,7 +361,7 @@
<select /> <select />
</treeState> </treeState>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-10" /> <option name="x" value="-10" />
<option name="y" value="-10" /> <option name="y" value="-10" />
<option name="width" value="1940" /> <option name="width" value="1940" />
...@@ -385,6 +491,126 @@ ...@@ -385,6 +491,126 @@
<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="sys" 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="sys" 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="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>
...@@ -424,12 +650,15 @@ ...@@ -424,12 +650,15 @@
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<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" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" /> <property name="settings.editor.selected.configurable" value="vcs.Git" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" /> <recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" /> <recent name="D:\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\ideaProjects\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.ejweb.conf" /> <recent name="com.ejweb.conf" />
...@@ -437,12 +666,9 @@ ...@@ -437,12 +666,9 @@
<recent name="com.ejweb.core.filter" /> <recent name="com.ejweb.core.filter" />
<recent name="com.ejweb.core.base" /> <recent name="com.ejweb.core.base" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" /> <recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\lib" /> <recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
<recent name="D:\ideaProjects\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
</key> </key>
</component> </component>
<component name="RunAnythingCache"> <component name="RunAnythingCache">
...@@ -1174,13 +1400,6 @@ ...@@ -1174,13 +1400,6 @@
<workItem from="1564112769708" duration="9809000" /> <workItem from="1564112769708" duration="9809000" />
<workItem from="1564130831369" duration="2599000" /> <workItem from="1564130831369" duration="2599000" />
</task> </task>
<task id="LOCAL-00073" summary="按老金给的配置替换">
<created>1499320715260</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1499320715261</updated>
</task>
<task id="LOCAL-00074" summary="登录失效后跳回到融创页面"> <task id="LOCAL-00074" summary="登录失效后跳回到融创页面">
<created>1499418887249</created> <created>1499418887249</created>
<option name="number" value="00074" /> <option name="number" value="00074" />
...@@ -1517,11 +1736,18 @@ ...@@ -1517,11 +1736,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1564124494373</updated> <updated>1564124494373</updated>
</task> </task>
<option name="localTasksCounter" value="122" /> <task id="LOCAL-00122" summary="人员管理修改区域二级显示 页面修整">
<created>1564372368400</created>
<option name="number" value="00122" />
<option name="presentableId" value="LOCAL-00122" />
<option name="project" value="LOCAL" />
<updated>1564372368401</updated>
</task>
<option name="localTasksCounter" value="123" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1211574000" /> <option name="totallyTimeSpent" value="1229597000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1547,13 +1773,13 @@ ...@@ -1547,13 +1773,13 @@
<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 active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.45014662" /> <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.23900293" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.51900584" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.2947214" />
<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.48680353" />
<window_info anchor="bottom" id="Messages" order="8" weight="0.20175439" /> <window_info anchor="bottom" id="Messages" order="8" weight="0.20087977" />
<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.14222874" /> <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" />
...@@ -1731,6 +1957,18 @@ ...@@ -1731,6 +1957,18 @@
<properties /> <properties />
<option name="timeStamp" value="159" /> <option name="timeStamp" value="159" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java</url>
<line>72</line>
<properties />
<option name="timeStamp" value="161" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java</url>
<line>117</line>
<properties />
<option name="timeStamp" value="162" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
<watches-manager> <watches-manager>
...@@ -1745,55 +1983,6 @@ ...@@ -1745,55 +1983,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/core/utils/excel/annotation/ExcelField.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="37" column="26" lean-forward="true" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="26" />
</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="305">
<caret line="98" column="36" lean-forward="true" selection-start-line="98" selection-start-column="36" selection-end-line="98" selection-end-column="36" />
<folding>
<element signature="e#2551#2552#0" expanded="true" />
<element signature="e#2594#2595#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/util/HashMap.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="554" column="13" selection-start-line="554" selection-start-column="13" selection-end-line="554" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="23" column="25" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="25" />
<folding>
<element signature="e#1772#1773#0" expanded="true" />
<element signature="e#1810#1811#0" expanded="true" />
<element signature="e#1872#1873#0" expanded="true" />
<element signature="e#1926#1927#0" expanded="true" />
<element signature="e#5575#5576#0" expanded="true" />
<element signature="e#5602#5603#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/RemindTask.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportQuartz.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="26">
<caret line="94" column="38" lean-forward="true" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
...@@ -2041,213 +2230,264 @@ ...@@ -2041,213 +2230,264 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/UserUtils.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171"> <state relative-caret-position="4788">
<caret line="132" column="23" selection-start-line="132" selection-start-column="23" selection-end-line="132" selection-end-column="23" /> <caret line="252" column="14" selection-start-line="252" selection-start-column="14" selection-end-line="252" selection-end-column="14" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/DataEntity.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190"> <state relative-caret-position="-94">
<caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" /> <caret line="422" column="8" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="47" column="35" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="35" />
<folding> <folding>
<element signature="e#2104#2105#0" expanded="true" /> <element signature="e#1914#1915#0" expanded="true" />
<element signature="e#2135#2136#0" expanded="true" /> <element signature="e#1945#1946#0" expanded="true" />
<element signature="e#1993#1994#0" expanded="true" />
<element signature="e#2033#2034#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp"> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4788"> <state relative-caret-position="103">
<caret line="252" column="14" selection-start-line="252" selection-start-column="14" selection-end-line="252" selection-end-column="14" /> <caret line="77" column="16" lean-forward="true" selection-start-line="77" selection-start-column="16" selection-end-line="77" selection-end-column="16" />
</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/sys/userList.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="94">
<caret line="519" column="23" selection-start-line="519" selection-start-column="23" selection-end-line="519" selection-end-column="23" /> <caret line="71" column="37" lean-forward="true" selection-start-line="71" selection-start-column="37" selection-end-line="71" selection-end-column="37" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152"> <state relative-caret-position="94">
<caret line="417" column="55" selection-start-line="417" selection-start-column="55" selection-end-line="417" selection-end-column="55" /> <caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp"> <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="-94"> <state relative-caret-position="128">
<caret line="422" column="8" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="8" /> <caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.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="265"> <state relative-caret-position="171">
<caret line="90" column="33" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="33" /> <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="e#13929#13933#0" expanded="true" />
<element signature="e#13939#13943#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.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="333"> <state relative-caret-position="-1995" />
<caret line="47" column="35" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="35" /> </provider>
</entry>
<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="152">
<caret line="36" column="38" lean-forward="true" selection-start-line="36" selection-start-column="38" selection-end-line="36" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="72" selection-start-line="72" selection-end-line="72" />
<folding> <folding>
<element signature="e#1914#1915#0" expanded="true" /> <element signature="e#1510#1511#0" expanded="true" />
<element signature="e#1945#1946#0" expanded="true" /> <element signature="e#1553#1554#0" expanded="true" />
<element signature="e#1993#1994#0" expanded="true" />
<element signature="e#2033#2034#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103"> <state relative-caret-position="30">
<caret line="77" column="16" lean-forward="true" selection-start-line="77" selection-start-column="16" selection-end-line="77" selection-end-column="16" /> <caret line="466" column="9" lean-forward="true" selection-start-line="466" selection-start-column="9" selection-end-line="466" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.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="140"> <state relative-caret-position="-3458">
<caret line="64" column="43" lean-forward="true" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" /> <caret line="469" lean-forward="true" selection-start-line="469" selection-end-line="469" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.2.2.RELEASE/spring-context-4.2.2.RELEASE.jar!/org/springframework/scheduling/annotation/Scheduled.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94"> <state relative-caret-position="171">
<caret line="71" column="37" lean-forward="true" selection-start-line="71" selection-start-column="37" selection-end-line="71" selection-end-column="37" /> <caret line="10" column="18" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.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="94"> <state relative-caret-position="-1330">
<caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" /> <caret line="517" column="47" lean-forward="true" selection-start-line="517" selection-start-column="47" selection-end-line="517" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring-context.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="-1311">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" /> <caret line="9" column="14" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/DataEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="52" column="50" lean-forward="true" selection-start-line="52" selection-start-column="50" selection-end-line="52" selection-end-column="50" />
<folding>
<element signature="e#2104#2105#0" expanded="true" />
<element signature="e#2135#2136#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/dao/ReportNoticeMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="61">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434"> <state relative-caret-position="480">
<caret line="266" column="30" selection-start-line="266" selection-start-column="30" selection-end-line="266" selection-end-column="30" /> <caret line="274" column="53" lean-forward="true" selection-start-line="274" selection-start-column="53" selection-end-line="274" selection-end-column="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247"> <state relative-caret-position="335">
<caret line="1093" column="23" lean-forward="true" selection-start-line="1093" selection-start-column="23" selection-end-line="1093" selection-end-column="23" /> <caret line="1112" column="49" lean-forward="true" selection-start-line="1112" selection-start-column="49" selection-end-line="1112" selection-end-column="49" />
<folding> <folding>
<marker date="1564133039874" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " /> <marker date="1564392243567" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " /> <marker date="1564392243567" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " /> <marker date="1564392243567" 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="1564392243567" 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="1564392243567" 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="1564392243567" 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="1564392243567" 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="1564392243567" expanded="true" signature="22272:23182" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23154:23244" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="23243:23333" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23335:26264" ph="SELECT su.id... ct_bbtc_sys_user" /> <marker date="1564392243567" expanded="true" signature="23424:26353" 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="1564392243567" expanded="true" signature="26452:26870" 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="1564392243567" expanded="true" signature="26535:26612" 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="1564392243567" expanded="true" signature="26700:26777" 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="1564392243567" expanded="true" signature="26947:27065" 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="1564392243567" expanded="true" signature="27145:27256" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564133039874" expanded="true" signature="27225:27715" ph="INSERT INTO ct_bbtc_report_notice... " /> <marker date="1564392243567" expanded="true" signature="27314:27804" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564133039874" expanded="true" signature="27776:28197" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="27865:28286" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="28317:28494" ph="SELECT * FRO... ct_bbtc_report_notice" /> <marker date="1564392243567" expanded="true" signature="28406:28583" 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="1564392243567" expanded="true" signature="28678:28937" 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="1564392243567" expanded="true" signature="28989:29305" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564133039874" expanded="true" signature="29380:30467" ph="select repor... ct_bbtc_report" /> <marker date="1564392243567" expanded="true" signature="29469:30556" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="30631:31713" ph="select deal_... ct_bbtc_report" /> <marker date="1564392243567" expanded="true" signature="30720:31802" ph="select deal_... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="31858:32944" ph="select repor... ct_bbtc_report" /> <marker date="1564392243567" expanded="true" signature="31947:33033" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="36324:38990" ph="SELECT * FRO... id" /> <marker date="1564392243567" expanded="true" signature="36413:39079" ph="SELECT * FRO... id" />
<marker date="1564133039874" expanded="true" signature="36347:38867" ph="SELECT r.id ct_bbtc_report" /> <marker date="1564392243567" expanded="true" signature="36436:38956" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="39188:41118" ph="SELECT r.id ct_bbtc_report" /> <marker date="1564392243567" expanded="true" signature="39277:41207" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="41179:41394" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="41268:41483" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41473:41542" ph="SELECT c.EXC... CT_BBTC_REPORT" /> <marker date="1564392243567" expanded="true" signature="41562:41631" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564133039874" expanded="true" signature="41602:41686" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="41691:41775" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41745:42071" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="41834:42160" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42135:42212" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="42224:42301" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42276:42353" ph="UPDATE ct_bb... " /> <marker date="1564392243567" expanded="true" signature="42365:42442" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="43659:43710" ph="delete from " /> <marker date="1564392243567" expanded="true" signature="43748:43799" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43765:43830" ph="delete from " /> <marker date="1564392243567" expanded="true" signature="43854:43919" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43946:44047" ph="SELECT su.na... ct_bbtc_sys_user" /> <marker date="1564392243567" expanded="true" signature="44035:44136" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="44124:44240" ph="SELECT id AS... " /> <marker date="1564392243567" expanded="true" signature="44213:44329" ph="SELECT id AS... " />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java">
<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="262">
<caret line="276" lean-forward="true" selection-start-line="247" selection-start-column="5" selection-end-line="276" /> <caret line="128" column="26" lean-forward="true" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68"> <state relative-caret-position="52">
<caret line="234" column="18" selection-start-line="234" selection-start-column="18" selection-end-line="234" selection-end-column="18" /> <caret line="144" column="16" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
</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/workbench/service/WorkbenchService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177"> <state relative-caret-position="100">
<caret line="34" column="37" selection-start-line="34" selection-start-column="19" selection-end-line="34" selection-end-column="37" /> <caret line="99" selection-start-line="99" selection-end-line="99" />
<folding>
<element signature="e#2877#2878#0" expanded="true" />
<element signature="e#2913#2914#0" expanded="true" />
<element signature="e#2971#2972#0" expanded="true" />
<element signature="e#3021#3022#0" expanded="true" />
<element signature="e#3123#3124#0" expanded="true" />
<element signature="e#3157#3158#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </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="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="128"> <state relative-caret-position="170">
<caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" /> <caret line="923" column="18" selection-start-line="923" selection-start-column="18" selection-end-line="923" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.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="74"> <state relative-caret-position="188">
<caret line="72" selection-start-line="72" selection-end-line="72" /> <caret line="410" column="16" selection-start-line="410" selection-start-column="16" selection-end-line="410" selection-end-column="16" />
<folding> <folding>
<element signature="e#1510#1511#0" expanded="true" /> <element signature="e#2936#2937#0" expanded="true" />
<element signature="e#1553#1554#0" expanded="true" /> <element signature="e#2968#2969#0" expanded="true" />
<element signature="e#3016#3017#0" expanded="true" />
<element signature="e#3058#3059#0" expanded="true" />
<element signature="e#10727#10728#0" expanded="true" />
<element signature="e#10785#10786#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.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="82"> <state relative-caret-position="113">
<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="90" column="34" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/UserUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="101">
<caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="145" selection-end-column="7" />
</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="108">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
...@@ -265,4 +265,12 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -265,4 +265,12 @@ public interface ReportDao extends CrudDao<ReportEntity> {
* @return * @return
*/ */
public List<ReportEntity> findListByCheck(ReportEntity entity); public List<ReportEntity> findListByCheck(ReportEntity entity);
/**
* 跟据当前时间查询已到期的举报信息,将过期信息状态设置无效
* @param entity
* @return
*/
void updateReportByClueTime(ReportEntity entity);
} }
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -5,6 +5,7 @@ import com.ejweb.core.persistence.DataEntity; ...@@ -5,6 +5,7 @@ import com.ejweb.core.persistence.DataEntity;
import com.ejweb.core.utils.excel.annotation.ExcelField; import com.ejweb.core.utils.excel.annotation.ExcelField;
import com.ejweb.modules.sys.entity.User; import com.ejweb.modules.sys.entity.User;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -68,6 +69,15 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -68,6 +69,15 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementCategory; //业务类别 private String supplementCategory; //业务类别
private CtBbtcRegion supplementAreaNew; //被举报区域 private CtBbtcRegion supplementAreaNew; //被举报区域
private CtBbtcBusType supplementTypeNew;//业务类型 private CtBbtcBusType supplementTypeNew;//业务类型
private Date transTime; //转为线索的时间
public Date getTransTime() {
return transTime;
}
public void setTransTime(Date transTime) {
this.transTime = transTime;
}
public String getTransferGroup() { public String getTransferGroup() {
return transferGroup; return transferGroup;
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -160,6 +160,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -160,6 +160,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
reportEntity.setExchangeType("1"); reportEntity.setExchangeType("1");
reportEntity.setExchangeAfterUser(transferUser); reportEntity.setExchangeAfterUser(transferUser);
} }
/*判断处理结论是否为转为线索*/
if(reportEntity.getDealResult().equals("7")){
Date transTime =new Date(); /* transTime 转为线索的时间 */
reportEntity.setTransTime(transTime);
System.out.println("转为线索时间："+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(transTime));
}
dao.addTrack(reportEntity); dao.addTrack(reportEntity);
if (StringUtils.isNotBlank(reportEntity.getSupplementAttachment())) { if (StringUtils.isNotBlank(reportEntity.getSupplementAttachment())) {
......
src/main/java/com/ejweb/modules/report/utils/TimedTask.java
package com.ejweb.modules.report.utils; package com.ejweb.modules.report.utils;
import com.ejweb.modules.front.report.dao.FrontReportDao;
import com.ejweb.modules.report.dao.ReportDao;
import com.ejweb.modules.report.entity.ReportEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/** /**
* Created by haoqm on 2019/7/18. * Created by haoqm on 2019/7/18.
*/ */
...@@ -11,10 +19,24 @@ import org.springframework.stereotype.Service; ...@@ -11,10 +19,24 @@ import org.springframework.stereotype.Service;
@Lazy(false) @Lazy(false)
public class TimedTask { public class TimedTask {
@Scheduled(cron="0 0 0 * * ?") //每天晚上12点执行 @Autowired
private ReportDao reportDao;
@Scheduled(cron="0 0 12 * * ?") //cron表达式 每天下午6点执行
public void job1() { public void job1() {
System.out.println("spring task 注解使用。。。任务进行中(每天12点触发)");
//获取所有转为线索的举报信息 //获取所有转为线索的举报信息
ReportEntity reportEntity=new ReportEntity();
Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, -3); // 当前日期减三个月
/* c.add(Calendar.MINUTE, -25); // 当前日期减去25分钟*/
reportEntity.setTransTime(c.getTime());
try{
/*跟据三个月前的过期时间查询并修改举报信息*/
reportDao.updateReportByClueTime(reportEntity);
System.out.println("线索状态改变成功");
}catch (Exception e){
System.out.println("线索状态改变失败");
}
} }
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -97,7 +97,7 @@ public class ReportController extends BaseController { ...@@ -97,7 +97,7 @@ public class ReportController extends BaseController {
reportEntity.setReportStatus("0"); reportEntity.setReportStatus("0");
} }
} else { } else {
if (flag.equals("4")) { if (flag.equals("1")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) { if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setDealResult("7"); reportEntity.setDealResult("7");
reportEntity.setFlage("1"); reportEntity.setFlage("1");
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -549,6 +549,9 @@ ...@@ -549,6 +549,9 @@
update_date = #{updateDate}, update_date = #{updateDate},
supplement_group=#{supplementGroup}, supplement_group=#{supplementGroup},
supplement_category=#{supplementCategory} supplement_category=#{supplementCategory}
<if test="transTime != null ">
,transTime=#{transTime}
</if>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
...@@ -1103,5 +1106,11 @@ ...@@ -1103,5 +1106,11 @@
where del_flag = 0 where del_flag = 0
</select> </select>
<update id="updateReportByClueTime" parameterType="ReportEntity" >
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result='2'
WHERE DATE(transTime) &lt;= #{transTime}
</update>
</mapper> </mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/mappings/modules/report/ReportDao.xml
...@@ -172,6 +172,18 @@ ...@@ -172,6 +172,18 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
...@@ -230,6 +242,16 @@ ...@@ -230,6 +242,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
</where> </where>
</select> </select>
...@@ -353,6 +375,16 @@ ...@@ -353,6 +375,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
...@@ -517,6 +549,9 @@ ...@@ -517,6 +549,9 @@
update_date = #{updateDate}, update_date = #{updateDate},
supplement_group=#{supplementGroup}, supplement_group=#{supplementGroup},
supplement_category=#{supplementCategory} supplement_category=#{supplementCategory}
<if test="transTime != null ">
,transTime=#{transTime}
</if>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
...@@ -1071,5 +1106,11 @@ ...@@ -1071,5 +1106,11 @@
where del_flag = 0 where del_flag = 0
</select> </select>
<update id="updateReportByClueTime" parameterType="ReportEntity" >
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result='2'
WHERE DATE(transTime) &lt;= #{transTime}
</update>
</mapper> </mapper>
\ No newline at end of file
target/report_sunac.war
No preview for this file type
target/report_sunac/WEB-INF/classes/mappings/modules/report/ReportDao.xml
...@@ -172,6 +172,18 @@ ...@@ -172,6 +172,18 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
...@@ -230,6 +242,16 @@ ...@@ -230,6 +242,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
</where> </where>
</select> </select>
...@@ -353,6 +375,16 @@ ...@@ -353,6 +375,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
...@@ -517,6 +549,9 @@ ...@@ -517,6 +549,9 @@
update_date = #{updateDate}, update_date = #{updateDate},
supplement_group=#{supplementGroup}, supplement_group=#{supplementGroup},
supplement_category=#{supplementCategory} supplement_category=#{supplementCategory}
<if test="transTime != null ">
,transTime=#{transTime}
</if>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
...@@ -1071,5 +1106,11 @@ ...@@ -1071,5 +1106,11 @@
where del_flag = 0 where del_flag = 0
</select> </select>
<update id="updateReportByClueTime" parameterType="ReportEntity" >
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result='2'
WHERE DATE(transTime) &lt;= #{transTime}
</update>
</mapper> </mapper>
\ No newline at end of file
target/report_sunac/WEB-INF/views/modules/report/reportList.jsp
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
slsb.append(new Option(data1[i].name,data1[i].id)); slsb.append(new Option(data1[i].name,data1[i].id));
} }
} }
var selectNode = $("#supplementType"); var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
...@@ -200,6 +201,7 @@ ...@@ -200,6 +201,7 @@
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].name,data2[i].id));
} }
} }
},error:function(data){ },error:function(data){
alert("系统错误"); alert("系统错误");
} }
...@@ -243,6 +245,36 @@ ...@@ -243,6 +245,36 @@
} }
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
} }
...@@ -417,6 +449,25 @@ ...@@ -417,6 +449,25 @@
</form:select> </form:select>
</li> </li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small"> <li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value=" ">请选择</form:option> <form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
...@@ -496,7 +547,7 @@ ...@@ -496,7 +547,7 @@
<th>举报时间</th> <th>举报时间</th>
<th>状态</th> <th>状态</th>
<th>处理结论</th> <th>处理结论</th>
<th>移交部门</th> <th><%--<td>移交集团</td><td>移交部门</td>--%>移交部门</th>
<th>处理人</th> <th>处理人</th>
<c:if test="${isAdmin eq '1'||isAdmin eq '2'}"> <c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
<th>移交给</th> <th>移交给</th>
...@@ -508,6 +559,7 @@ ...@@ -508,6 +559,7 @@
<th>邮件发送</th> <th>邮件发送</th>
<th style="width:10%">操作</th> <th style="width:10%">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:if test="${page.list.size()>0}"> <c:if test="${page.list.size()>0}">
......
target/report_sunac/WEB-INF/views/modules/report/reportQyList.jsp
...@@ -248,6 +248,37 @@ ...@@ -248,6 +248,37 @@
} }
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
} }
...@@ -416,7 +447,24 @@ ...@@ -416,7 +447,24 @@
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select> </form:select>
</li> </li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small"> <li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
......
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