Skip to content

S
sunac_report
Commit a969996e by sunxin
Options

定时任务，时间优化，精确到天数

parent 9d319e6a
Showing with 160 additions and 260 deletions
.idea/workspace.xml
......@@ -10,31 +10,13 @@
<component name="ChangeListManager">
<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$/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/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/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/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" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/dao/ReportDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/dao/ReportDao.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/entity/ReportEntity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/entity/ReportEntity.class" 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/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -83,114 +65,76 @@
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="923" column="18" selection-start-line="923" selection-start-column="18" selection-end-line="923" selection-end-column="18" />
</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="335">
<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>
<marker date="1564392243567" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<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>
<state relative-caret-position="68">
<caret line="161" column="9" lean-forward="true" selection-start-line="161" selection-start-column="9" selection-end-line="161" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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">
<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="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 relative-caret-position="219">
<caret line="62" column="18" lean-forward="true" selection-start-line="62" selection-start-column="18" selection-end-line="62" selection-end-column="18" />
</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">
<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="188">
<caret line="410" column="16" selection-start-line="410" selection-start-column="16" selection-end-line="410" selection-end-column="16" />
<state relative-caret-position="444">
<caret line="1111" column="23" lean-forward="true" selection-start-line="1111" selection-start-column="23" selection-end-line="1111" selection-end-column="23" />
<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" />
<marker date="1564452153691" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564452153691" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564452153691" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564452153691" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564452153691" expanded="true" signature="22272:23182" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="23243:23333" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="23424:26353" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="26452:26870" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26535:26612" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26700:26777" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26947:27065" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="27145:27256" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564452153691" expanded="true" signature="27314:27804" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564452153691" expanded="true" signature="27865:28286" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="28406:28583" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564452153691" expanded="true" signature="28678:28937" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="28989:29305" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564452153691" expanded="true" signature="29469:30556" ph="select repor... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="30720:31802" ph="select deal_... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="31947:33033" ph="select repor... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="36413:39079" ph="SELECT * FRO... id" />
<marker date="1564452153691" expanded="true" signature="36436:38956" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="39277:41207" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="41268:41483" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="41562:41631" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564452153691" expanded="true" signature="41691:41775" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="41834:42160" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="42224:42301" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="42365:42442" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="43748:43799" ph="delete from " />
<marker date="1564452153691" expanded="true" signature="43854:43919" ph="delete from " />
<marker date="1564452153691" expanded="true" signature="44035:44136" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="44213:44329" ph="SELECT id AS... " />
</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" />
<state relative-caret-position="171">
<caret line="18" column="14" lean-forward="true" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -210,7 +154,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>reportTime</find>
<find>reportD</find>
<find>业务</find>
<find>dealR</find>
......@@ -240,6 +183,7 @@
<find>add</find>
<find>saveTr</find>
<find>addR</find>
<find>saveTra</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -312,10 +256,10 @@
<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/service/ReportService.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java" />
</list>
</option>
......@@ -361,7 +305,7 @@
<select />
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds">
<option name="x" value="-10" />
<option name="y" value="-10" />
<option name="width" value="1940" />
......@@ -483,7 +427,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -545,7 +488,7 @@
<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="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
......@@ -556,65 +499,26 @@
<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" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="service" 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="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="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
......@@ -650,7 +554,7 @@
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
<property name="settings.editor.selected.configurable" value="vcs.Subversion" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
......@@ -1062,11 +966,11 @@
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
<configuration>C:\Users\Administrator\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="" />
<changelist id="53177314-c31b-4a61-960c-eb18cd6b76b6" name="Default Changelist" comment="" />
<created>1496208637963</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
......@@ -1399,13 +1303,7 @@
<workItem from="1564103732268" duration="2278000" />
<workItem from="1564112769708" duration="9809000" />
<workItem from="1564130831369" duration="2599000" />
</task>
<task id="LOCAL-00074" summary="登录失效后跳回到融创页面">
<created>1499418887249</created>
<option name="number" value="00074" />
<option name="presentableId" value="LOCAL-00074" />
<option name="project" value="LOCAL" />
<updated>1499418887250</updated>
<workItem from="1564448655199" duration="3473000" />
</task>
<task id="LOCAL-00075" summary="去掉oa用户的修改操作">
<created>1499658583206</created>
......@@ -1743,11 +1641,18 @@
<option name="project" value="LOCAL" />
<updated>1564372368401</updated>
</task>
<option name="localTasksCounter" value="123" />
<task id="LOCAL-00123" summary="定时任务，线索定时转换">
<created>1564394582264</created>
<option name="number" value="00123" />
<option name="presentableId" value="LOCAL-00123" />
<option name="project" value="LOCAL" />
<updated>1564394582265</updated>
</task>
<option name="localTasksCounter" value="124" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1229597000" />
<option name="totallyTimeSpent" value="1233641000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1759,10 +1664,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<frame x="-8" y="-8" width="1552" height="840" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25318152" />
<window_info id="Structure" order="1" weight="0.25" />
<window_info id="Nl-Palette" order="2" />
<window_info id="Designer" order="3" />
......@@ -1773,15 +1678,15 @@
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Message" order="0" />
<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.23900293" />
<window_info anchor="bottom" id="Run" order="2" weight="0.23900293" />
<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="Inspection" order="5" weight="0.4" />
<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.48680353" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50067025" side_tool="true" weight="0.41202345" />
<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="Version Control" order="10" sideWeight="0.4996651" weight="0.14222874" />
<window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49932975" weight="0.41202345" />
<window_info anchor="bottom" id="Spring" order="11" />
<window_info anchor="bottom" id="Terminal" order="12" weight="0.3295711" />
<window_info anchor="bottom" id="Application Servers" order="13" />
......@@ -1909,7 +1814,6 @@
<path value="$PROJECT_DIR$/../xinao-officeassets-core" />
<path value="$PROJECT_DIR$/../git/Git/repository" />
</ignored-roots>
<MESSAGE value="屏蔽oa用户的备注" />
<MESSAGE value="注掉提问的压缩图片" />
<MESSAGE value="图片压缩问题" />
<MESSAGE value="修改提问内容的placeholder&#10;" />
......@@ -1934,7 +1838,8 @@
<MESSAGE value="基本完善" />
<MESSAGE value="人员管理修改区域二级显示" />
<MESSAGE value="人员管理修改区域二级显示 页面修整" />
<option name="LAST_COMMIT_MESSAGE" value="人员管理修改区域二级显示 页面修整" />
<MESSAGE value="定时任务，线索定时转换" />
<option name="LAST_COMMIT_MESSAGE" value="定时任务，线索定时转换" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1983,16 +1888,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="97" column="21" lean-forward="true" selection-start-line="97" selection-start-column="21" selection-end-line="97" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
......@@ -2372,58 +2267,6 @@
</state>
</provider>
</entry>
<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>
<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="335">
<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>
<marker date="1564392243567" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<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>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
......@@ -2445,13 +2288,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="923" column="18" selection-start-line="923" selection-start-column="18" selection-end-line="923" selection-end-column="18" />
</state>
</provider>
</entry>
<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">
......@@ -2484,16 +2320,82 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/NoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="61" column="64" lean-forward="true" selection-start-line="61" selection-start-column="64" selection-end-line="61" selection-end-column="64" />
</state>
</provider>
</entry>
<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="219">
<caret line="62" column="18" lean-forward="true" selection-start-line="62" selection-start-column="18" selection-end-line="62" selection-end-column="18" />
</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" />
<state relative-caret-position="171">
<caret line="18" column="14" lean-forward="true" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="444">
<caret line="1111" column="23" lean-forward="true" selection-start-line="1111" selection-start-column="23" selection-end-line="1111" selection-end-column="23" />
<folding>
<marker date="1564452153691" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564452153691" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564452153691" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564452153691" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564452153691" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564452153691" expanded="true" signature="22272:23182" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="23243:23333" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="23424:26353" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="26452:26870" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26535:26612" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26700:26777" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="26947:27065" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564452153691" expanded="true" signature="27145:27256" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564452153691" expanded="true" signature="27314:27804" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564452153691" expanded="true" signature="27865:28286" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="28406:28583" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564452153691" expanded="true" signature="28678:28937" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="28989:29305" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564452153691" expanded="true" signature="29469:30556" ph="select repor... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="30720:31802" ph="select deal_... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="31947:33033" ph="select repor... ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="36413:39079" ph="SELECT * FRO... id" />
<marker date="1564452153691" expanded="true" signature="36436:38956" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="39277:41207" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564452153691" expanded="true" signature="41268:41483" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="41562:41631" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564452153691" expanded="true" signature="41691:41775" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="41834:42160" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="42224:42301" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="42365:42442" ph="UPDATE ct_bb... " />
<marker date="1564452153691" expanded="true" signature="43748:43799" ph="delete from " />
<marker date="1564452153691" expanded="true" signature="43854:43919" ph="delete from " />
<marker date="1564452153691" expanded="true" signature="44035:44136" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564452153691" expanded="true" signature="44213:44329" ph="SELECT id AS... " />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="161" column="9" lean-forward="true" selection-start-line="161" selection-start-column="9" selection-end-line="161" selection-end-column="9" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -161,11 +161,11 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
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));
System.out.println(reportEntity.getSupplementTitle()+"==转为线索时间："+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(transTime));
}
dao.addTrack(reportEntity);
......
src/main/java/com/ejweb/modules/report/utils/TimedTask.java
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;
......@@ -8,9 +7,7 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
* Created by haoqm on 2019/7/18.
......@@ -27,15 +24,15 @@ public class TimedTask {
//获取所有转为线索的举报信息
ReportEntity reportEntity=new ReportEntity();
Calendar c = Calendar.getInstance();
c.add(Calendar.MONTH, -3); // 当前日期减三个月
/* c.add(Calendar.MINUTE, -25); // 当前日期减去25分钟*/
c.add(Calendar.MONTH, -3); // 当前日期减三个月 生产环境
/* c.add(Calendar.MINUTE, -25); // 当前日期减去25分钟 测试环境 */
reportEntity.setTransTime(c.getTime());
try{
/*跟据三个月前的过期时间查询并修改举报信息*/
/*跟据三个月前的过期时间查询并修改当天过期的举报信息*/
reportDao.updateReportByClueTime(reportEntity);
System.out.println("线索状态改变成功");
System.out.println("线索状态改变成功+1");
}catch (Exception e){
System.out.println("线索状态改变失败");
System.out.println("线索状态改变异常");
}
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -1110,7 +1110,7 @@
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result='2'
WHERE DATE(transTime) &lt;= #{transTime}
WHERE where day(transTime) = day(#{transTime}) /* 比较日期数相同就行 */
</update>
</mapper>
\ No newline at end of file
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