Skip to content

S
sunac_report
Commit 3ccfbeb8 by Java-刘铮
Options

修改数据

parent 18cd3558
Showing with 435 additions and 580 deletions
.idea/workspace.xml
......@@ -8,31 +8,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/report_sunac.iml" afterPath="$PROJECT_DIR$/report_sunac.iml" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" afterPath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/GConstants.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/GConstants.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/fetcher/HCFetcher.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/fetcher/HCFetcher.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/fetcher/HttpUtilDemo.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/fetcher/HttpUtilDemo.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/persistence/MapperLoader$Scanner.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/persistence/MapperLoader$Scanner.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/persistence/interceptor/SQLHelper.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/persistence/interceptor/SQLHelper.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/security/shiro/cache/JedisCacheManager$JedisCache.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/security/shiro/cache/JedisCacheManager$JedisCache.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/security/shiro/session/JedisSessionDAO.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/security/shiro/session/JedisSessionDAO.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/FileUtils.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/FileUtils.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/JedisUtils.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/JedisUtils.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/MacUtils.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/MacUtils.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/PropertiesLoader.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/PropertiesLoader.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ImportExcel.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ImportExcel.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/LoginController.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/LoginController.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/upload/api/UploadController.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/upload/api/UploadController.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/upload/service/UploadService.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/upload/service/UploadService.class" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -71,7 +56,62 @@
<favorites_list name="it-faq-manage" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ReportController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18175">
<caret line="755" column="53" lean-forward="false" selection-start-line="755" selection-start-column="53" selection-end-line="755" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportDao.xml" pinned="false" current-in-tab="true">
<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="25">
<caret line="70" column="34" lean-forward="false" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" />
<folding>
<marker date="1525333204216" expanded="true" signature="1905:2115" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="2221:6068" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="6176:10285" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="10838:11063" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1525333204216" expanded="true" signature="11159:11354" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1525333204216" expanded="true" signature="11406:12513" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="12575:12915" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1525333204216" expanded="true" signature="12966:13562" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="13623:13713" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="13804:16733" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525333204216" expanded="true" signature="16832:17250" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="16915:16992" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17080:17157" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17327:17445" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17525:17636" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1525333204216" expanded="true" signature="17694:18184" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1525333204216" expanded="true" signature="18245:18666" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1525333204216" expanded="true" signature="18786:18963" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1525333204216" expanded="true" signature="19058:19317" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525333204216" expanded="true" signature="19369:19685" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1525333204216" expanded="true" signature="19849:20597" ph="select repor... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="20761:21505" ph="select deal_... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="21650:22398" ph="select repor... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="25408:27552" ph="SELECT * FRO... id" />
<marker date="1525333204216" expanded="true" signature="25431:27421" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="27750:28957" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="29018:29233" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="29312:29381" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1525333204216" expanded="true" signature="29441:29525" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="29584:29910" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="30816:30867" ph="delete from ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="30922:30987" ph="delete from CT_BBTC_REPORT_NOTICE... " />
<marker date="1525333204216" expanded="true" signature="31103:31204" ph="SELECT su.na... ct_bbtc_sys_user" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -82,28 +122,11 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>btnSubmit</find>
<find>notice</find>
<find>exchangetype</find>
<find>notice/list</find>
<find>addReportNotice</find>
<find>findList</find>
<find>notice/addReportNotice</find>
<find>移交</find>
<find>transferName</find>
<find>ifDone</find>
<find>selectDone</find>
<find>transferUser</find>
<find>exchangeAfterUser</find>
<find>exchangeType</find>
<find>addReport</find>
<find>处理人</find>
<find>NOTICE</find>
<find>selectBySendToId</find>
<find>findReportNotice</find>
<find>举报不是</find>
<find>export</find>
<find>showDone</find>
<find>form</find>
<find>vi</find>
<find>view</find>
......@@ -112,6 +135,23 @@
<find>btnClose</find>
<find>conclusion</find>
<find>查看</find>
<find>举报不是</find>
<find>菜单管理</find>
<find>businessManagement</find>
<find>getReportResult</find>
<find>showDone</find>
<find>findList</find>
<find>ro</find>
<find>exc</find>
<find>getReportType</find>
<find>ComplainNum</find>
<find>getTotalNum</find>
<find>totalCount</find>
<find>unsettled</find>
<find>RepResultTotal</find>
<find>UnreaListic</find>
<find>confirmed</find>
<find>Unsettled</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -120,6 +160,9 @@
<replace>${dbprefix}</replace>
<replace />
</replaceStrings>
<dirStrings>
<dir>D:\sunac_report\target\report_sunac\WEB-INF\classes\WEB-INF\views\modules\workbench</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -177,20 +220,20 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<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/web/WorkbenchController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" />
<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/service/ReportService.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/reportQyList.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<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/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/java/com/ejweb/modules/workbench/service/WorkbenchService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
</list>
</option>
</component>
......@@ -364,6 +407,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -371,315 +415,13 @@
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="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="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="workbench" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="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="resources" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="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>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" 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="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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="service" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" 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>
</pane>
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -939,6 +681,7 @@
</configuration>
<configuration name="report" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8 (1)">
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8181/sunac/admin/login" />
<option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<deployment>
......@@ -1546,14 +1289,13 @@
<workItem from="1524879498814" duration="1643000" />
<workItem from="1524881233087" duration="21635000" />
<workItem from="1525073630025" duration="9527000" />
<workItem from="1525230668972" duration="12448000" />
</task>
<task id="LOCAL-00065" summary="修改导出字段">
<created>1498721349526</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1498721349527</updated>
<workItem from="1525230668972" duration="18906000" />
<workItem from="1525315466316" duration="16753000" />
<workItem from="1525437464074" duration="880000" />
<workItem from="1525438411733" duration="863000" />
<workItem from="1527348337397" duration="4724000" />
<workItem from="1527471641861" duration="5414000" />
<workItem from="1527579299794" duration="69000" />
</task>
<task id="LOCAL-00066" summary="注释掉登录校验验证码 问题列表移入显示小手">
<created>1499149544836</created>
......@@ -1891,11 +1633,18 @@
<option name="project" value="LOCAL" />
<updated>1524907215035</updated>
</task>
<option name="localTasksCounter" value="114" />
<task id="LOCAL-00114" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1525253435711</created>
<option name="number" value="00114" />
<option name="presentableId" value="LOCAL-00114" />
<option name="project" value="LOCAL" />
<updated>1525253435712</updated>
</task>
<option name="localTasksCounter" value="115" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="595829000" />
<option name="totallyTimeSpent" value="630990000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1919,9 +1668,8 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.42668864" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.47940692" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13344316" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3261944" sideWeight="0.49444443" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
......@@ -1930,10 +1678,9 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3196046" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30408472" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3267776" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24038461" sideWeight="0.52820516" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28878647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
......@@ -1942,7 +1689,9 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3261944" sideWeight="0.49444443" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28878647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
......@@ -1961,7 +1710,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.29159802" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.47940692" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13344316" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3261944" sideWeight="0.49444443" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
......@@ -1973,7 +1722,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3196046" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30408472" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3214826" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24038461" sideWeight="0.52820516" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28878647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
......@@ -2062,23 +1811,11 @@
<properties />
<option name="timeStamp" value="158" />
</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>516</line>
<properties />
<option name="timeStamp" value="215" />
</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>872</line>
<properties />
<option name="timeStamp" value="216" />
</line-breakpoint>
</breakpoints>
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="217" />
<option name="time" value="227" />
</breakpoint-manager>
<watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
......@@ -2098,34 +1835,6 @@
</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="100">
<caret line="4" column="26" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11325">
<caret line="453" column="67" lean-forward="false" selection-start-line="453" selection-start-column="63" selection-end-line="453" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -2154,13 +1863,6 @@
</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="334">
<caret line="67" column="20" lean-forward="false" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/mobile/modules/sys/sysLogin.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-950">
......@@ -2224,13 +1926,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="115" column="34" lean-forward="false" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportAttachmentEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
......@@ -2252,18 +1947,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/RoleDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1832">
<caret line="16" column="42" lean-forward="false" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportExchangeHistory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-107">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
......@@ -2279,45 +1966,89 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2017">
<caret line="215" column="14" lean-forward="false" selection-start-line="215" selection-start-column="14" selection-end-line="215" selection-end-column="14" />
<folding />
</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/webapp/WEB-INF/views/modules/workbench/notice.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="117" column="43" lean-forward="false" selection-start-line="117" selection-start-column="43" selection-end-line="117" selection-end-column="43" />
<folding />
<state relative-caret-position="325">
<caret line="13" column="65" lean-forward="false" selection-start-line="13" selection-start-column="59" selection-end-line="13" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/notice.jsp">
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.2.RELEASE/spring-aop-4.2.2.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="65" lean-forward="false" selection-start-line="13" selection-start-column="59" selection-end-line="13" selection-end-column="65" />
<folding />
<state relative-caret-position="268">
<caret line="434" column="0" lean-forward="false" selection-start-line="434" selection-start-column="0" selection-end-line="434" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java">
<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="342">
<caret line="26" column="39" lean-forward="false" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding>
<marker date="1517536968078" expanded="true" signature="320:557" ph="SELECT c.*, CT_BBTC_REPORT_NOTICE" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3825">
<caret line="153" column="30" lean-forward="false" selection-start-line="153" selection-start-column="14" selection-end-line="153" selection-end-column="30" />
<folding>
<marker date="1517536968079" expanded="true" signature="1379:1496" ph="select from ct_bbtc_report_notice" />
<marker date="1517536968079" expanded="true" signature="1582:1653" ph="delete from ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="1758:2248" ph="insert into ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="4173:5150" ph="update ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="5267:5772" ph="update ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="5848:6005" ph="SELECT FROM ct_bbtc_report_notice" />
<marker date="1517536968079" expanded="true" signature="6076:6213" ph="SELECT count... CT_BBTC_REPORT_NOTICE" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4480">
<caret line="132" column="39" lean-forward="true" selection-start-line="132" selection-start-column="39" selection-end-line="132" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="29" column="15" lean-forward="false" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="93">
<caret line="91" column="53" lean-forward="false" selection-start-line="91" selection-start-column="40" selection-end-line="91" selection-end-column="53" />
<state relative-caret-position="175">
<caret line="422" column="41" lean-forward="false" selection-start-line="422" selection-start-column="35" selection-end-line="422" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.2.RELEASE/spring-core-4.2.2.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/menuList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2275">
<caret line="106" column="0" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
<state relative-caret-position="-707">
<caret line="10" column="11" lean-forward="true" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.2.RELEASE/spring-aop-4.2.2.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/dictList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="434" column="0" lean-forward="false" selection-start-line="434" selection-start-column="0" selection-end-line="434" selection-end-column="0" />
<state relative-caret-position="-600">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
......@@ -2328,16 +2059,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/dao/ReportNoticeMapper.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="26" column="39" lean-forward="false" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="39" />
<state relative-caret-position="25">
<caret line="656" column="37" lean-forward="false" selection-start-line="656" selection-start-column="27" selection-end-line="656" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/RoleDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="98" column="31" lean-forward="true" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
<folding>
<marker date="1517536968070" expanded="true" signature="2094:3124" ph="SELECT , rm.... " />
<marker date="1517536968070" expanded="true" signature="3194:3398" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="3470:3678" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="3752:4561" ph="SELECT , ro.... " />
<marker date="1517536968070" expanded="true" signature="4633:4969" ph="SELECT FROM ct_bbtc_sys_role" />
<marker date="1517536968070" expanded="true" signature="5022:5750" ph="INSERT INTO ct_bbtc_sys_role... " />
<marker date="1517536968070" expanded="true" signature="5803:6217" ph="UPDATE ct_bbtc_sys_role... " />
<marker date="1517536968070" expanded="true" signature="6278:6333" ph="DELETE FROM ct_bbtc_sys_menu2role... " />
<marker date="1517536968070" expanded="true" signature="6722:6779" ph="DELETE FROM ct_bbtc_sys_office2role... " />
<marker date="1517536968070" expanded="true" signature="7170:7264" ph="UPDATE ct_bbtc_sys_role... " />
</folding>
</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="50">
<state relative-caret-position="350">
<caret line="53" column="76" lean-forward="false" selection-start-line="53" selection-start-column="76" selection-end-line="53" selection-end-column="76" />
<folding />
</state>
......@@ -2345,178 +2095,193 @@
</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="1200">
<caret line="63" column="33" lean-forward="false" selection-start-line="63" selection-start-column="25" selection-end-line="63" selection-end-column="33" />
<folding />
<state relative-caret-position="193">
<caret line="61" column="19" lean-forward="false" selection-start-line="61" selection-start-column="19" selection-end-line="61" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeDao.xml">
<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">
<state relative-caret-position="275">
<caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding>
<marker date="1517536968078" expanded="true" signature="320:557" ph="SELECT c.*, CT_BBTC_REPORT_NOTICE" />
</folding>
<state relative-caret-position="506">
<caret line="105" column="0" lean-forward="false" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/entity/ReportNotice.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/NoticeService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
<state relative-caret-position="475">
<caret line="30" column="58" lean-forward="false" selection-start-line="30" selection-start-column="58" selection-end-line="30" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeMapper.xml">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3825">
<caret line="153" column="30" lean-forward="false" selection-start-line="153" selection-start-column="14" selection-end-line="153" selection-end-column="30" />
<folding>
<marker date="1517536968079" expanded="true" signature="1379:1496" ph="select from ct_bbtc_report_notice" />
<marker date="1517536968079" expanded="true" signature="1582:1653" ph="delete from ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="1758:2248" ph="insert into ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="4173:5150" ph="update ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="5267:5772" ph="update ct_bbtc_report_notice... " />
<marker date="1517536968079" expanded="true" signature="5848:6005" ph="SELECT FROM ct_bbtc_report_notice" />
<marker date="1517536968079" expanded="true" signature="6076:6213" ph="SELECT count... CT_BBTC_REPORT_NOTICE" />
</folding>
<state relative-caret-position="415">
<caret line="465" column="45" lean-forward="false" selection-start-line="465" selection-start-column="44" selection-end-line="465" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/NoticeService.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="30" column="58" lean-forward="false" selection-start-line="30" selection-start-column="58" selection-end-line="30" selection-end-column="58" />
<folding />
<state relative-caret-position="165">
<caret line="283" column="18" lean-forward="false" selection-start-line="283" selection-start-column="18" selection-end-line="283" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp">
<entry file="file://$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/service/ReportService.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4480">
<caret line="132" column="39" lean-forward="true" selection-start-line="132" selection-start-column="39" selection-end-line="132" selection-end-column="39" />
<folding />
<state relative-caret-position="5100">
<caret line="530" column="34" lean-forward="true" selection-start-line="530" selection-start-column="34" selection-end-line="530" selection-end-column="34" />
</state>
</provider>
</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/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="29" column="15" lean-forward="false" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
<state relative-caret-position="332">
<caret line="694" column="51" lean-forward="false" selection-start-line="694" selection-start-column="51" selection-end-line="694" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.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="175">
<caret line="422" column="41" lean-forward="false" selection-start-line="422" selection-start-column="35" selection-end-line="422" selection-end-column="41" />
<state relative-caret-position="5050">
<caret line="214" column="26" lean-forward="false" selection-start-line="214" selection-start-column="15" selection-end-line="214" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/entity/ReportNoticeEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-425">
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding />
</state>
</provider>
</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/workbench/Bean/WorkbenchBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="479" column="67" lean-forward="false" selection-start-line="479" selection-start-column="63" selection-end-line="479" selection-end-column="67" />
<caret line="34" column="25" lean-forward="false" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="25" />
<folding />
</state>
</provider>
</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/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="209" column="15" lean-forward="false" selection-start-line="209" selection-start-column="15" selection-end-line="209" selection-end-column="15" />
<state relative-caret-position="225">
<caret line="32" column="33" lean-forward="false" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="33" />
<folding />
</state>
</provider>
</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/workbench/workbench.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="773" column="30" lean-forward="false" selection-start-line="773" selection-start-column="30" selection-end-line="773" selection-end-column="30" />
<state relative-caret-position="200">
<caret line="250" column="62" lean-forward="false" selection-start-line="250" selection-start-column="62" selection-end-line="250" selection-end-column="62" />
<folding>
<element signature="e#31709#31710#0" expanded="true" />
<element signature="e#31772#31773#0" expanded="true" />
<marker date="1527474635144" expanded="true" signature="2156:2162" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2163:2169" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2208:2214" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2215:2221" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2253:2259" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2260:2266" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2299:2305" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2306:2312" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2344:2350" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="2351:2357" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="5852:5866" ph="..." />
<marker date="1527474635144" expanded="true" signature="5942:5972" ph="..." />
<marker date="1527474635144" expanded="true" signature="6038:6047" ph="..." />
<marker date="1527474635144" expanded="true" signature="9642:9648" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9649:9655" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9695:9701" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9702:9708" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9739:9745" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9746:9752" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9787:9793" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9794:9800" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9832:9838" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9839:9845" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9878:9884" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9885:9891" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9927:9933" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9934:9940" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9980:9986" ph="&amp;nbsp;" />
<marker date="1527474635144" expanded="true" signature="9987:9993" ph="&amp;nbsp;" />
</folding>
</state>
</provider>
</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/web/WorkbenchController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="33" column="37" lean-forward="false" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="37" />
<state relative-caret-position="325">
<caret line="76" column="35" lean-forward="false" selection-start-line="76" selection-start-column="21" selection-end-line="76" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/entity/ReportNotice.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3543">
<caret line="104" column="82" lean-forward="false" selection-start-line="104" selection-start-column="72" selection-end-line="104" selection-end-column="82" />
<folding>
<element signature="n#style#0;n#div#1;n#div#20;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="-700">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<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/workbench/service/WorkbenchService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="841" column="39" lean-forward="false" selection-start-line="841" selection-start-column="31" selection-end-line="841" selection-end-column="39" />
<state relative-caret-position="90">
<caret line="70" column="30" lean-forward="true" selection-start-line="70" selection-start-column="21" selection-end-line="70" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="872" column="0" lean-forward="false" selection-start-line="872" selection-start-column="0" selection-end-line="872" selection-end-column="0" />
<state relative-caret-position="18175">
<caret line="755" column="53" lean-forward="false" selection-start-line="755" selection-start-column="53" selection-end-line="755" selection-end-column="53" />
<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="857">
<caret line="725" column="0" lean-forward="true" selection-start-line="725" selection-start-column="0" selection-end-line="725" selection-end-column="0" />
<state relative-caret-position="25">
<caret line="70" column="34" lean-forward="false" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" />
<folding>
<marker date="1525252524057" expanded="true" signature="1905:2115" ph="SELECT ,su.n... " />
<marker date="1525252524057" expanded="true" signature="2221:6336" ph="SELECT ,su.n... " />
<marker date="1525252524057" expanded="true" signature="6444:10495" ph="SELECT ,su.n... " />
<marker date="1525252524057" expanded="true" signature="11048:11273" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1525252524057" expanded="true" signature="11369:11564" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1525252524057" expanded="true" signature="11616:12723" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="12785:13125" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1525252524057" expanded="true" signature="13176:13772" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="13833:13923" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="14014:16943" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525252524057" expanded="true" signature="17042:17460" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525252524057" expanded="true" signature="17125:17202" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525252524057" expanded="true" signature="17290:17367" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525252524057" expanded="true" signature="17537:17655" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525252524057" expanded="true" signature="17735:17846" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1525252524057" expanded="true" signature="17904:18394" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1525252524057" expanded="true" signature="18455:18876" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1525252524057" expanded="true" signature="18996:19173" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1525252524057" expanded="true" signature="19268:19527" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525252524057" expanded="true" signature="19579:19895" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1525252524057" expanded="true" signature="20059:20807" ph="select repor... ct_bbtc_report" />
<marker date="1525252524057" expanded="true" signature="20971:21715" ph="select deal_... ct_bbtc_report" />
<marker date="1525252524057" expanded="true" signature="21860:22608" ph="select repor... ct_bbtc_report" />
<marker date="1525252524057" expanded="true" signature="25604:27748" ph="SELECT * FRO... id" />
<marker date="1525252524057" expanded="true" signature="25627:27617" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525252524057" expanded="true" signature="27946:29153" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525252524057" expanded="true" signature="29214:29429" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="29508:29577" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1525252524057" expanded="true" signature="29637:29721" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="29780:30106" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="29780:30235" ph="UPDATE ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="30244:30408" ph="SELECT count... " />
<marker date="1525252524057" expanded="true" signature="31012:31063" ph="delete from ct_bbtc_report... " />
<marker date="1525252524057" expanded="true" signature="31118:31183" ph="delete from CT_BBTC_REPORT_NOTICE... " />
<marker date="1525333204216" expanded="true" signature="1905:2115" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="2221:6068" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="6176:10285" ph="SELECT ,su.n... " />
<marker date="1525333204216" expanded="true" signature="10838:11063" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1525333204216" expanded="true" signature="11159:11354" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1525333204216" expanded="true" signature="11406:12513" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="12575:12915" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1525333204216" expanded="true" signature="12966:13562" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="13623:13713" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="13804:16733" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525333204216" expanded="true" signature="16832:17250" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="16915:16992" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17080:17157" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17327:17445" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1525333204216" expanded="true" signature="17525:17636" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1525333204216" expanded="true" signature="17694:18184" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1525333204216" expanded="true" signature="18245:18666" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1525333204216" expanded="true" signature="18786:18963" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1525333204216" expanded="true" signature="19058:19317" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1525333204216" expanded="true" signature="19369:19685" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1525333204216" expanded="true" signature="19849:20597" ph="select repor... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="20761:21505" ph="select deal_... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="21650:22398" ph="select repor... ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="25408:27552" ph="SELECT * FRO... id" />
<marker date="1525333204216" expanded="true" signature="25431:27421" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="27750:28957" ph="SELECT r.id ct_bbtc_report" />
<marker date="1525333204216" expanded="true" signature="29018:29233" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="29312:29381" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1525333204216" expanded="true" signature="29441:29525" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="29584:29910" ph="UPDATE ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="30816:30867" ph="delete from ct_bbtc_report... " />
<marker date="1525333204216" expanded="true" signature="30922:30987" ph="delete from CT_BBTC_REPORT_NOTICE... " />
<marker date="1525333204216" expanded="true" signature="31103:31204" ph="SELECT su.na... ct_bbtc_sys_user" />
</folding>
</state>
</provider>
......
report_sunac.iml
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
......@@ -63,7 +63,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/java/lib/jconsole.jar!/" />
<root url="jar://D:/jdk/java/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......@@ -72,7 +72,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/java/lib/tools.jar!/" />
<root url="jar://D:/jdk/java/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
......@@ -230,5 +230,5 @@ public interface ReportDao extends CrudDao<ReportEntity> {
*/
public int deleteNotice(ReportEntity reportEntity);
public String selectExchangeAfterUser(String report);
}
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -289,7 +289,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
//当前只有杨杨是系统管理员，处理后消息发给杨杨，以后如果新增了系统管理员需修改
//findAdmin（）方法获取所有系统管理员
// reportNotice.setSendToId("8434980248282724540228");
reportNotice.setSendToId("1");
reportNotice.setSendToId("8434980248282724540228");
reportNotice.setTitle("“" + reportEntity.getSupplementTitle() + "”已由" + user.getName() + "于" + dateStr + "处理完成");
}
if (flag.equals("meanWhile")) {
......@@ -365,7 +365,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
*/
public List<ReportEntity> getReportList(ReportEntity reportEntity) {
List<ReportEntity> reportList = dao.findList(reportEntity);
String exchangeAfterUser = "";
for (ReportEntity report : reportList) {
exchangeAfterUser = reportDao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
String typeStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
......@@ -565,7 +568,11 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
*/
public List<ReportEntity> getReportQyList(ReportEntity reportEntity) {
List<ReportEntity> reportList = reportDao.findQyList(reportEntity);
for (ReportEntity report : reportList) {
String exchangeAfterUser = "";
for (ReportEntity report : reportList)
{
exchangeAfterUser = reportDao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
String typeStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
......@@ -606,6 +613,70 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
typeStr = typeStr.substring(0, typeStr.length() - 1);
}
report.setSupplementType(typeStr);
//移交部门
String TransferDepartment = report.getTransferDepartment();
if (StringUtils.isNoneBlank(report.getTransferDepartment())) {
if (TransferDepartment.equals("1")) {
TransferDepartment = "营销";
} else if (TransferDepartment.equals("2")) {
TransferDepartment = "工程";
} else if (TransferDepartment.equals("3")) {
TransferDepartment = "成本";
} else if (TransferDepartment.equals("4")) {
TransferDepartment = "招采";
} else if (TransferDepartment.equals("5")) {
TransferDepartment = "财务";
} else if (TransferDepartment.equals("6")) {
TransferDepartment = "法务";
} else if (TransferDepartment.equals("7")) {
TransferDepartment = "行政";
} else if (TransferDepartment.equals("8")) {
TransferDepartment = "人力";
} else if (TransferDepartment.equals("9")) {
TransferDepartment = "开发";
} else if (TransferDepartment.equals("10")) {
TransferDepartment = "研发";
} else if (TransferDepartment.equals("11")) {
TransferDepartment = "投资";
} else if (TransferDepartment.equals("12")) {
TransferDepartment = "其他";
} else if (TransferDepartment.equals("13")) {
TransferDepartment = "物业管理";
} else if (TransferDepartment.equals("14")) {
TransferDepartment = "酒店管理";
} else if (TransferDepartment.equals("15")) {
TransferDepartment = "商业管理";
}
} else {
TransferDepartment = "";
}
report.setTransferDepartment(TransferDepartment);
//举报途径
String reportSource = report.getReportSource();
if (StringUtils.isNotBlank(reportSource)) {
if (reportSource.equals("oa")) {
reportSource = "融创OA系统";
} else if (reportSource.equals("supplier")) {
reportSource = "供应商系统";
} else if (reportSource.equals("wechat")) {
reportSource = "微信公众号";
} else if (reportSource.equals("sunacE")) {
reportSource = "融E";
} else if (reportSource.equals("offline")) {
reportSource = "线下扫码";
} else if (reportSource.equals("tel")) {
reportSource = "电话";
} else if (reportSource.equals("email")) {
reportSource = "邮件";
} else if (reportSource.equals("visit")) {
reportSource = "来访";
}
} else {
reportSource = "";
}
report.setReportSource(reportSource);
//状态
String reportStatus = report.getReportStatus();
if (StringUtils.isNotBlank(reportStatus)) {
if (reportStatus.equals("0")) {
......@@ -689,6 +760,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
isSendEmail = "否";
}
report.setIsSendEmail(isSendEmail);
}
return reportList;
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -5,6 +5,7 @@ import com.ejweb.core.persistence.Page;
import com.ejweb.core.utils.DateUtils;
import com.ejweb.core.utils.StringUtils;
import com.ejweb.core.utils.excel.ExportExcel;
import com.ejweb.modules.report.dao.ReportDao;
import com.ejweb.modules.report.entity.ReportAttachmentEntity;
import com.ejweb.modules.report.entity.ReportEntity;
import com.ejweb.modules.report.service.ReportService;
......@@ -44,6 +45,9 @@ public class ReportController extends BaseController {
@Autowired
private NoticeService noticeService;
@Autowired
private ReportDao reportdao;
@ModelAttribute
public ReportEntity get(@RequestParam(required = false) String id) {
if (StringUtils.isNotBlank(id)) {
......@@ -165,7 +169,8 @@ public class ReportController extends BaseController {
report.setOaname(value + "-" + report.getOaname());
}
}
String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
}
page.setList(reportlist);
......@@ -291,7 +296,10 @@ public class ReportController extends BaseController {
if (StringUtils.isNoneBlank(report.getOaname())) {
report.setOaname(value + "-" + report.getOaname());
}
}
String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
......
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -67,7 +67,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
}
}
workbench.setRepResultTotal(workbench.getComplainNum() + workbench.getInvalid() + workbench.getVerified() + workbench.getConfirmed());
workbench.setRepResultTotal(workbench.getComplainNum() + workbench.getInvalid() + workbench.getVerified() + workbench.getConfirmed() + workbench.getUnreaListic() + workbench.getTransfer());
workbench.setUnsettled(workbench.getTotalCount() - workbench.getRepResultTotal());
List<HashMap> statusList = reportDao.getReportStatus(workbench);
//举报状态
......@@ -108,7 +108,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
workbench.setFinance(Integer.valueOf(finance.toString()));
//法务
Object forensic = type.get("forensic");
workbench.setFinance(Integer.valueOf(forensic.toString()));
workbench.setForensic(Integer.valueOf(forensic.toString()));
//行政
Object administration = type.get("administration");
workbench.setAdministration(Integer.valueOf(administration.toString()));
......@@ -116,8 +116,8 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
Object manpower = type.get("manpower");
workbench.setManpower(Integer.valueOf(manpower.toString()));
//开发
Object businessManagement = type.get("development");
workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString()));
Object development = type.get("development");
workbench.setDevelopment(Integer.valueOf(development.toString()));
//研发
Object rAndD = type.get("rAndD");
workbench.setrAndD(Integer.valueOf(rAndD.toString()));
......@@ -126,16 +126,16 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
workbench.setiAndD(Integer.valueOf(iAndD.toString()));
//其他
Object Other = type.get("Other");
workbench.setComplain(Integer.valueOf(Other.toString()));
workbench.setOther(Integer.valueOf(Other.toString()));
//物业管理
Object propertyManagement = type.get("propertyManagement");
workbench.setiAndD(Integer.valueOf(propertyManagement.toString()));
workbench.setPropertyManagement(Integer.valueOf(propertyManagement.toString()));
//酒店管理
Object hotelManagement = type.get("hotelManagement");
workbench.setiAndD(Integer.valueOf(hotelManagement.toString()));
workbench.setHotelManagement(Integer.valueOf(hotelManagement.toString()));
//商业管理
Object syManagement = type.get("businessManagement");
workbench.setiAndD(Integer.valueOf(syManagement.toString()));
workbench.setBusinessManagement(Integer.valueOf(syManagement.toString()));
}
List<HashMap> totals = reportDao.getTotal(workbench);
for (HashMap total : totals) {
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
......@@ -73,12 +73,13 @@ public class WorkbenchController extends BaseController {
res.put("complainNum", bean.getComplainNum());
res.put("verified", bean.getVerified());
res.put("confirmed", bean.getConfirmed());
res.put("unreaListic", bean.getConfirmed());
res.put("transfer", bean.getConfirmed());
res.put("unreaListic", bean.getUnreaListic());
res.put("reportWeichuli", bean.getTotalCount() - bean.getInvalid() - bean.getComplainNum() - bean.getVerified() - bean.getConfirmed() - bean.getUnreaListic() - bean.getTransfer());
res.put("transfer", bean.getTransfer());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报类型
res.put("sale", bean.getLand());
res.put("sale", bean.getSale());
res.put("project", bean.getProject());
res.put("cost", bean.getCost());
res.put("forMining", bean.getForMining());
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -57,21 +57,15 @@
<include refid="reportColumns"/>
,su.name AS "transferName"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
LEFT JOIN ct_bbtc_sys_user SU
ON r.create_by = SU.ID
<where>
1 = 1
<if test="isAdmin == null">
AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by != #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
AND r.supplement_area ='Group' AND su.area NOT IN ('North China',
'BeiJing',
'ShangHai',
'SouthWest',
'SouthEast',
'Central China',
'GuangShen',
'Hainan') OR r.create_by = #{isAdmin}
AND su.role_id='1'
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
......@@ -152,7 +146,9 @@
'SouthEast',
'Central China',
'GuangShen',
'Hainan')
'Hainan',
'Group',
'PropertyGroup')
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
......@@ -574,7 +570,8 @@
<select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
resultType="java.util.HashMap">
SELECT
SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS "sale",
SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS
"sale",
SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
"project",
SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
......@@ -597,11 +594,11 @@
"iAndD",
SUM(CASE WHEN supplement_type||',' LIKE '12,%' OR supplement_type||',' LIKE '%,12,%' THEN 1 ELSE 0 END) AS
"Other",
SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
SUM(CASE WHEN supplement_type||',' LIKE '13,%' OR supplement_type||',' LIKE '%,13,%' THEN 1 ELSE 0 END) AS
"propertyManagement",
SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
SUM(CASE WHEN supplement_type||',' LIKE '14,%' OR supplement_type||',' LIKE '%,14,%' THEN 1 ELSE 0 END) AS
"hotelManagement",
SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
SUM(CASE WHEN supplement_type||',' LIKE '15,%' OR supplement_type||',' LIKE '%,15,%' THEN 1 ELSE 0 END) AS
"businessManagement"
FROM ct_bbtc_report
WHERE 1=1
......@@ -765,4 +762,14 @@
delete from CT_BBTC_REPORT_NOTICE
where report_id = #{id}
</delete>
<select id="selectExchangeAfterUser" parameterType="ReportEntity" resultType="String">
SELECT
su.name
FROM
ct_bbtc_sys_user su
WHERE
su.id=#{report}
</select>
</mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -252,7 +252,7 @@
<div class="control-group">
<label class="control-label">处理结论:</label>
<div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="dealResult" path="dealResult"
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="dealResult"
class="input-small"
onchange="showDone();">
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -219,7 +219,7 @@
},
subtitle: {//副标题
align: 'right',
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>举报未处理&nbsp;:&nbsp;' + result.unsettled + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>举报未处理&nbsp;:&nbsp;' + result.reportWeichuli + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
useHTML: true,
verticalAlign: 'top',
x: -5,
......@@ -248,7 +248,7 @@
['举报受理', result.verified],
['举报属实', result.confirmed],
['举报不实', result.unreaListic],
['举报未处理', result.unsettled],
['举报未处理',result.reportWeichuli],
['移交其它部门', result.transfer]
]
}]
......
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