Skip to content

S
sunac_report
Commit c14cc3a8 by 佰邦同创-郝泉明
Options

0730

parent 2e160f0d
Showing with 119 additions and 98 deletions
.idea/workspace.xml
......@@ -8,15 +8,13 @@
</artifacts-to-build>
</component>
<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="bug错误修改 线索列表 flag值">
<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/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/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$/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$/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/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" />
<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" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -65,11 +63,23 @@
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<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 relative-caret-position="391">
<caret line="163" column="36" lean-forward="true" selection-start-line="163" selection-start-column="36" selection-end-line="163" selection-end-column="36" />
</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="94">
<caret line="95" column="56" lean-forward="true" selection-start-line="95" selection-start-column="56" selection-end-line="95" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -86,8 +96,8 @@
<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="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" />
<state relative-caret-position="178">
<caret line="1097" column="13" lean-forward="true" selection-start-line="1097" selection-start-column="13" selection-end-line="1097" selection-end-column="13" />
<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... " />
......@@ -131,6 +141,25 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.idea/modules.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/utils/TimedTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
......@@ -257,10 +286,10 @@
<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/dao/ReportDao.java" />
<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" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
</list>
</option>
</component>
......@@ -305,7 +334,7 @@
<select />
</treeState>
</component>
<component name="ProjectFrameBounds">
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-10" />
<option name="y" value="-10" />
<option name="width" value="1940" />
......@@ -514,6 +543,18 @@
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -554,15 +595,12 @@
<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.Subversion" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Ignored.Files" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" />
<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 name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.ejweb.conf" />
......@@ -570,9 +608,12 @@
<recent name="com.ejweb.core.filter" />
<recent name="com.ejweb.core.base" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" />
<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>
</component>
<component name="RunAnythingCache">
......@@ -1303,21 +1344,7 @@
<workItem from="1564103732268" duration="2278000" />
<workItem from="1564112769708" duration="9809000" />
<workItem from="1564130831369" duration="2599000" />
<workItem from="1564448655199" duration="3473000" />
</task>
<task id="LOCAL-00075" summary="去掉oa用户的修改操作">
<created>1499658583206</created>
<option name="number" value="00075" />
<option name="presentableId" value="LOCAL-00075" />
<option name="project" value="LOCAL" />
<updated>1499658583208</updated>
</task>
<task id="LOCAL-00076" summary="隐藏oa角色">
<created>1499669235262</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1499669235262</updated>
<workItem from="1564448655199" duration="5417000" />
</task>
<task id="LOCAL-00077" summary="登录失效跳空白页">
<created>1499670447690</created>
......@@ -1648,11 +1675,25 @@
<option name="project" value="LOCAL" />
<updated>1564394582265</updated>
</task>
<option name="localTasksCounter" value="124" />
<task id="LOCAL-00124" summary="定时任务，时间优化，精确到天数">
<created>1564452324393</created>
<option name="number" value="00124" />
<option name="presentableId" value="LOCAL-00124" />
<option name="project" value="LOCAL" />
<updated>1564452324394</updated>
</task>
<task id="LOCAL-00125" summary="bug错误修改 线索列表 flag值">
<created>1564452979633</created>
<option name="number" value="00125" />
<option name="presentableId" value="LOCAL-00125" />
<option name="project" value="LOCAL" />
<updated>1564452979633</updated>
</task>
<option name="localTasksCounter" value="126" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1233641000" />
<option name="totallyTimeSpent" value="1235585000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1664,8 +1705,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1552" height="840" extended-state="0" />
<editor active="true" />
<frame x="-8" y="-8" width="1552" height="840" extended-state="1" />
<layout>
<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" />
......@@ -1678,7 +1718,7 @@
<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 anchor="bottom" id="Run" order="2" weight="0.23900293" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33040935" />
<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" />
......@@ -1686,7 +1726,7 @@
<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.49932975" weight="0.41202345" />
<window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49932975" weight="0.41081873" />
<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" />
......@@ -1814,8 +1854,6 @@
<path value="$PROJECT_DIR$/../xinao-officeassets-core" />
<path value="$PROJECT_DIR$/../git/Git/repository" />
</ignored-roots>
<MESSAGE value="注掉提问的压缩图片" />
<MESSAGE value="图片压缩问题" />
<MESSAGE value="修改提问内容的placeholder&#10;" />
<MESSAGE value="将调用sunac-core改成用ldap" />
<MESSAGE value="去掉退出按钮" />
......@@ -1839,7 +1877,9 @@
<MESSAGE value="人员管理修改区域二级显示" />
<MESSAGE value="人员管理修改区域二级显示 页面修整" />
<MESSAGE value="定时任务，线索定时转换" />
<option name="LAST_COMMIT_MESSAGE" value="定时任务，线索定时转换" />
<MESSAGE value="定时任务，时间优化，精确到天数" />
<MESSAGE value="bug错误修改 线索列表 flag值" />
<option name="LAST_COMMIT_MESSAGE" value="bug错误修改 线索列表 flag值" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1868,12 +1908,6 @@
<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>
</breakpoint-manager>
<watches-manager>
......@@ -1888,23 +1922,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<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">
<caret line="118" column="78" selection-start-line="118" selection-start-column="58" selection-end-line="118" selection-end-column="78" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="112" column="78" selection-start-line="112" selection-start-column="78" selection-end-line="112" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
......@@ -2180,17 +2197,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/report_sunac.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1995" />
......@@ -2303,16 +2309,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
<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">
......@@ -2344,10 +2340,27 @@
</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="391">
<caret line="163" column="36" lean-forward="true" selection-start-line="163" selection-start-column="36" selection-end-line="163" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="95" column="56" lean-forward="true" selection-start-line="95" selection-start-column="56" selection-end-line="95" selection-end-column="56" />
<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" />
<state relative-caret-position="178">
<caret line="1097" column="13" lean-forward="true" selection-start-line="1097" selection-start-column="13" selection-end-line="1097" selection-end-column="13" />
<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... " />
......@@ -2389,13 +2402,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<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 relative-caret-position="171">
<caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.idea/modules.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/webapp/WEB-INF/classes/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
target/report_sunac.war
No preview for this file type
target/report_sunac/WEB-INF/classes/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