Skip to content

S
sunac_report
Commit 18cd3558 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent be7b7df1
Showing with 613 additions and 441 deletions
.idea/misc.xml
......@@ -13,74 +13,7 @@
</list>
</option>
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Android</id>
</State>
<State>
<id>Android &gt; Lint &gt; Correctness</id>
</State>
<State>
<id>Android Lint for Kotlin</id>
</State>
<State>
<id>CSS</id>
</State>
<State>
<id>CorrectnessLintAndroid</id>
</State>
<State>
<id>Groovy</id>
</State>
<State>
<id>Invalid elementsCSS</id>
</State>
<State>
<id>JSP Inspections</id>
</State>
<State>
<id>Java</id>
</State>
<State>
<id>LintAndroid</id>
</State>
<State>
<id>OtherGroovy</id>
</State>
<State>
<id>Play</id>
</State>
<State>
<id>Security issuesJava</id>
</State>
<State>
<id>Spring</id>
</State>
<State>
<id>Spring CoreSpring</id>
</State>
<State>
<id>Threading issuesJava</id>
</State>
<State>
<id>XMLSpring CoreSpring</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Android</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
......@@ -8,22 +8,31 @@
</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/report/web/ReportToWordController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.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/resources/mappings/modules/sys/UserDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" />
<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$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
<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" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" />
<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" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -62,130 +71,7 @@
<favorites_list name="it-faq-manage" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="-335">
<caret line="143" column="39" lean-forward="true" selection-start-line="143" selection-start-column="39" selection-end-line="143" selection-end-column="39" />
<folding>
<marker date="1524899487335" expanded="true" signature="1905:2115" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="2221:6336" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="6444:10495" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="11048:11273" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1524899487335" expanded="true" signature="11369:11564" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1524899487335" expanded="true" signature="11616:12723" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="12785:13125" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1524899487335" expanded="true" signature="13176:13772" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="13833:13923" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="14014:16943" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524899487335" expanded="true" signature="17042:17460" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17125:17202" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17290:17367" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17537:17655" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17735:17846" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1524899487335" expanded="true" signature="17904:18394" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1524899487335" expanded="true" signature="18455:18876" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1524899487335" expanded="true" signature="18996:19173" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1524899487335" expanded="true" signature="19268:19527" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524899487335" expanded="true" signature="19579:19895" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1524899487335" expanded="true" signature="20059:20807" ph="select repor... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="20971:21715" ph="select deal_... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="21860:22608" ph="select repor... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="25604:27748" ph="SELECT * FRO... id" />
<marker date="1524899487335" expanded="true" signature="25627:27617" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="27946:29153" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="29214:29429" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="29508:29577" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1524899487335" expanded="true" signature="29637:29721" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="29780:29891" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="30797:30848" ph="delete from ct_bbtc_report... " />
</folding>
</state>
</provider>
</entry>
</file>
<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="215">
<caret line="638" column="56" lean-forward="false" selection-start-line="638" selection-start-column="43" selection-end-line="638" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorkbenchController.java" pinned="false" current-in-tab="false">
<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="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>
</provider>
</entry>
</file>
<file leaf-file-name="WorkbenchService.java" pinned="false" current-in-tab="false">
<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="-507">
<caret line="139" column="49" lean-forward="false" selection-start-line="139" selection-start-column="41" selection-end-line="139" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="reportDetail.jsp" pinned="false" current-in-tab="false">
<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="-819">
<caret line="50" column="36" lean-forward="false" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="149" column="15" lean-forward="true" selection-start-line="149" selection-start-column="15" selection-end-line="149" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="62" column="23" lean-forward="false" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="reportTrack.jsp" pinned="false" current-in-tab="false">
<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="315">
<caret line="473" column="80" lean-forward="false" selection-start-line="473" selection-start-column="72" selection-end-line="473" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="reportQyList.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="54" column="38" lean-forward="true" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -196,36 +82,36 @@
</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>42</find>
<find>getTransferName</find>
<find>exchangeType</find>
<find>addReport</find>
<find>处理人</find>
<find>NOTICE</find>
<find>selectBySendToId</find>
<find>findReportNotice</find>
<find>举报不是</find>
<find>export</find>
<find>selectType</find>
<find>btnExport</find>
<find>t_left</find>
<find>reportSource</find>
<find>32</find>
<find>46</find>
<find>48</find>
<find>v</find>
<find>supplementArea</find>
<find>30</find>
<find>34</find>
<find>56</find>
<find>updateExchangeUser</find>
<find>findUser</find>
<find>deliverList</find>
<find>oaname</find>
<find>getChooseReportList</find>
<find>recordEmail</find>
<find>发邮件</find>
<find>page</find>
<find>处理结论</find>
<find>conclusion</find>
<find>showDone</find>
<find>form</find>
<find>处理结果</find>
<find>btnSubmit</find>
<find>vi</find>
<find>view</find>
<find>addTrack</find>
<find>updateConclusion</find>
<find>btnClose</find>
<find>conclusion</find>
<find>查看</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -287,7 +173,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
......@@ -295,16 +180,17 @@
<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/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<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/java/com/ejweb/modules/report/web/ReportToWordController.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/reportDeliver.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/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/resources/mappings/modules/report/ReportDao.xml" />
</list>
</option>
</component>
......@@ -357,6 +243,109 @@
<option name="width" value="683" />
<option name="height" value="719" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Android</id>
</State>
<State>
<id>Android &gt; Lint &gt; Correctness</id>
</State>
<State>
<id>Android Lint for Kotlin</id>
</State>
<State>
<id>CSS</id>
</State>
<State>
<id>Class structureJava</id>
</State>
<State>
<id>Code maturity issuesJava</id>
</State>
<State>
<id>CorrectnessLintAndroid</id>
</State>
<State>
<id>Google Web Toolkit issues</id>
</State>
<State>
<id>Groovy</id>
</State>
<State>
<id>Invalid elementsCSS</id>
</State>
<State>
<id>JSP Inspections</id>
</State>
<State>
<id>JUnit issuesJava</id>
</State>
<State>
<id>Java</id>
</State>
<State>
<id>Java 5Java language level migration aidsJava</id>
</State>
<State>
<id>Java 7Java language level migration aidsJava</id>
</State>
<State>
<id>Java 8Java language level migration aidsJava</id>
</State>
<State>
<id>Java language level migration aidsJava</id>
</State>
<State>
<id>Javadoc issuesJava</id>
</State>
<State>
<id>LintAndroid</id>
</State>
<State>
<id>Numeric issuesJava</id>
</State>
<State>
<id>OtherGroovy</id>
</State>
<State>
<id>Play</id>
</State>
<State>
<id>Security issuesJava</id>
</State>
<State>
<id>Spring</id>
</State>
<State>
<id>Spring AOPSpring</id>
</State>
<State>
<id>Spring CoreSpring</id>
</State>
<State>
<id>TestNGJava</id>
</State>
<State>
<id>Threading issuesJava</id>
</State>
<State>
<id>XMLSpring CoreSpring</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Android</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="1" id="Add" />
</component>
......@@ -490,12 +479,7 @@
<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" />
<item name="web" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
......@@ -503,6 +487,7 @@
<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" />
......@@ -511,6 +496,7 @@
<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" />
......@@ -526,9 +512,7 @@
<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" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
......@@ -536,6 +520,7 @@
<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" />
......@@ -544,17 +529,63 @@
<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" />
......@@ -562,6 +593,9 @@
<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" />
......@@ -570,6 +604,9 @@
<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" />
......@@ -579,6 +616,9 @@
<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" />
......@@ -589,6 +629,9 @@
<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" />
......@@ -600,6 +643,8 @@
<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" />
......@@ -612,6 +657,7 @@
<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" />
......@@ -630,16 +676,16 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="settings.editor.selected.configurable" value="configurable.group.build" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="255" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="269" />
......@@ -657,7 +703,7 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1036" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
......@@ -891,7 +937,7 @@
<option name="LOCAL" value="false" />
</RunnerSettings>
</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">
<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="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
......@@ -1498,14 +1544,9 @@
<workItem from="1524823611286" duration="3249000" />
<workItem from="1524831971699" duration="5696000" />
<workItem from="1524879498814" duration="1643000" />
<workItem from="1524881233087" duration="16804000" />
</task>
<task id="LOCAL-00064" summary="评论的星星">
<created>1498705224201</created>
<option name="number" value="00064" />
<option name="presentableId" value="LOCAL-00064" />
<option name="project" value="LOCAL" />
<updated>1498705224201</updated>
<workItem from="1524881233087" duration="21635000" />
<workItem from="1525073630025" duration="9527000" />
<workItem from="1525230668972" duration="12448000" />
</task>
<task id="LOCAL-00065" summary="修改导出字段">
<created>1498721349526</created>
......@@ -1843,11 +1884,18 @@
<option name="project" value="LOCAL" />
<updated>1524795296469</updated>
</task>
<option name="localTasksCounter" value="113" />
<task id="LOCAL-00113" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1524907215035</created>
<option name="number" value="00113" />
<option name="presentableId" value="LOCAL-00113" />
<option name="project" value="LOCAL" />
<updated>1524907215035</updated>
</task>
<option name="localTasksCounter" value="114" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="569023000" />
<option name="totallyTimeSpent" value="595829000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1871,7 +1919,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.4184514" 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.42668864" 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" />
......@@ -1885,6 +1933,7 @@
<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="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" />
......@@ -1894,7 +1943,6 @@
<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="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" />
......@@ -1913,7 +1961,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.4184514" 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.29159802" 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" />
......@@ -2015,16 +2063,22 @@
<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/ReportToWordController.java</url>
<line>410</line>
<url>file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java</url>
<line>516</line>
<properties />
<option name="timeStamp" value="189" />
<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="195" />
<option name="time" value="217" />
</breakpoint-manager>
<watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
......@@ -2053,48 +2107,6 @@
</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="9675">
<caret line="387" column="48" lean-forward="false" selection-start-line="387" selection-start-column="42" selection-end-line="387" selection-end-column="48" />
</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/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/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>
......@@ -2128,13 +2140,6 @@
</state>
</provider>
</entry>
<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="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/java/com/ejweb/modules/sys/utils/UserUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
......@@ -2149,20 +2154,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="63" column="33" lean-forward="false" selection-start-line="63" selection-start-column="25" selection-end-line="63" selection-end-column="33" />
</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="193">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
......@@ -2170,13 +2161,6 @@
</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="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/mobile/modules/sys/sysLogin.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-950">
......@@ -2275,178 +2259,264 @@
</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>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8018">
<caret line="345" column="17" lean-forward="false" selection-start-line="345" selection-start-column="17" selection-end-line="345" selection-end-column="17" />
<folding />
</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="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">
<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>
</provider>
</entry>
<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="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>
</provider>
</entry>
<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="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" />
<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">
<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>
</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">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<caret line="36" column="27" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="27" />
</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/dao/ReportNoticeMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="26" column="31" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="31" />
<folding>
<element signature="e#2305#2306#0" expanded="false" />
<element signature="e#2334#2335#0" expanded="false" />
<element signature="e#2378#2379#0" expanded="false" />
<element signature="e#2414#2415#0" expanded="false" />
<element signature="e#3726#3727#0" expanded="false" />
<element signature="e#3759#3760#0" expanded="false" />
<element signature="e#6862#6863#0" expanded="false" />
<element signature="e#6920#6921#0" expanded="false" />
</folding>
<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/java/com/ejweb/modules/report/entity/ReportExchangeHistory.java">
<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="-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" />
<state relative-caret-position="50">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<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="8018">
<caret line="345" column="17" lean-forward="false" selection-start-line="345" selection-start-column="17" selection-end-line="345" selection-end-column="17" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java">
<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="-123">
<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 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/webapp/WEB-INF/views/modules/report/reportList.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="250">
<caret line="435" column="68" lean-forward="true" selection-start-line="435" selection-start-column="68" selection-end-line="435" selection-end-column="68" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeMapper.xml">
<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" />
<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/java/com/ejweb/modules/workbench/service/NoticeService.java">
<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>
</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="470">
<caret line="168" column="71" lean-forward="false" selection-start-line="168" selection-start-column="71" selection-end-line="168" selection-end-column="71" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<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="-819">
<caret line="50" column="36" lean-forward="false" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
<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" />
<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/report/web/ReportToWordController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="473" column="80" lean-forward="false" selection-start-line="473" selection-start-column="72" selection-end-line="473" selection-end-column="80" />
<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="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/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="149" column="15" lean-forward="true" selection-start-line="149" selection-start-column="15" selection-end-line="149" selection-end-column="15" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="62" column="23" lean-forward="false" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="23" />
<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" />
<folding />
</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="290">
<caret line="54" column="38" lean-forward="true" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" />
<folding />
<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" />
<folding>
<element signature="e#31709#31710#0" expanded="true" />
<element signature="e#31772#31773#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="638" column="56" lean-forward="false" selection-start-line="638" selection-start-column="43" selection-end-line="638" selection-end-column="56" />
<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" />
<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/report/reportDetail.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" />
<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>
</provider>
</entry>
<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="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" />
<folding />
</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/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-507">
<caret line="139" column="49" lean-forward="false" selection-start-line="139" selection-start-column="41" selection-end-line="139" selection-end-column="49" />
<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" />
<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="-335">
<caret line="143" column="39" lean-forward="true" selection-start-line="143" selection-start-column="39" selection-end-line="143" selection-end-column="39" />
<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" />
<folding>
<marker date="1524899487335" expanded="true" signature="1905:2115" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="2221:6336" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="6444:10495" ph="SELECT ,su.n... " />
<marker date="1524899487335" expanded="true" signature="11048:11273" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1524899487335" expanded="true" signature="11369:11564" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1524899487335" expanded="true" signature="11616:12723" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="12785:13125" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1524899487335" expanded="true" signature="13176:13772" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="13833:13923" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="14014:16943" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524899487335" expanded="true" signature="17042:17460" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17125:17202" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17290:17367" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17537:17655" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524899487335" expanded="true" signature="17735:17846" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1524899487335" expanded="true" signature="17904:18394" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1524899487335" expanded="true" signature="18455:18876" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1524899487335" expanded="true" signature="18996:19173" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1524899487335" expanded="true" signature="19268:19527" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524899487335" expanded="true" signature="19579:19895" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1524899487335" expanded="true" signature="20059:20807" ph="select repor... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="20971:21715" ph="select deal_... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="21860:22608" ph="select repor... ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="25604:27748" ph="SELECT * FRO... id" />
<marker date="1524899487335" expanded="true" signature="25627:27617" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="27946:29153" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524899487335" expanded="true" signature="29214:29429" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="29508:29577" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1524899487335" expanded="true" signature="29637:29721" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="29780:29891" ph="UPDATE ct_bbtc_report... " />
<marker date="1524899487335" expanded="true" signature="30797:30848" ph="delete from ct_bbtc_report... " />
<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... " />
</folding>
</state>
</provider>
......@@ -2493,7 +2563,7 @@
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<last-edited>1.8 (1)</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
......
report_sunac.iml
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
......@@ -222,4 +222,13 @@ public interface ReportDao extends CrudDao<ReportEntity> {
*/
public int deleteConclusion(ReportEntity reportEntity);
/**
* 删除举报信息
*
* @param reportEntity
* @return
*/
public int deleteNotice(ReportEntity reportEntity);
}
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -54,6 +54,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String lStatus; //关闭修改状态
private String isAdmin; //是否管理员
private String oaarea; //账号区域
public String getOaarea() {
return oaarea;
}
......@@ -63,7 +64,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
}
public String getIsAdmin() {
return isAdmin;
}
......@@ -81,7 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
}
// private String ifDone; //是否完成
//
//
......@@ -100,6 +99,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportProject() {
return reportProject;
}
@ExcelField(title = "OA账号", align = 2, sort = 26)
public String getOaname() {
return oaname;
......@@ -152,6 +152,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportPersonTel() {
return reportPersonTel;
}
@ExcelField(title = "举报途径", align = 2, sort = 36)
public String getReportSource() {
return reportSource;
......@@ -262,7 +263,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealResult = dealResult;
}
@ExcelField(title = "移交部门", align = 2, sort =44)
@ExcelField(title = "移交部门", align = 2, sort = 44)
public String getTransferDepartment() {
return transferDepartment;
}
......@@ -276,7 +277,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealPersonName = dealPersonName;
}
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getExchangeAfterUser() {
return exchangeAfterUser;
}
......@@ -361,7 +362,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types;
}
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getTransferName() {
return transferName;
}
......@@ -370,7 +371,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName;
}
@ExcelField(title = "IP来源", align = 2, sort =54)
@ExcelField(title = "IP来源", align = 2, sort = 54)
public String getReportIp() {
return reportIp;
}
......@@ -388,7 +389,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity;
}
@ExcelField(title = "邮件发送", align = 2, sort =58)
@ExcelField(title = "邮件发送", align = 2, sort = 58)
public String getIsSendEmail() {
return isSendEmail;
}
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -444,7 +444,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} else {
TransferDepartment = "";
}
report.setTransferName(TransferDepartment);
report.setTransferDepartment(TransferDepartment);
//举报途径
String reportSource = report.getReportSource();
if (StringUtils.isNotBlank(reportSource)) {
......@@ -468,7 +468,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} else {
reportSource = "";
}
report.setReportStatus(reportSource);
report.setReportSource(reportSource);
//状态
String reportStatus = report.getReportStatus();
if (StringUtils.isNotBlank(reportStatus)) {
......@@ -781,7 +781,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
*/
@Transactional(readOnly = false)
public int deleteConclusion(ReportEntity reportEntity) {
reportDao.deleteNotice(reportEntity);
return reportDao.deleteConclusion(reportEntity);
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -387,6 +387,41 @@ public class ReportController extends BaseController {
if (count != 0) {
result = count.toString();
}
if (StringUtils.isNotBlank(reportEntity.getTransferDepartment())) {
if (reportEntity.getTransferDepartment().equals("1")) {
reportEntity.setTransferDepartment("营销");
} else if (reportEntity.getTransferDepartment().equals("2")) {
reportEntity.setTransferDepartment("工程");
} else if (reportEntity.getTransferDepartment().equals("3")) {
reportEntity.setTransferDepartment("成本");
} else if (reportEntity.getTransferDepartment().equals("4")) {
reportEntity.setTransferDepartment("招采");
} else if (reportEntity.getTransferDepartment().equals("5")) {
reportEntity.setTransferDepartment("财务");
} else if (reportEntity.getTransferDepartment().equals("6")) {
reportEntity.setTransferDepartment("法务");
} else if (reportEntity.getTransferDepartment().equals("7")) {
reportEntity.setTransferDepartment("行政");
} else if (reportEntity.getTransferDepartment().equals("8")) {
reportEntity.setTransferDepartment("人力");
} else if (reportEntity.getTransferDepartment().equals("9")) {
reportEntity.setTransferDepartment("开发");
} else if (reportEntity.getTransferDepartment().equals("10")) {
reportEntity.setTransferDepartment("研发");
} else if (reportEntity.getTransferDepartment().equals("11")) {
reportEntity.setTransferDepartment("投资");
} else if (reportEntity.getTransferDepartment().equals("12")) {
reportEntity.setTransferDepartment("其他");
} else if (reportEntity.getTransferDepartment().equals("13")) {
reportEntity.setTransferDepartment("物业管理");
} else if (reportEntity.getTransferDepartment().equals("14")) {
reportEntity.setTransferDepartment("酒店管理");
} else if (reportEntity.getTransferDepartment().equals("15")) {
reportEntity.setTransferDepartment("商业管理");
}
}
model.addAttribute("isAdmin", isAdmin);
model.addAttribute("report", reportEntity);
model.addAttribute("reportAttachmentList", reportAttachmentList);
......@@ -478,8 +513,18 @@ public class ReportController extends BaseController {
@RequestMapping(value = "addTrack")
public String addTrack(ReportEntity reportEntity, HttpServletRequest request, Model
model, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
String ifDone = request.getParameter("ifDone"); // 是否完成
// String transferUser = "";
// if (StringUtils.isBlank(request.getParameter("exchangeAfterUser")) && reportEntity.getReportStatus().equals("0")) {
// transferUser = reportEntity.getExchangeBeforeUser();
// } else if (StringUtils.isNotBlank(request.getParameter("exchangeAfterUser"))) {
String transferUser = request.getParameter("exchangeAfterUser"); //选择移交人员
// }
if (!beanValidator(model, reportEntity)) {
return form(reportEntity, model);
}
......@@ -605,6 +650,16 @@ public class ReportController extends BaseController {
out.close();
}
/**
* 集团列表导出
*
* @param reportEntity
* @param flag
* @param request
* @param response
* @param redirectAttributes
* @return
*/
@RequestMapping(value = "export", method = RequestMethod.POST)
public String export(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
......@@ -650,6 +705,61 @@ public class ReportController extends BaseController {
}
/**
* 区域列表导出
*
* @param reportEntity
* @param flag
* @param request
* @param response
* @param redirectAttributes
* @return
*/
@RequestMapping(value = "qyexport", method = RequestMethod.POST)
public String qyexport(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
if (!isAdmin) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = null;
if (!reportService.checkRole(user)) {
reportList = reportService.getReportQyList(reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportList = reportService.getReportQyList(reportEntity);
}
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息：" + e.getMessage());
}
return "redirect:" + adminPath + "/report/list/?repage&flag=" + flag;
}
/**
* 转交列表
*
* @param reportEntity
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -727,7 +727,13 @@
<update id="updateConclusion">
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result = #{lStatus}
deal_result = #{dealResult},
<if test="transferDepartment =='6'">
transfer_department = #{transferDepartment}
</if>
<if test="transferDepartment !='6'">
transfer_department = ''
</if>
WHERE id = #{id}
</update>
......@@ -754,4 +760,9 @@
delete from ct_bbtc_report
where id = #{id}
</delete>
<delete id="deleteNotice">
delete from CT_BBTC_REPORT_NOTICE
where report_id = #{id}
</delete>
</mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -46,7 +46,7 @@
} else if (dealResult == "4") {
dealResult = "举报属实";
} else if (dealResult == "5") {
dealResult = "举报不是";
dealResult = "举报不实";
} else if (dealResult == "6") {
dealResult = "移交其他部门";
}
......@@ -78,6 +78,17 @@
top.$.jBox.tip('正在加载，请稍等', 'warning');
}
}
//显示是否完成选择框
function showDone() {
var dealResult = $("#dealResult").val();
if (dealResult == "6") {
$("#selectType").show();
} else {
$("#selectType").hide();
}
}
</script>
<style type="text/css">
.title {
......@@ -241,13 +252,38 @@
<div class="control-group">
<label class="control-label">处理结论:</label>
<div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="lStatus" class="input-small">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="dealResult" path="dealResult"
class="input-small"
onchange="showDone();">
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></c:if>
<c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path="dealResult"
<c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path=""
value="${report.dealResult}"
htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if>
</div>
<div id="selectType" class="control-group" style="display:none">
<label class="control-label">移交部门:</label>
<div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="" path="transferDepartment"
class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></c:if>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<c:if test="${report.dealResult eq '6'}">
<div id="transferDepartmentid" class="control-group">
<label class="control-label">移交部门:</label>
<div class="controls">
<form:input id="transferDepartment" path=""
value="${report.transferDepartment}"
htmlEscape="false" maxlength="200"
class="input-xlarge"/>
</div>
</div>
</c:if>
</div>
</c:if>
<li class="btns">
......
target/report_sunac/META-INF/MANIFEST.MF
Manifest-Version: 1.0
Built-By: dell1
Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_121
Build-Jdk: 1.8.0_171
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