Skip to content

S
sunac_report
Commit be7b7df1 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent 343f5597
Showing with 1114 additions and 534 deletions
.idea/workspace.xml
......@@ -8,32 +8,22 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/sys/entity/User.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.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/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<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/sys/userForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.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/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties" />
<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/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/jdbc.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/jdbc.properties" />
<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/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -53,11 +43,16 @@
<option name="PATCH_PATH" value="" />
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_TABLE_DETAILS" value="true" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<expand />
<select />
</component>
<component name="ErrorTreeViewConfiguration">
<option name="hideWarnings" value="true" />
......@@ -67,7 +62,130 @@
<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="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>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -78,36 +196,36 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>showDone</find>
<find>showType</find>
<find>selectTypeId</find>
<find>cl_freeze</find>
<find>reportList</find>
<find>float</find>
<find>exchangeAfterUser</find>
<find>42</find>
<find>getTransferName</find>
<find>export</find>
<find>selectType</find>
<find>btnExport</find>
<find>t_left</find>
<find>aa</find>
<find>总数</find>
<find>bordertopbordertop</find>
<find>bordertop</find>
<find>border</find>
<find>t_r_t</find>
<find>t_r</find>
<find>closed</find>
<find>rAndD</find>
<find>findUser</find>
<find>complainNum</find>
<find>getReportResult</find>
<find>addReport</find>
<find>deal_person_name</find>
<find>findList</find>
<find>reportSource</find>
<find>32</find>
<find>46</find>
<find>48</find>
<find>v</find>
<find>supplementArea</find>
<find>exchangeAfterUser</find>
<find>getReportType</find>
<find>in</find>
<find>supplementType</find>
<find>adminPath</find>
<find>report/list</find>
<find>筛选</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>form</find>
<find>处理结果</find>
<find>btnSubmit</find>
<find>addTrack</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -136,7 +254,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/conf/LDAPUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/conf/ErrorCode.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userInfo.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/LoginController.java" />
......@@ -168,22 +285,23 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.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/reportDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/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/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" />
<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/webapp/WEB-INF/views/modules/report/reportTrack.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/sys/sysIndex.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<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/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/java/com/ejweb/modules/report/web/ReportController.java" />
......@@ -257,7 +375,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -305,6 +422,86 @@
<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="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" />
</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>
......@@ -320,15 +517,18 @@
<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="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" />
<item name="WEB-INF" 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" />
......@@ -336,8 +536,6 @@
<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" />
......@@ -346,8 +544,6 @@
<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" />
......@@ -417,13 +613,27 @@
<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="web" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -1284,14 +1494,11 @@
<workItem from="1524734824263" duration="666000" />
<workItem from="1524735634001" duration="2909000" />
<workItem from="1524750128585" duration="4774000" />
<workItem from="1524793014586" duration="1832000" />
</task>
<task id="LOCAL-00063" summary="屏蔽主题">
<created>1498699323564</created>
<option name="number" value="00063" />
<option name="presentableId" value="LOCAL-00063" />
<option name="project" value="LOCAL" />
<updated>1498699323566</updated>
<workItem from="1524793014586" duration="22094000" />
<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>
......@@ -1629,11 +1836,18 @@
<option name="project" value="LOCAL" />
<updated>1522640386333</updated>
</task>
<option name="localTasksCounter" value="112" />
<task id="LOCAL-00112" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1524795296469</created>
<option name="number" value="00112" />
<option name="presentableId" value="LOCAL-00112" />
<option name="project" value="LOCAL" />
<updated>1524795296469</updated>
</task>
<option name="localTasksCounter" value="113" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="521369000" />
<option name="totallyTimeSpent" value="569023000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1653,23 +1867,23 @@
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290469" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290469" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
<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.48105437" 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.32936078" sideWeight="0.5" order="6" 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="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" />
<window_info id="Capture Analysis" 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="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="9" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29252437" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
<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.2980333" 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="9" 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="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="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" />
......@@ -1695,24 +1909,24 @@
<window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" 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="7" 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="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290469" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
<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.48105437" 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.32936078" sideWeight="0.5" order="6" 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="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" />
<window_info id="Capture Analysis" 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="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="9" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29252437" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
<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.2980333" 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="9" 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="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" />
......@@ -1800,11 +2014,17 @@
<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/ReportToWordController.java</url>
<line>410</line>
<properties />
<option name="timeStamp" value="189" />
</line-breakpoint>
</breakpoints>
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="179" />
<option name="time" value="195" />
</breakpoint-manager>
<watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
......@@ -1824,13 +2044,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="31" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="31" />
</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">
......@@ -1861,8 +2074,8 @@
</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 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>
......@@ -1894,17 +2107,10 @@
</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">
<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="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 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>
......@@ -1915,304 +2121,336 @@
</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/java/com/ejweb/conf/GConstants.java">
<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 relative-caret-position="185">
<caret line="61" column="32" lean-forward="false" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
</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/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/conf/GConstants.java">
<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="185">
<caret line="61" column="32" lean-forward="false" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
<state relative-caret-position="193">
<caret line="132" column="23" lean-forward="false" selection-start-line="132" selection-start-column="23" selection-end-line="132" selection-end-column="23" />
</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/resources/mappings/modules/front/report/FrontReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="37" column="39" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
<state relative-caret-position="550">
<caret line="22" column="24" lean-forward="false" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="24" />
</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/core/service/CrudService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="439" column="69" lean-forward="false" selection-start-line="439" selection-start-column="69" selection-end-line="439" selection-end-column="69" />
<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/webapp/WEB-INF/views/modules/report/reportDeliver.jsp">
<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="-6682">
<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 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/webapp/WEB-INF/views/modules/report/reportForm.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="0">
<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="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/modules/workbench/notice.jsp">
<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/modules/sys/userForm.jsp">
<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="1525">
<caret line="91" column="75" lean-forward="false" selection-start-line="91" selection-start-column="75" selection-end-line="91" selection-end-column="75" />
<state relative-caret-position="-950">
<caret line="10" column="42" lean-forward="false" selection-start-line="10" selection-start-column="42" selection-end-line="10" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/UserUtils.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/logList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="132" column="23" lean-forward="false" selection-start-line="132" selection-start-column="23" selection-end-line="132" selection-end-column="23" />
<state relative-caret-position="-450">
<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/entity/User.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="49" column="34" lean-forward="false" selection-start-line="49" selection-start-column="34" selection-end-line="49" selection-end-column="34" />
<state relative-caret-position="-1718">
<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/core/persistence/CrudDao.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<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 relative-caret-position="250">
<caret line="190" column="33" lean-forward="false" selection-start-line="190" selection-start-column="33" selection-end-line="190" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/front/report/FrontReportDao.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="22" column="24" lean-forward="false" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="24" />
<state relative-caret-position="240">
<caret line="65" column="47" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring-mvc.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="725">
<caret line="290" column="23" lean-forward="true" selection-start-line="290" selection-start-column="23" selection-end-line="290" selection-end-column="23" />
<state relative-caret-position="425">
<caret line="116" column="54" lean-forward="false" selection-start-line="116" selection-start-column="54" selection-end-line="116" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<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 relative-caret-position="325">
<caret line="16" column="9" lean-forward="true" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/NoticeController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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 relative-caret-position="406">
<caret line="47" column="23" lean-forward="false" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<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 relative-caret-position="381">
<caret line="91" column="55" lean-forward="false" selection-start-line="91" selection-start-column="51" selection-end-line="91" selection-end-column="55" />
</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="-1793">
<caret line="160" column="47" lean-forward="true" selection-start-line="160" selection-start-column="47" selection-end-line="160" selection-end-column="47" />
<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/resources/mappings/modules/workbench/ReportNoticeDao.xml">
<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="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 relative-caret-position="318">
<caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
</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/front/report/api/FrontReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="158" column="38" lean-forward="false" selection-start-line="158" selection-start-column="25" selection-end-line="158" selection-end-column="38" />
<state relative-caret-position="-682">
<caret line="26" column="41" lean-forward="false" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/mobile/modules/sys/sysLogin.jsp">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-950">
<caret line="10" column="42" lean-forward="false" selection-start-line="10" selection-start-column="42" selection-end-line="10" selection-end-column="42" />
<state relative-caret-position="850">
<caret line="313" column="41" lean-forward="false" selection-start-line="313" selection-start-column="20" selection-end-line="313" selection-end-column="41" />
</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/resources/mappings/modules/sys/RoleDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1319">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="21" selection-end-line="80" selection-end-column="25" />
<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/webapp/WEB-INF/views/modules/sys/logList.jsp">
<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="-450">
<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 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" />
</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/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1068">
<caret line="127" column="38" lean-forward="false" selection-start-line="127" selection-start-column="38" selection-end-line="127" selection-end-column="38" />
<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>
</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/entity/ReportExchangeHistory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="574" column="104" lean-forward="false" selection-start-line="574" selection-start-column="91" selection-end-line="574" selection-end-column="104" />
<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/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<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="-432">
<caret line="190" column="31" lean-forward="false" selection-start-line="190" selection-start-column="31" selection-end-line="190" selection-end-column="31" />
<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/sys/userList.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="-1718">
<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 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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp">
<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="250">
<caret line="190" column="33" lean-forward="false" selection-start-line="190" selection-start-column="33" selection-end-line="190" selection-end-column="33" />
<caret line="435" column="68" lean-forward="true" selection-start-line="435" selection-start-column="68" selection-end-line="435" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/LoginController.java">
<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="240">
<caret line="65" column="47" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="47" />
<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/resources/spring-mvc.xml">
<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="425">
<caret line="116" column="54" lean-forward="false" selection-start-line="116" selection-start-column="54" selection-end-line="116" selection-end-column="54" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<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="325">
<caret line="16" column="9" lean-forward="true" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" />
<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>
<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/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1650">
<caret line="98" column="68" lean-forward="false" selection-start-line="98" selection-start-column="66" selection-end-line="98" selection-end-column="68" />
<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>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<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="3300">
<caret line="132" column="54" lean-forward="false" selection-start-line="132" selection-start-column="54" selection-end-line="132" selection-end-column="54" />
<folding>
<marker date="1524750932347" expanded="true" signature="1821:2031" ph="SELECT ,su.n... " />
<marker date="1524750932347" expanded="true" signature="2137:5853" ph="SELECT ,su.n... " />
<marker date="1524750932347" expanded="true" signature="5961:9807" ph="SELECT ,su.n... " />
<marker date="1524750932347" expanded="true" signature="10360:10585" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1524750932347" expanded="true" signature="10681:10876" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1524750932347" expanded="true" signature="10928:12034" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="12096:12436" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1524750932347" expanded="true" signature="12487:13083" ph="UPDATE ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="13144:13234" ph="UPDATE ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="13325:16254" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524750932347" expanded="true" signature="16353:16771" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524750932347" expanded="true" signature="16436:16513" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524750932347" expanded="true" signature="16601:16678" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1524750932347" expanded="true" signature="16848:16966" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1524750932347" expanded="true" signature="17046:17157" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1524750932347" expanded="true" signature="17215:17705" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1524750932347" expanded="true" signature="17766:18187" ph="UPDATE ct_bbtc_report_notice... " />
<marker date="1524750932347" expanded="true" signature="18307:18484" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1524750932347" expanded="true" signature="18579:18838" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1524750932347" expanded="true" signature="18890:19206" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1524750932347" expanded="true" signature="19370:20118" ph="select repor... ct_bbtc_report" />
<marker date="1524750932347" expanded="true" signature="20282:21026" ph="select deal_... ct_bbtc_report" />
<marker date="1524750932347" expanded="true" signature="21171:21919" ph="select repor... ct_bbtc_report" />
<marker date="1524750932347" expanded="true" signature="24981:27125" ph="SELECT * FRO... id" />
<marker date="1524750932347" expanded="true" signature="25004:26994" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524750932347" expanded="true" signature="27323:28530" ph="SELECT r.id ct_bbtc_report" />
<marker date="1524750932347" expanded="true" signature="28591:28806" ph="UPDATE ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="28885:28954" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1524750932347" expanded="true" signature="29014:29098" ph="UPDATE ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="29157:29268" ph="UPDATE ct_bbtc_report... " />
<marker date="1524750932347" expanded="true" signature="30174:30225" ph="delete from ct_bbtc_report... " />
</folding>
<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>
<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/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="28" column="48" lean-forward="false" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
<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>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.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="6750">
<caret line="270" column="92" lean-forward="false" selection-start-line="270" selection-start-column="92" selection-end-line="270" selection-end-column="92" />
<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>
<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="4000">
<caret line="187" column="20" lean-forward="false" selection-start-line="187" selection-start-column="20" selection-end-line="187" selection-end-column="20" />
<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>
<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/workbench/web/WorkbenchController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="35" column="14" lean-forward="true" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
<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/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>
<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>
</component>
<component name="masterDetails">
<states>
......
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -52,26 +52,25 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String transferName; //移交给
private String dealPerson;
private String lStatus; //关闭修改状态
//是否管理员
private String isAdmin;
public String getIsAdmin() {
return isAdmin;
private String isAdmin; //是否管理员
private String oaarea; //账号区域
public String getOaarea() {
return oaarea;
}
public void setIsAdmin(String isAdmin) {
this.isAdmin = isAdmin;
public void setOaarea(String oaarea) {
this.oaarea = oaarea;
}
public String getTransferDepartment() {
return transferDepartment;
}
public void setTransferDepartment(String transferDepartment) {
this.transferDepartment = transferDepartment;
public String getIsAdmin() {
return isAdmin;
}
public void setIsAdmin(String isAdmin) {
this.isAdmin = isAdmin;
}
public String getlStatus() {
return lStatus;
......@@ -82,13 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
}
public String getOaname() {
return oaname;
}
public void setOaname(String oaname) {
this.oaname = oaname;
}
// private String ifDone; //是否完成
//
......@@ -108,6 +100,14 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportProject() {
return reportProject;
}
@ExcelField(title = "OA账号", align = 2, sort = 26)
public String getOaname() {
return oaname;
}
public void setOaname(String oaname) {
this.oaname = oaname;
}
public void setReportProject(String reportProject) {
this.reportProject = reportProject;
......@@ -121,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportCity = reportCity;
}
@ExcelField(title = "举报时间", align = 2, sort = 34)
@ExcelField(title = "举报时间", align = 2, sort = 38)
public String getReportTime() {
return reportTime;
}
......@@ -130,7 +130,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportTime = reportTime;
}
@ExcelField(title = "举报内容", align = 2, sort = 44)
@ExcelField(title = "举报内容", align = 2, sort = 50)
public String getReportContent() {
return reportContent;
}
......@@ -139,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportContent = reportContent;
}
@ExcelField(title = "举报人", align = 2, sort = 26)
@ExcelField(title = "举报人", align = 2, sort = 28)
public String getReportPersonName() {
return reportPersonName;
}
......@@ -148,10 +148,19 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonName = reportPersonName;
}
@ExcelField(title = "举报人电话", align = 2, sort = 28)
@ExcelField(title = "举报人电话", align = 2, sort = 30)
public String getReportPersonTel() {
return reportPersonTel;
}
@ExcelField(title = "举报途径", align = 2, sort = 36)
public String getReportSource() {
return reportSource;
}
public void setReportSource(String reportSource) {
this.reportSource = reportSource;
}
public void setReportPersonTel(String reportPersonTel) {
this.reportPersonTel = reportPersonTel;
......@@ -165,15 +174,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonEmail = reportPersonEmail;
}
public String getReportSource() {
return reportSource;
}
public void setReportSource(String reportSource) {
this.reportSource = reportSource;
}
@ExcelField(title = "状态", align = 2, sort = 36)
@ExcelField(title = "状态", align = 2, sort = 40)
public String getReportStatus() {
return reportStatus;
}
......@@ -198,7 +200,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementDepartment = supplementDepartment;
}
@ExcelField(title = "被举报人", align = 2, sort = 32)
@ExcelField(title = "被举报人", align = 2, sort = 34)
public String getSupplementInformant() {
return supplementInformant;
}
......@@ -225,7 +227,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementType = supplementType;
}
@ExcelField(title = "区域", align = 2, sort = 30)
@ExcelField(title = "区域", align = 2, sort = 32)
public String getSupplementArea() {
return supplementArea;
}
......@@ -242,7 +244,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementProject = supplementProject;
}
@ExcelField(title = "举报信息补充内容", align = 2, sort = 46)
@ExcelField(title = "举报信息补充内容", align = 2, sort = 52)
public String getSupplementContent() {
return supplementContent;
}
......@@ -251,16 +253,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementContent = supplementContent;
}
@ExcelField(title = "处理人", align = 2, sort = 40)
public String getDealPersonName() {
return dealPersonName;
}
public void setDealPersonName(String dealPersonName) {
this.dealPersonName = dealPersonName;
}
@ExcelField(title = "处理结论", align = 2, sort = 38)
@ExcelField(title = "处理结论", align = 2, sort = 42)
public String getDealResult() {
return dealResult;
}
......@@ -269,14 +262,21 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealResult = dealResult;
}
public String getExchangeBeforeUser() {
return exchangeBeforeUser;
@ExcelField(title = "移交部门", align = 2, sort =44)
public String getTransferDepartment() {
return transferDepartment;
}
public void setExchangeBeforeUser(String exchangeBeforeUser) {
this.exchangeBeforeUser = exchangeBeforeUser;
@ExcelField(title = "处理人", align = 2, sort = 46)
public String getDealPersonName() {
return dealPersonName;
}
public void setDealPersonName(String dealPersonName) {
this.dealPersonName = dealPersonName;
}
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getExchangeAfterUser() {
return exchangeAfterUser;
}
......@@ -285,6 +285,18 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.exchangeAfterUser = exchangeAfterUser;
}
public void setTransferDepartment(String transferDepartment) {
this.transferDepartment = transferDepartment;
}
public String getExchangeBeforeUser() {
return exchangeBeforeUser;
}
public void setExchangeBeforeUser(String exchangeBeforeUser) {
this.exchangeBeforeUser = exchangeBeforeUser;
}
public String getExchangeType() {
return exchangeType;
}
......@@ -349,7 +361,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types;
}
@ExcelField(title = "移交给", align = 2, sort = 42)
public String getTransferName() {
return transferName;
}
......@@ -358,7 +370,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName;
}
@ExcelField(title = "IP来源", align = 2, sort = 48)
@ExcelField(title = "IP来源", align = 2, sort =54)
public String getReportIp() {
return reportIp;
}
......@@ -367,7 +379,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportIp = reportIp;
}
@ExcelField(title = "IP所属城市", align = 2, sort = 50)
@ExcelField(title = "IP所属城市", align = 2, sort = 56)
public String getIpCity() {
return ipCity;
}
......@@ -376,7 +388,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity;
}
@ExcelField(title = "邮件发送", align = 2, sort = 48)
@ExcelField(title = "邮件发送", align = 2, sort =58)
public String getIsSendEmail() {
return isSendEmail;
}
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -358,7 +358,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}
/**
* 查询举报列表
* 查询集团举报列表
*
* @param reportEntity
* @return
......@@ -379,21 +379,227 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} else if (value.equals("4")) {
value = "招采";
} else if (value.equals("5")) {
value = "人力";
value = "财务";
} else if (value.equals("6")) {
value = "物业";
value = "法务";
} else if (value.equals("7")) {
value = "投诉";
} else if (value.equals("8")) {
value = "行政";
} else if (value.equals("8")) {
value = "人力";
} else if (value.equals("9")) {
value = "财务";
value = "开发";
} else if (value.equals("10")) {
value = "商业管理";
value = "研发";
} else if (value.equals("11")) {
value = "投资";
} else if (value.equals("12")) {
value = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
}
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.setTransferName(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.setReportStatus(reportSource);
//状态
String reportStatus = report.getReportStatus();
if (StringUtils.isNotBlank(reportStatus)) {
if (reportStatus.equals("0")) {
reportStatus = "未处理";
} else if (reportStatus.equals("1")) {
reportStatus = "跟踪中";
} else if (reportStatus.equals("2")) {
reportStatus = "已处理";
} else if (reportStatus.equals("3")) {
reportStatus = "已关闭";
}
} else {
reportStatus = "";
}
report.setReportStatus(reportStatus);
String dealResult = report.getDealResult();
if (StringUtils.isNotBlank(dealResult)) {
if (dealResult.equals("1")) {
dealResult = "移交客诉";
} else if (dealResult.equals("2")) {
dealResult = "举报无效";
} else if (dealResult.equals("3")) {
dealResult = "举报受理";
} else if (dealResult.equals("4")) {
dealResult = "举报属实";
} else if (dealResult.equals("5")) {
dealResult = "举报不实";
} else if (dealResult.equals("6")) {
dealResult = "移交其他部门";
}
} else {
dealResult = "--";
}
report.setDealResult(dealResult);
String supplementArea = report.getSupplementArea();
if (StringUtils.isNotBlank(supplementArea)) {
if (supplementArea.equals("North China")) {
supplementArea = "华北区域公司";
} else if (supplementArea.equals("BeiJing")) {
supplementArea = "北京区域公司";
} else if (supplementArea.equals("ShangHai")) {
supplementArea = "上海区域公司";
} else if (supplementArea.equals("SouthWest")) {
supplementArea = "西南区域公司";
} else if (supplementArea.equals("SouthEast")) {
supplementArea = "东南区域公司";
} else if (supplementArea.equals("Central China")) {
supplementArea = "华中区域公司";
} else if (supplementArea.equals("GuangShen")) {
supplementArea = "广深区域公司";
} else if (supplementArea.equals("Hainan")) {
supplementArea = "海南区域公司";
} else if (supplementArea.equals("Group")) {
supplementArea = "集团本部";
}
} else {
supplementArea = "--";
}
report.setSupplementArea(supplementArea);
report.setSupplementInformant(report.getSupplementInformant() == null ? "--" : report.getSupplementInformant());
report.setDealPersonName(report.getDealPersonName() == null ? "--" : report.getDealPersonName());
User user = UserUtils.getUser();
if (this.checkRole(user)) {
if (StringUtils.isBlank(report.getTransferName()) || StringUtils.isBlank(report.getExchangeType())) {
report.setTransferName("--");
} else if (StringUtils.isNotBlank(report.getTransferName()) && StringUtils.isNotBlank(report.getExchangeType())) {
report.setTransferName(report.getTransferName());
}
} else {
report.setTransferName("");
}
report.setReportIp(report.getReportIp() == null ? "--" : report.getReportIp());
report.setIpCity(report.getIpCity() == null ? "--" : report.getIpCity());
String isSendEmail = report.getIsSendEmail();
if (StringUtils.isNotBlank(isSendEmail)) {
if (isSendEmail.equals("1")) {
isSendEmail = "是";
}
} else {
isSendEmail = "否";
}
report.setIsSendEmail(isSendEmail);
}
return reportList;
}
/**
* 查询区域举报列表
*
* @param reportEntity
* @return
*/
public List<ReportEntity> getReportQyList(ReportEntity reportEntity) {
List<ReportEntity> reportList = reportDao.findQyList(reportEntity);
for (ReportEntity report : reportList) {
String typeStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "营销";
} else if (value.equals("2")) {
value = "工程";
} else if (value.equals("3")) {
value = "成本";
} else if (value.equals("4")) {
value = "招采";
} else if (value.equals("5")) {
value = "财务";
} else if (value.equals("6")) {
value = "法务";
} else if (value.equals("7")) {
value = "行政";
} else if (value.equals("8")) {
value = "人力";
} else if (value.equals("9")) {
value = "开发";
} else if (value.equals("10")) {
value = "研发";
} else if (value.equals("11")) {
value = "投资";
} else if (value.equals("12")) {
value = "投资开发";
value = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
}
......@@ -425,7 +631,12 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
dealResult = "举报受理";
} else if (dealResult.equals("4")) {
dealResult = "举报属实";
} else if (dealResult.equals("5")) {
dealResult = "举报不实";
} else if (dealResult.equals("6")) {
dealResult = "移交其他部门";
}
} else {
dealResult = "--";
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -94,33 +94,16 @@ public class ReportController extends BaseController {
if (!reportService.checkRole(user)) {
page = reportService.findPage(page, reportEntity);
} else {
reportEntity.setIsAdmin("1");
reportEntity.setIsAdmin(user.getId());
page = reportService.findPage(page, reportEntity);
}
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist) {
String typeStr = "";
String departmentStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "地产";
} else if (value.equals("2")) {
value = "物业管理";
} else if (value.equals("3")) {
value = "酒店管理";
} else if (value.equals("4")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
}
report.setSupplementType(typeStr.substring(0, typeStr.length() - 1));
}
if (StringUtils.isNoneBlank(report.getTransferDepartment())) {
String[] types = report.getTransferDepartment().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "营销";
} else if (value.equals("2")) {
value = "工程";
......@@ -156,6 +139,35 @@ public class ReportController extends BaseController {
report.setSupplementType(departmentStr.substring(0, departmentStr.length() - 1));
}
}
String value = "";
for (ReportEntity report : reportlist) {
if (StringUtils.isNoneBlank(report.getOaarea())) {
if (report.getOaarea().equals("North China")) {
value = "华北区域公司";
} else if (report.getOaarea().equals("BeiJing")) {
value = "北京区域公司";
} else if (report.getOaarea().equals("ShangHai")) {
value = "上海区域公司";
} else if (report.getOaarea().equals("SouthWest")) {
value = "西南区域公司";
} else if (report.getOaarea().equals("SouthEast")) {
value = "东南区域公司";
} else if (report.getOaarea().equals("Central China")) {
value = "华中区域公司";
} else if (report.getOaarea().equals("GuangShen")) {
value = "广深区域公司";
} else if (report.getOaarea().equals("Hainan")) {
value = "海南区域公司";
} else if (report.getOaarea().equals("Group")) {
value = "集团本部";
}
if (StringUtils.isNoneBlank(report.getOaname())) {
report.setOaname(value + "-" + report.getOaname());
}
}
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
model.addAttribute("page", page);
......@@ -219,22 +231,6 @@ public class ReportController extends BaseController {
String[] types = report.getSupplementType().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "地产";
} else if (value.equals("2")) {
value = "物业管理";
} else if (value.equals("3")) {
value = "酒店管理";
} else if (value.equals("4")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
}
report.setSupplementType(typeStr.substring(0, typeStr.length() - 1));
}
if (StringUtils.isNoneBlank(report.getTransferDepartment())) {
String[] types = report.getTransferDepartment().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "营销";
} else if (value.equals("2")) {
value = "工程";
......@@ -270,6 +266,33 @@ public class ReportController extends BaseController {
report.setSupplementType(departmentStr.substring(0, departmentStr.length() - 1));
}
}
String value = "";
for (ReportEntity report : reportlist) {
if (StringUtils.isNoneBlank(report.getOaarea())) {
if (report.getOaarea().equals("North China")) {
value = "华北区域公司";
} else if (report.getOaarea().equals("BeiJing")) {
value = "北京区域公司";
} else if (report.getOaarea().equals("ShangHai")) {
value = "上海区域公司";
} else if (report.getOaarea().equals("SouthWest")) {
value = "西南区域公司";
} else if (report.getOaarea().equals("SouthEast")) {
value = "东南区域公司";
} else if (report.getOaarea().equals("Central China")) {
value = "华中区域公司";
} else if (report.getOaarea().equals("GuangShen")) {
value = "广深区域公司";
} else if (report.getOaarea().equals("Hainan")) {
value = "海南区域公司";
} else if (report.getOaarea().equals("Group")) {
value = "集团本部";
}
if (StringUtils.isNoneBlank(report.getOaname())) {
report.setOaname(value + "-" + report.getOaname());
}
}
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
model.addAttribute("page", page);
......@@ -329,7 +352,7 @@ public class ReportController extends BaseController {
reportAttachment.setAttachmentType("0");
if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
String supplementType = "";
String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "其他", "物业管理", "酒店管理", "商业管理"};
String typeNumber[] = reportEntity.getSupplementType().split(",");
for (int i = 0; i < typeNumber.length; i++) {
supplementType += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
......@@ -410,7 +433,7 @@ public class ReportController extends BaseController {
//业务类型
String supplementTypeStr = "";
if (StringUtils.isNotBlank(reportEntity.getSupplementType())) {
String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "其他", "物业管理", "酒店管理", "商业管理"};
String typeNumber[] = reportEntity.getSupplementType().split(",");
for (int i = 0; i < typeNumber.length; i++) {
supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
......@@ -475,7 +498,7 @@ public class ReportController extends BaseController {
String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
reportEntity.setExchangeAfterUser(exchangeAfterUser);
}
if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2") || reportEntity.getDealResult().equals("4")
if (reportEntity.getDealResult().equals("6") || reportEntity.getDealResult().equals("6") || reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2") || reportEntity.getDealResult().equals("4")
|| (reportEntity.getDealResult().equals("3") && StringUtils.isNotBlank(ifDone))) {
if (StringUtils.isBlank(reportEntity.getDealPersonName())) {
reportEntity.setDealPersonName(reportEntity.getDealPerson());
......@@ -597,6 +620,12 @@ public class ReportController extends BaseController {
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())) {
......@@ -605,7 +634,13 @@ public class ReportController extends BaseController {
}
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = reportService.getReportList(reportEntity);
List<ReportEntity> reportList = null;
if (!reportService.checkRole(user)) {
reportList = reportService.getReportList(reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportList = reportService.getReportList(reportEntity);
}
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
......@@ -632,22 +667,48 @@ public class ReportController extends BaseController {
reportEntity.setExchangeAfterUser(user.getId());
}
Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
User userEntity = new User();
//查询分配用户
Page<User> userPage = reportService.findUserPage(new Page<User>(1, 20), userEntity);
//查询移交数据
Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist) {
String typeStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "地产";
value = "营销";
} else if (value.equals("2")) {
value = "物业管理";
value = "工程";
} else if (value.equals("3")) {
value = "酒店管理";
value = "成本";
} else if (value.equals("4")) {
value = "招采";
} else if (value.equals("5")) {
value = "财务";
} else if (value.equals("6")) {
value = "法务";
} else if (value.equals("7")) {
value = "行政";
} else if (value.equals("8")) {
value = "人力";
} else if (value.equals("9")) {
value = "开发";
} else if (value.equals("10")) {
value = "研发";
} else if (value.equals("11")) {
value = "投资";
} else if (value.equals("12")) {
value = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
......
src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
......@@ -271,21 +271,27 @@ public class ReportToWordController {
} else if (value.equals("4")) {
value = "招采";
} else if (value.equals("5")) {
value = "人力";
value = "财务";
} else if (value.equals("6")) {
value = "物业";
value = "法务";
} else if (value.equals("7")) {
value = "投诉";
} else if (value.equals("8")) {
value = "行政";
} else if (value.equals("8")) {
value = "人力";
} else if (value.equals("9")) {
value = "财务";
value = "开发";
} else if (value.equals("10")) {
value = "商业管理";
} else if (value.equals("11")) {
value = "研发";
} else if (value.equals("11")) {
value = "投资";
} else if (value.equals("12")) {
value = "投资开发";
value = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
}
typeStr = typeStr + value + ",";
supplement_type = typeStr.substring(0, typeStr.length() - 1);
......@@ -411,6 +417,10 @@ public class ReportToWordController {
deal_result = "举报受理";
} else if (deal_result.equals("4")) {
deal_result = "举报属实";
} else if (deal_result.equals("5")) {
deal_result = "举报不实";
} else if (deal_result.equals("6")) {
deal_result = "移交其他部门";
}
} else {
deal_result = "";
......
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -91,45 +91,42 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
workbench.setRepStatusTotal(workbench.getUnProcess() + workbench.getProcessing() + workbench.getProcessed() + workbench.getClosed());
List<HashMap> types = reportDao.getReportType(workbench);
for (HashMap type : types) {
// //营销
// Object sale = type.get("sale");
// workbench.setSale(Integer.valueOf(sale.toString()));
// //工程
// Object project = type.get("project");
// workbench.setProject(Integer.valueOf(project.toString()));
// //成本
// Object cost = type.get("cost");
// workbench.setCost(Integer.valueOf(cost.toString()));
// //招采
// Object forMining = type.get("forMining");
// workbench.setForMining(Integer.valueOf(forMining.toString()));
// //财务
// Object finance = type.get("finance");
// workbench.setFinance(Integer.valueOf(finance.toString()));
// //法务
// Object forensic = type.get("forensic");
// workbench.setFinance(Integer.valueOf(forensic.toString()));
// //行政
// Object administration = type.get("administration");
// workbench.setAdministration(Integer.valueOf(administration.toString()));
// //人力
// Object manpower = type.get("manpower");
// workbench.setManpower(Integer.valueOf(manpower.toString()));
// //开发
// Object businessManagement = type.get("development");
// workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString()));
// //研发
// Object rAndD = type.get("rAndD");
// workbench.setrAndD(Integer.valueOf(rAndD.toString()));
// //投资
// Object iAndD = type.get("iAndD");
// workbench.setiAndD(Integer.valueOf(iAndD.toString()));
// //其他
// Object Other = type.get("Other");
// workbench.setComplain(Integer.valueOf(Other.toString()));
//地产总和
Object land = type.get("land");
workbench.setComplain(Integer.valueOf(land.toString()));
//营销
Object sale = type.get("sale");
workbench.setSale(Integer.valueOf(sale.toString()));
//工程
Object project = type.get("project");
workbench.setProject(Integer.valueOf(project.toString()));
//成本
Object cost = type.get("cost");
workbench.setCost(Integer.valueOf(cost.toString()));
//招采
Object forMining = type.get("forMining");
workbench.setForMining(Integer.valueOf(forMining.toString()));
//财务
Object finance = type.get("finance");
workbench.setFinance(Integer.valueOf(finance.toString()));
//法务
Object forensic = type.get("forensic");
workbench.setFinance(Integer.valueOf(forensic.toString()));
//行政
Object administration = type.get("administration");
workbench.setAdministration(Integer.valueOf(administration.toString()));
//人力
Object manpower = type.get("manpower");
workbench.setManpower(Integer.valueOf(manpower.toString()));
//开发
Object businessManagement = type.get("development");
workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString()));
//研发
Object rAndD = type.get("rAndD");
workbench.setrAndD(Integer.valueOf(rAndD.toString()));
//投资
Object iAndD = type.get("iAndD");
workbench.setiAndD(Integer.valueOf(iAndD.toString()));
//其他
Object Other = type.get("Other");
workbench.setComplain(Integer.valueOf(Other.toString()));
//物业管理
Object propertyManagement = type.get("propertyManagement");
workbench.setiAndD(Integer.valueOf(propertyManagement.toString()));
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
......@@ -78,18 +78,18 @@ public class WorkbenchController extends BaseController {
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报类型
res.put("land", bean.getLand());
// res.put("project", bean.getProject());
// res.put("cost", bean.getCost());
// res.put("forMining", bean.getForMining());
// res.put("finance", bean.getFinance());
// res.put("forensic", bean.getForensic());
// res.put("administration", bean.getAdministration());
// res.put("manpower", bean.getManpower());
// res.put("development", bean.getDevelopment());
// res.put("rAndD", bean.getrAndD());
// res.put("iAndD", bean.getiAndD());
// res.put("Other", bean.getOther());
res.put("sale", bean.getLand());
res.put("project", bean.getProject());
res.put("cost", bean.getCost());
res.put("forMining", bean.getForMining());
res.put("finance", bean.getFinance());
res.put("forensic", bean.getForensic());
res.put("administration", bean.getAdministration());
res.put("manpower", bean.getManpower());
res.put("development", bean.getDevelopment());
res.put("rAndD", bean.getrAndD());
res.put("iAndD", bean.getiAndD());
res.put("Other", bean.getOther());
res.put("propertyManagement", bean.getPropertyManagement());
res.put("hotelManagement", bean.getHotelManagement());
res.put("businessManagement", bean.getBusinessManagement());
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -18,6 +18,7 @@
r.supplement_informant AS "supplementInformant",
r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType",
r.transfer_department AS "transferDepartment",
r.supplement_area AS "supplementArea",
r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent",
......@@ -33,7 +34,8 @@
r.oa_name AS "oaname",
r.report_ip AS "reportIp",
r.ip_city AS "ipCity",
r.is_send_email AS "isSendEmail"
r.is_send_email AS "isSendEmail",
su.area AS "oaarea"
</sql>
......@@ -55,11 +57,21 @@
<include refid="reportColumns"/>
,su.name AS "transferName"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = 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.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}
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
......@@ -126,14 +138,21 @@
<include refid="reportColumns"/>
,su.name AS "transferName"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
<where>
1 = 1
<if test="isAdmin == null">
AND r.create_by = #{exchangeAfterUser}
AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by = #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
AND r.supplement_area !='Group' AND r.supplement_area IS NOT NULL
AND su.area IN ('North China',
'BeiJing',
'ShangHai',
'SouthWest',
'SouthEast',
'Central China',
'GuangShen',
'Hainan')
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
......@@ -242,7 +261,7 @@
supplement_informant,
supplement_title,
exchange_before_user,
exchange_after_user,
exchange_after_user ,
exchange_type,
create_by,
create_date,
......@@ -555,29 +574,29 @@
<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 "land",
-- 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
-- "cost",
-- SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
-- "forMining",
-- SUM(CASE WHEN supplement_type||',' LIKE '5,%' OR supplement_type||',' LIKE '%,5,%' THEN 1 ELSE 0 END) AS
-- "finance",
-- SUM(CASE WHEN supplement_type||',' LIKE '6,%' OR supplement_type||',' LIKE '%,6,%' THEN 1 ELSE 0 END) AS
-- "forensic",
-- SUM(CASE WHEN supplement_type||',' LIKE '7,%' OR supplement_type||',' LIKE '%,7,%' THEN 1 ELSE 0 END) AS
-- "administration",
-- SUM(CASE WHEN supplement_type||',' LIKE '8,%' OR supplement_type||',' LIKE '%,8,%' THEN 1 ELSE 0 END) AS
-- "manpower",
-- SUM(CASE WHEN supplement_type||',' LIKE '9,%' OR supplement_type||',' LIKE '%,9,%' THEN 1 ELSE 0 END) AS
-- "development",
-- SUM(CASE WHEN supplement_type||',' LIKE '10,%' OR supplement_type||',' LIKE '%,10,%' THEN 1 ELSE 0 END) AS
-- "rAndD",
-- SUM(CASE WHEN supplement_type||',' LIKE '11,%' OR supplement_type||',' LIKE '%,11,%' THEN 1 ELSE 0 END) AS
-- "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 '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
"cost",
SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
"forMining",
SUM(CASE WHEN supplement_type||',' LIKE '5,%' OR supplement_type||',' LIKE '%,5,%' THEN 1 ELSE 0 END) AS
"finance",
SUM(CASE WHEN supplement_type||',' LIKE '6,%' OR supplement_type||',' LIKE '%,6,%' THEN 1 ELSE 0 END) AS
"forensic",
SUM(CASE WHEN supplement_type||',' LIKE '7,%' OR supplement_type||',' LIKE '%,7,%' THEN 1 ELSE 0 END) AS
"administration",
SUM(CASE WHEN supplement_type||',' LIKE '8,%' OR supplement_type||',' LIKE '%,8,%' THEN 1 ELSE 0 END) AS
"manpower",
SUM(CASE WHEN supplement_type||',' LIKE '9,%' OR supplement_type||',' LIKE '%,9,%' THEN 1 ELSE 0 END) AS
"development",
SUM(CASE WHEN supplement_type||',' LIKE '10,%' OR supplement_type||',' LIKE '%,10,%' THEN 1 ELSE 0 END) AS
"rAndD",
SUM(CASE WHEN supplement_type||',' LIKE '11,%' OR supplement_type||',' LIKE '%,11,%' THEN 1 ELSE 0 END) AS
"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
"propertyManagement",
SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
......
src/main/resources/mappings/modules/sys/UserDao.xml
......@@ -65,6 +65,7 @@
a.login_name,
a.password,
a.no,
a.area,
a.name,
a.email,
a.phone,
......
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
......@@ -171,6 +171,8 @@
<c:if test="${report.dealResult eq '2'}">举报无效</c:if>
<c:if test="${report.dealResult eq '3'}">举报受理</c:if>
<c:if test="${report.dealResult eq '4'}">举报属实</c:if>
<c:if test="${report.dealResult eq '5'}">举报不实</c:if>
<c:if test="${report.dealResult eq '6'}">移交其他部门</c:if>
</td>
<td><c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -43,8 +43,12 @@
dealResult = "举报无效";
} else if (dealResult == "3") {
dealResult = "举报受理";
}else if (dealResult == "4"){
} else if (dealResult == "4") {
dealResult = "举报属实";
} else if (dealResult == "5") {
dealResult = "举报不是";
} else if (dealResult == "6") {
dealResult = "移交其他部门";
}
$("#dealResult").val(dealResult);
});
......@@ -87,9 +91,10 @@
<li class="active"><a href="${ctx}/report/form">举报详情</a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/conclusion" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/conclusion" method="post"
class="form-horizontal">
<sys:message content="${message}"/>
<form:hidden id="reportId" path="id"/>
<form:hidden id="reportId" path="id"/>
<span class="title">举报内容</span>
<div class="control-group">
<label class="control-label">被举报项目/部门:</label>
......@@ -239,14 +244,18 @@
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="lStatus" class="input-small">
<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" htmlEscape="false" maxlength="200" class="input-xlarge required"/></c:if>
<c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path="dealResult"
htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if>
</div>
</div>
</c:if>
<li class="btns">
<label style="width:auto;">
<c:if test="${report.reportStatus != '2' && report.reportStatus ne '3'}"><input id="btnTrack" class="btn btn-primary" type="button"
value="跟踪"/>&nbsp;&nbsp;</c:if>
<c:if test="${report.reportStatus != '2' && report.reportStatus ne '3'}"><input id="btnTrack"
class="btn btn-primary"
type="button"
value="跟踪"/>&nbsp;&nbsp;</c:if>
<input id="btnDocument" class="btn btn-primary" type="button" value="转为文档"
onclick="openDownloadDialog('${report.id}')"/>&nbsp;&nbsp;
<input id="btnReturn" class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>&nbsp;&nbsp;
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -197,13 +197,13 @@
table td {
height: 25px;
text-align: center;
border-left: 0px;
}
table th {
white-space: nowrap;
text-align: center;
height: 21px;
border-top: 0px;
border-left: 0px;
......@@ -211,9 +211,7 @@
.t_left {
width: 30%;
float: left;
}
/*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/
......@@ -226,7 +224,7 @@
.cl_freeze {
height: 410px;
overflow: hidden;
width: 101%;
}
......@@ -302,7 +300,7 @@
maxlength="50" class="input-small"/></li>
<li><label>业务类型：</label><form:select onchange="resetPageNo();" path="supplementType" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('business_type')}" itemLabel="label" itemValue="value"
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></li>
<li><label>状态：</label><form:select onchange="resetPageNo();" path="reportStatus" class="input-small">
<form:option value=" ">请选择</form:option>
......@@ -335,16 +333,19 @@
<table class=" table-striped table-bordered table-condensed" cellspacing="0" cellpadding="2" border="2">
<thead>
<tr>
<th style="width:5%">ID</th>
<th style="width:15%" align="center">标题</th>
<th style="width:15%">标题</th>
</tr>
</thead>
<tbody>
<c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="report" varStatus="vs">
<tr class="reportList">
<td style="width:5%"></td>
<td style="width:15%" align="left">${report.supplementTitle}</td>
<td align="center" style="width:5%"></td>
<td align="left" style="width:15%" title= ${report.supplementTitle}>${report.supplementTitle}</td>
</c:forEach>
</c:if>
</tr>
......@@ -360,7 +361,7 @@
cellpadding="2" border="2">
<thead>
<tr>
<th style="width:7%">业务类型</th>
<th style="width:10%">业务类型</th>
<th>被举报项目/部门</th>
<th>OA账号</th>
<th>举报人</th>
......@@ -388,12 +389,12 @@
<c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="report" varStatus="vs">
<tr>
<td>${report.supplementType}</td>
<td>${report.reportProject}</td>
<td>${report.oaname}</td>
<td>${report.reportPersonName}</td>
<td>${report.reportPersonTel}</td>
<td><c:if test="${report.reportSource eq 'web'}">官网</c:if>
<td align="center">${report.supplementType}</td>
<td align="center">${report.reportProject}</td>
<td align="center">${report.oaname}</td>
<td align="center">${report.reportPersonName}</td>
<td align="center">${report.reportPersonTel}</td>
<td align="center"><c:if test="${report.reportSource eq 'web'}">官网</c:if>
<c:if test="${report.reportSource eq 'oa'}">融创OA系统</c:if>
<c:if test="${report.reportSource eq 'supplier'}">供应商系统</c:if>
<c:if test="${report.reportSource eq 'wechat'}">微信公众号</c:if>
......@@ -403,7 +404,7 @@
<c:if test="${report.reportSource eq 'email'}">邮件</c:if>
<c:if test="${report.reportSource eq 'visit'}">来访</c:if>
<c:if test="${report.reportSource eq null}">--</c:if></td>
<td>
<td align="center">
<c:if test="${report.supplementArea eq 'North China'}">华北区域公司</c:if>
<c:if test="${report.supplementArea eq 'BeiJing'}">北京区域公司</c:if>
<c:if test="${report.supplementArea eq 'ShangHai'}">上海区域公司</c:if>
......@@ -415,19 +416,19 @@
<c:if test="${report.supplementArea eq 'Group'}">集团本部</c:if>
<c:if test="${report.supplementArea eq null}">--</c:if>
</td>
<td>
<td align="center">
<c:if test="${report.supplementInformant eq null}">--</c:if>
<c:if test="${report.supplementInformant ne null}">${report.supplementInformant}</c:if>
</td>
<td>${report.reportTime}</td>
<td>
<td align="center">${report.reportTime}</td>
<td align="center">
<c:if test="${report.reportStatus eq '0'}">未处理</c:if>
<c:if test="${report.reportStatus eq '1'}">跟踪中</c:if>
<c:if test="${report.reportStatus eq '2'}">已处理</c:if>
<c:if test="${report.reportStatus eq '3'}">已关闭</c:if>
<%--<c:if test="${report.reportStatus eq '3'}">受理中</c:if>--%>
</td>
<td>
<td align="center">
<c:if test="${report.dealResult eq null}">--</c:if>
<c:if test="${report.dealResult eq '1'}">移交客诉</c:if>
<c:if test="${report.dealResult eq '2'}">举报无效</c:if>
......@@ -436,26 +437,45 @@
<c:if test="${report.dealResult eq '5'}">举报不实</c:if>
<c:if test="${report.dealResult eq '6'}">移交其他部门</c:if>
</td>
<td>${report.transferDepartment}</td>
<td><c:if test="${report.dealPersonName eq null}">--</c:if>
<td align="center">
<c:if test="${report.transferDepartment eq null}">--</c:if>
<c:if test="${report.transferDepartment eq '1'}">营销</c:if>
<c:if test="${report.transferDepartment eq '2'}">工程</c:if>
<c:if test="${report.transferDepartment eq '3'}">成本</c:if>
<c:if test="${report.transferDepartment eq '4'}">招采</c:if>
<c:if test="${report.transferDepartment eq '5'}">财务</c:if>
<c:if test="${report.transferDepartment eq '6'}">法务</c:if>
<c:if test="${report.transferDepartment eq '7'}">行政</c:if>
<c:if test="${report.transferDepartment eq '8'}">人力</c:if>
<c:if test="${report.transferDepartment eq '9'}">开发</c:if>
<c:if test="${report.transferDepartment eq '10'}">研发</c:if>
<c:if test="${report.transferDepartment eq '11'}">投资</c:if>
<c:if test="${report.transferDepartment eq '12'}">其他</c:if>
<c:if test="${report.transferDepartment eq '13'}">物业管理</c:if>
<c:if test="${report.transferDepartment eq '14'}">酒店管理</c:if>
<c:if test="${report.transferDepartment eq '15'}">商业管理</c:if>
</td>
<td align="center">
<c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
</td>
<c:if test="${isAdmin eq true}">
<td>
<td align="center">
<c:if test="${report.transferName eq null || report.exchangeType eq null}">--</c:if>
<c:if test="${report.transferName ne null && report.exchangeType ne null}">${report.transferName}</c:if>
</td>
</c:if>
<td title= ${report.reportContent}>${report.reportContent}</td>
<td title= ${report.supplementContent}>${report.supplementContent}</td>
<td>${report.reportIp}</td>
<td>${report.ipCity}</td>
<td>
<td align="center" title= ${report.reportContent}>${report.reportContent}</td>
<td align="center"
title= ${report.supplementContent}>${report.supplementContent}</td>
<td align="center">${report.reportIp}</td>
<td align="center">${report.ipCity}</td>
<td align="center">
<c:if test="${report.isSendEmail eq '1'}">是</c:if>
<c:if test="${report.isSendEmail eq null}">否</c:if>
</td>
<td>
<td align="center">
<a href="${ctx}/report/view?id=${report.id}">查看</a>
<c:if test="${report.reportStatus ne '2' && report.reportStatus ne '3'}"><a
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -6,6 +6,19 @@
<title>举报管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
window.onload = function () {
var dealResult = $("#dealResult").val();
if (dealResult != null && dealResult != ' ') {
if (dealResult == "6") {
$("#selectType").show();
} else {
$("#selectType").hide();
}
$("#selectDone").show();
} else {
$("#selectDone").hide();
}
}
var submitCount = 0;
$(document).ready(function () {
$("#inputForm").validate({
......@@ -267,6 +280,7 @@
if (supplementType == "请选择") {
supplementType = "${report.reportProject}";
}
var supplementContent = "";
var path1 = "mailto:?subject=举报核查-" + supplementType + "-" + supplementInformant + "违规操作";
path1 += "&body=Dear,%0D%0A附件是举报核查-" + supplementType + "-" + supplementInformant + "违规操作，请核实是否属实。%0D%0A谢谢！";
......@@ -343,14 +357,18 @@
supplementArea = "集团本部";
}
path2 += "被举报区域:" + supplementArea + "%0D%0A";
var supplementContent = $("#supplementContent").val();
supplementContent = $("#supplementContent").val();
path2 += "内容:";
var path3 = "%0D%0A附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function () {
var url = $(this).text();
path3 += url;
});
}
if (path3 == null) {
path3 = "";
}
var path = path1 + reportContent + path2 + supplementContent + path3;
console.log(path);
var pathLength = "";
......@@ -572,7 +590,7 @@
<label class="control-label">业务类型:</label>
<div class="controls">
<span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('business_type')}"
<form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}"
itemLabel="label" itemValue="value" class="required"/>
</span>
</div>
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -101,28 +101,22 @@
},
xAxis: [{
categories: [
'地产',
'营销',
'工程',
'成本',
'招采',
'财务',
'法务',
'行政',
'人力',
'开发',
'研发',
'投资',
'其他',
'物业管理',
'酒店管理',
'商业管理'
],
// categories: [
// '营销',
// '工程',
// '成本',
// '招采',
// '财务',
// '法务',
// '行政',
// '人力',
// '开发',
// '研发',
// '投资',
// '其他',
// '物业管理',
// '酒店管理',
// '商业管理'
// ],
labels: {
enabled: false
},
......@@ -157,8 +151,41 @@
}
},
series: [{
name: '地产',
data: [result.land]
name: '营销',
data: [result.sale]
}, {
name: '工程',
data: [result.project]
}, {
name: '成本',
data: [result.cost]
}, {
name: '招采',
data: [result.forMining]
}, {
name: '财务',
data: [result.finance]
}, {
name: '法务',
data: [result.forensic]
}, {
name: '行政',
data: [result.administration]
}, {
name: '人力',
data: [result.manpower]
}, {
name: '开发',
data: [result.development]
}, {
name: '研发',
data: [result.rAndD]
}, {
name: '投资',
data: [result.iAndD]
}, {
name: '其他',
data: [result.Other]
}, {
name: '物业管理',
data: [result.propertyManagement]
......@@ -170,53 +197,6 @@
data: [result.businessManagement]
}
]
// series: [{
// name: '营销',
// data: [result.sale]
// }, {
// name: '工程',
// data: [result.project]
// }, {
// name: '成本',
// data: [result.cost]
// }, {
// name: '招采',
// data: [result.forMining]
// }, {
// name: '财务',
// data: [result.finance]
// }, {
// name: '法务',
// data: [result.forensic]
// }, {
// name: '行政',
// data: [result.administration]
// }, {
// name: '人力',
// data: [result.manpower]
// }, {
// name: '开发',
// data: [result.development]
// }, {
// name: '研发',
// data: [result.rAndD]
// }, {
// name: '投资',
// data: [result.iAndD]
// }, {
// name: '其他',
// data: [result.Other]
// }, {
// name: '物业管理',
// data: [result.propertyManagement]
// }, {
// name: '酒店管理',
// data: [result.hotelManagement]
// }, {
// name: '商业管理',
// data: [result.businessManagement]
// }
// ]
});
$('#repResult').highcharts({
navigation: {
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -65,6 +65,7 @@
a.login_name,
a.password,
a.no,
a.area,
a.name,
a.email,
a.phone,
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -65,6 +65,7 @@
a.login_name,
a.password,
a.no,
a.area,
a.name,
a.email,
a.phone,
......
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