Skip to content

S
sunac_report
Commit 343f5597 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent fd891241
Showing with 1681 additions and 948 deletions
.idea/modules.xml
......@@ -3,7 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/report_sunac.iml" filepath="$PROJECT_DIR$/report_sunac.iml" />
<module fileurl="file://E:/sunac_report/report_sunac (1).iml" filepath="E:/sunac_report/report_sunac (1).iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
......@@ -8,21 +8,32 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<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$/report_sunac.iml" afterPath="$PROJECT_DIR$/report_sunac.iml" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/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/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/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$/target/report_sunac/META-INF/MANIFEST.MF" afterPath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" />
<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" />
......@@ -56,101 +67,47 @@
<favorites_list name="it-faq-manage" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="reportForm.jsp" pinned="false" current-in-tab="false">
<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="5175">
<caret line="207" column="10" lean-forward="false" selection-start-line="207" selection-start-column="10" selection-end-line="207" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportDao.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4950">
<caret line="198" column="22" lean-forward="false" selection-start-line="198" selection-start-column="22" selection-end-line="198" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="reportList.jsp" pinned="false" current-in-tab="false">
<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="1425">
<caret line="57" column="35" lean-forward="false" selection-start-line="57" selection-start-column="31" selection-end-line="57" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportToPdfController.java" pinned="false" current-in-tab="false">
<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="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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportToWordController.java" pinned="false" current-in-tab="true">
<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="249">
<caret line="429" column="69" lean-forward="false" selection-start-line="429" selection-start-column="69" selection-end-line="429" selection-end-column="69" />
<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="325">
<caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Jsp File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>db.table.prefix</find>
<find>a</find>
<find>a.</find>
<find>a.un</find>
<find>a.un_</find>
<find>e</find>
<find>error_l</find>
<find>error_log</find>
<find>error_logs</find>
<find>BaseEntity</find>
<find>举报受理</find>
<find>meanWhile</find>
<find>answer</find>
<find>addT</find>
<find>addTrack</find>
<find>请选择</find>
<find>举报</find>
<find>lin</find>
<find>showDone</find>
<find>dealResult</find>
<find>getTotalNum</find>
<find>add</find>
<find>dao</find>
<find>&lt;a</find>
<find>control</find>
<find>个人信息</find>
<find>归属公司</find>
<find>转为</find>
<find>toWord</find>
<find>openDownloadDialog</find>
<find>showType</find>
<find>selectTypeId</find>
<find>cl_freeze</find>
<find>reportList</find>
<find>float</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>supplementArea</find>
<find>exchangeAfterUser</find>
<find>getReportType</find>
<find>in</find>
<find>supplementType</find>
<find>adminPath</find>
<find>report/list</find>
<find>筛选</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -179,13 +136,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/web/AskController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/AESOperator.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/security/SystemAuthorizingRealm.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/roleList.jsp" />
<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" />
......@@ -200,7 +150,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskFileEntity.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/UserUtils.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysLogin.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/conf/GConstants.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/upload/api/UploadController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/ask/askForm.jsp" />
......@@ -217,19 +166,27 @@
<option value="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/AreaDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<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/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<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/report/web/ReportController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
<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/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/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" />
</list>
</option>
</component>
......@@ -267,6 +224,11 @@
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="report_sunac Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="report_sunac Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
</path>
</expand>
<select />
</treeState>
......@@ -295,6 +257,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -342,100 +305,115 @@
<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="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" 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="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" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" 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="views" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" 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="views" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" 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="views" type="462c0819:PsiDirectoryNode" />
<item name="classes" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
......@@ -446,7 +424,6 @@
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -470,7 +447,7 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1036" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
......@@ -489,6 +466,7 @@
<recent name="com.ejweb.core.base" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
</key>
</component>
......@@ -601,8 +579,8 @@
<properties />
<listeners />
</configuration>
<configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8181/sunac" />
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="false">
<option name="BROWSER_ID" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<deployment>
<artifact name="report_sunac:war exploded">
<settings>
......@@ -611,8 +589,7 @@
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_sunac_report_2" />
<option name="HTTP_PORT" value="8181" />
<option name="BASE_DIRECTORY_NAME" value="_sunac_report" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
......@@ -668,9 +645,46 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="report_sunac:war exploded" />
<artifact name="report_sunac:war" />
</option>
</method>
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="false">
<option name="BROWSER_ID" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote" ALTERNATIVE_JRE_ENABLED="false">
<option name="LOCAL" value="false" />
<deployment />
<server-settings>
<data>
<option name="targets">
<list>
<WatchedTargetModelImpl>
<option name="name" value="CONTEXT_XML" />
<name>CONTEXT_XML</name>
</WatchedTargetModelImpl>
<StagingTargetModelImpl>
<option name="name" value="STAGING" />
<name>STAGING</name>
</StagingTargetModelImpl>
</list>
</option>
<option name="transportHostId" value="" />
<host-id />
</data>
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60241" />
<option name="LOCAL" value="false" />
</RunnerSettings>
</configuration>
<configuration name="report" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8181/sunac/admin/login" />
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<deployment>
<artifact name="report_sunac:war exploded">
<settings>
......@@ -679,7 +693,8 @@
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="_sunac_report" />
<option name="BASE_DIRECTORY_NAME" value="Unnamed_sunac_report_2" />
<option name="HTTP_PORT" value="8181" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
......@@ -735,41 +750,6 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="report_sunac:war exploded" />
<artifact name="report_sunac:war" />
</option>
</method>
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote" ALTERNATIVE_JRE_ENABLED="false">
<option name="LOCAL" value="false" />
<deployment />
<server-settings>
<data>
<option name="targets">
<list>
<WatchedTargetModelImpl>
<option name="name" value="CONTEXT_XML" />
<name>CONTEXT_XML</name>
</WatchedTargetModelImpl>
<StagingTargetModelImpl>
<option name="name" value="STAGING" />
<name>STAGING</name>
</StagingTargetModelImpl>
</list>
</option>
<option name="transportHostId" value="" />
<host-id />
</data>
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60241" />
<option name="LOCAL" value="false" />
</RunnerSettings>
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
......@@ -1284,14 +1264,27 @@
<workItem from="1521597625374" duration="343000" />
<workItem from="1521598511927" duration="27000" />
<workItem from="1522115183265" duration="4081000" />
<workItem from="1522640221591" duration="160000" />
</task>
<task id="LOCAL-00062" summary="不能跳下一页bug">
<created>1498620421107</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1498620421107</updated>
<workItem from="1522640221591" duration="213000" />
<workItem from="1522649962480" duration="25000" />
<workItem from="1522657471850" duration="1212000" />
<workItem from="1522661018957" duration="1051000" />
<workItem from="1522718976240" duration="15125000" />
<workItem from="1522805142158" duration="3263000" />
<workItem from="1522809834115" duration="20000" />
<workItem from="1522830433274" duration="233000" />
<workItem from="1523152267230" duration="18582000" />
<workItem from="1523238557238" duration="148000" />
<workItem from="1523349732525" duration="4516000" />
<workItem from="1524535227632" duration="82000" />
<workItem from="1524557870410" duration="3947000" />
<workItem from="1524620265325" duration="44000" />
<workItem from="1524622715773" duration="17366000" />
<workItem from="1524657354582" duration="1345000" />
<workItem from="1524707123009" duration="18913000" />
<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>
......@@ -1629,11 +1622,18 @@
<option name="project" value="LOCAL" />
<updated>1516159852559</updated>
</task>
<option name="localTasksCounter" value="111" />
<task id="LOCAL-00111" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1522640386332</created>
<option name="number" value="00111" />
<option name="presentableId" value="LOCAL-00111" />
<option name="project" value="LOCAL" />
<updated>1522640386333</updated>
</task>
<option name="localTasksCounter" value="112" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="425263000" />
<option name="totallyTimeSpent" value="521369000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1657,9 +1657,9 @@
<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.5634267" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3261944" sideWeight="0.49444443" order="11" 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" />
......@@ -1668,7 +1668,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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.27836612" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.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="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" />
......@@ -1699,9 +1699,9 @@
<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.5634267" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3276923" sideWeight="0.49444443" order="11" 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" />
......@@ -1711,7 +1711,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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.27836612" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.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="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" />
......@@ -1804,9 +1804,13 @@
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="161" />
<option name="time" value="179" />
</breakpoint-manager>
<watches-manager />
<watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
<watch expression="reportEntity.createDate" />
</configuration>
</watches-manager>
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
......@@ -1815,49 +1819,50 @@
<component name="editorHistoryManager">
<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="5175">
<caret line="207" column="10" lean-forward="false" selection-start-line="207" selection-start-column="10" selection-end-line="207" selection-end-column="10" />
<folding />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/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="4950">
<caret line="198" column="22" lean-forward="false" selection-start-line="198" selection-start-column="22" selection-end-line="198" selection-end-column="22" />
<folding />
<state relative-caret-position="100">
<caret line="4" column="26" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1425">
<caret line="57" column="35" lean-forward="false" selection-start-line="57" selection-start-column="31" selection-end-line="57" selection-end-column="35" />
<folding />
<state relative-caret-position="9675">
<caret line="387" column="48" lean-forward="false" selection-start-line="387" selection-start-column="42" selection-end-line="387" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.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="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" />
<folding />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding />
<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/java/com/ejweb/modules/report/web/ReportToWordController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10150">
<caret line="429" column="69" lean-forward="false" selection-start-line="429" selection-start-column="69" selection-end-line="429" selection-end-column="69" />
<folding />
<state relative-caret-position="9675">
<caret line="387" column="48" lean-forward="false" selection-start-line="387" selection-start-column="42" selection-end-line="387" selection-end-column="48" />
</state>
</provider>
</entry>
......@@ -1865,15 +1870,27 @@
<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" />
<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/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="23" column="31" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="31" />
<folding />
<state relative-caret-position="100">
<caret line="4" column="26" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11325">
<caret line="453" column="67" lean-forward="false" selection-start-line="453" selection-start-column="63" selection-end-line="453" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
......@@ -1881,15 +1898,13 @@
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
<folding />
<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>
......@@ -1897,198 +1912,303 @@
<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" />
<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/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<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" />
<folding />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<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="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" />
<folding />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.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="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" />
<folding />
<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/java/com/ejweb/modules/report/web/ReportToPdfController.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" />
<folding />
<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>
</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/web/ReportToWordController.java">
<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" />
<folding />
<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>
</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/reportDeliver.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" />
<folding />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="215" column="14" lean-forward="false" selection-start-line="215" selection-start-column="14" selection-end-line="215" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/notice.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<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="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" />
<folding />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/utils/UserUtils.java">
<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" />
<folding />
<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/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<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="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" />
<folding />
<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>
</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/core/persistence/CrudDao.java">
<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" />
<folding />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<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="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" />
<folding />
<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/webapp/WEB-INF/views/modules/report/reportForm.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="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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/service/CrudService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="63" column="33" lean-forward="false" selection-start-line="63" selection-start-column="25" selection-end-line="63" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/NoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
<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/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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/workbench/ReportNoticeDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/mobile/modules/sys/sysLogin.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-950">
<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/workbench/web/WorkbenchController.java">
<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>
</provider>
</entry>
<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="-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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
</provider>
</entry>
<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="-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>
</provider>
</entry>
<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="-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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding />
<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/java/com/ejweb/modules/report/service/ReportService.java">
<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="193">
<caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding />
<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/report/ReportDao.xml">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring-mvc.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4950">
<caret line="198" column="22" lean-forward="false" selection-start-line="198" selection-start-column="22" selection-end-line="198" selection-end-column="22" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/conf/GConstants.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<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" />
<folding />
<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/report/entity/ReportEntity.java">
<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="50">
<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 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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<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>
</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="5175">
<caret line="207" column="10" lean-forward="false" selection-start-line="207" selection-start-column="10" selection-end-line="207" selection-end-column="10" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1425">
<caret line="57" column="35" lean-forward="false" selection-start-line="57" selection-start-column="31" selection-end-line="57" selection-end-column="35" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<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="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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="429" column="69" lean-forward="false" selection-start-line="429" selection-start-column="69" selection-end-line="429" selection-end-column="69" />
<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" />
<folding />
</state>
</provider>
......@@ -2103,7 +2223,7 @@
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.26206896" />
<option value="0.2" />
<option value="0.5" />
</list>
</option>
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
......@@ -172,6 +172,14 @@ public interface ReportDao extends CrudDao<ReportEntity> {
public List<ReportEntity> getChooseReportList(ReportEntity reportEntity);
/**
* 区域列表查询
*
* @param reportEntity
* @return
*/
public List<ReportEntity> findQyList(ReportEntity reportEntity);
/**
* 工作转交 更改转交人
*
* @param reportEntity
......@@ -208,8 +216,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 删除举报信息
*
* @param reportEntity
* @return
*/
public int deleteConclusion(ReportEntity reportEntity);
}
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -3,17 +3,20 @@ package com.ejweb.modules.report.entity;
import com.ejweb.core.persistence.DataEntity;
import com.ejweb.core.utils.excel.annotation.ExcelField;
import com.ejweb.modules.sys.entity.User;
import java.util.List;
/**
* 举报Entity
*
* @author lixy
* @version 2017-09-06
*/
public class ReportEntity extends DataEntity<ReportEntity> {
private static final long serialVersionUID = 1L;
private User user;//用户
private String reportProject; //被举报项目
private String reportCity; //所在城市
private String reportTime; //举报时间
......@@ -27,7 +30,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementDepartment; //被举报部门
private String supplementInformant; //被举报人
private String supplementTitle; //标题
private String supplementType; //业务类型 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
private String supplementType; //业务类型地产 物业 酒店 商业
private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
private String supplementArea; //被举报区域
private String supplementProject; //被举报项目
private String supplementContent; //
......@@ -45,21 +49,37 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String reportIp; //记录ip地址
private String ipCity; //ip地址对应城市
private String isSendEmail; //是否已经发送过邮件 0未发送 1已发送
private String transferName; //移交给
private String dealPerson;
private String lStatus; //关闭修改状态
public String getlStatus() {
return lStatus;
//是否管理员
private String isAdmin;
public String getIsAdmin() {
return isAdmin;
}
public void setlStatus(String lStatus) {
this.lStatus = lStatus;
public void setIsAdmin(String isAdmin) {
this.isAdmin = isAdmin;
}
public String getTransferDepartment() {
return transferDepartment;
}
public void setTransferDepartment(String transferDepartment) {
this.transferDepartment = transferDepartment;
}
public String getlStatus() {
return lStatus;
}
public void setlStatus(String lStatus) {
this.lStatus = lStatus;
}
public String getOaname() {
......@@ -69,7 +89,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setOaname(String oaname) {
this.oaname = oaname;
}
// private String ifDone; //是否完成
// private String ifDone; //是否完成
//
//
// public String getIfDone() {
......@@ -83,7 +104,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String[] types;//新业务类型
@ExcelField(title="被举报项目/部门", align=2, sort=24)
@ExcelField(title = "被举报项目/部门", align = 2, sort = 24)
public String getReportProject() {
return reportProject;
}
......@@ -100,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportCity = reportCity;
}
@ExcelField(title="举报时间", align=2, sort=34)
@ExcelField(title = "举报时间", align = 2, sort = 34)
public String getReportTime() {
return reportTime;
}
......@@ -108,7 +129,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
@ExcelField(title = "举报内容",align = 2,sort = 44)
@ExcelField(title = "举报内容", align = 2, sort = 44)
public String getReportContent() {
return reportContent;
}
......@@ -117,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportContent = reportContent;
}
@ExcelField(title="举报人", align=2, sort=26)
@ExcelField(title = "举报人", align = 2, sort = 26)
public String getReportPersonName() {
return reportPersonName;
}
......@@ -126,7 +148,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonName = reportPersonName;
}
@ExcelField(title="举报人电话", align=2, sort=28)
@ExcelField(title = "举报人电话", align = 2, sort = 28)
public String getReportPersonTel() {
return reportPersonTel;
}
......@@ -151,7 +173,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportSource = reportSource;
}
@ExcelField(title="状态", align=2, sort=36)
@ExcelField(title = "状态", align = 2, sort = 36)
public String getReportStatus() {
return reportStatus;
}
......@@ -176,7 +198,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementDepartment = supplementDepartment;
}
@ExcelField(title="被举报人", align=2, sort=32)
@ExcelField(title = "被举报人", align = 2, sort = 32)
public String getSupplementInformant() {
return supplementInformant;
}
......@@ -185,7 +207,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementInformant = supplementInformant;
}
@ExcelField(title="标题", align=2, sort=20)
@ExcelField(title = "标题", align = 2, sort = 20)
public String getSupplementTitle() {
return supplementTitle;
}
......@@ -194,7 +216,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementTitle = supplementTitle;
}
@ExcelField(title="业务类型", align=2, sort=22)
@ExcelField(title = "业务类型", align = 2, sort = 22)
public String getSupplementType() {
return supplementType;
}
......@@ -203,7 +225,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementType = supplementType;
}
@ExcelField(title="区域", align=2, sort=30)
@ExcelField(title = "区域", align = 2, sort = 30)
public String getSupplementArea() {
return supplementArea;
}
......@@ -219,7 +241,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setSupplementProject(String supplementProject) {
this.supplementProject = supplementProject;
}
@ExcelField(title = "举报信息补充内容",align = 2,sort = 46)
@ExcelField(title = "举报信息补充内容", align = 2, sort = 46)
public String getSupplementContent() {
return supplementContent;
}
......@@ -228,7 +251,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementContent = supplementContent;
}
@ExcelField(title="处理人", align=2, sort=40)
@ExcelField(title = "处理人", align = 2, sort = 40)
public String getDealPersonName() {
return dealPersonName;
}
......@@ -237,7 +260,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealPersonName = dealPersonName;
}
@ExcelField(title="处理结论", align=2, sort=38)
@ExcelField(title = "处理结论", align = 2, sort = 38)
public String getDealResult() {
return dealResult;
}
......@@ -326,7 +349,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types;
}
@ExcelField(title="移交给", align=2, sort=42)
@ExcelField(title = "移交给", align = 2, sort = 42)
public String getTransferName() {
return transferName;
}
......@@ -335,7 +358,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName;
}
@ExcelField(title="IP来源", align=2, sort=48)
@ExcelField(title = "IP来源", align = 2, sort = 48)
public String getReportIp() {
return reportIp;
}
......@@ -344,7 +367,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportIp = reportIp;
}
@ExcelField(title="IP所属城市", align=2, sort=50)
@ExcelField(title = "IP所属城市", align = 2, sort = 50)
public String getIpCity() {
return ipCity;
}
......@@ -353,7 +376,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity;
}
@ExcelField(title="邮件发送", align=2, sort=48)
@ExcelField(title = "邮件发送", align = 2, sort = 48)
public String getIsSendEmail() {
return isSendEmail;
}
......@@ -369,4 +392,13 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setDealPerson(String dealPerson) {
this.dealPerson = dealPerson;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
}
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -573,4 +573,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
return reportDao.deleteConclusion(reportEntity);
}
public Page<ReportEntity> findQyList(Page<ReportEntity> page, ReportEntity reportEntity) {
reportEntity.setPage(page);
page.setList(reportDao.findQyList(reportEntity));
return page;
}
}
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -31,6 +31,7 @@ import java.util.List;
/**
* 举报Controller
*
* @author lixy
* @version 2017-09-06
*/
......@@ -53,7 +54,7 @@ public class ReportController extends BaseController {
}
/**
* 举报列表
* 集团举报列表
*
* @param reportEntity
* @param model
......@@ -63,33 +64,63 @@ public class ReportController extends BaseController {
*/
@RequiresPermissions("report:view")
@RequestMapping(value = {"list", ""})
public String list(ReportEntity reportEntity, String flag,HttpServletRequest request, HttpServletResponse response, Model model) {
public String list(ReportEntity reportEntity, String flag, HttpServletRequest request, HttpServletResponse response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)){
if (!reportService.checkRole(user)) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)){
if (flag.equals("0")){
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表, flag为2，跳转到已处理举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
}
}
}else{
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
Page<ReportEntity> page = reportService.findPage(new Page<ReportEntity>(request, response), reportEntity);
Page<ReportEntity> page = new Page<ReportEntity>(request, response);
page.setPageSize(10);
//判断登录人是区域管理员还是集团管理员
if (!reportService.checkRole(user)) {
page = reportService.findPage(page, reportEntity);
} else {
reportEntity.setIsAdmin("1");
page = reportService.findPage(page, reportEntity);
}
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist){
String typeStr="";
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 = "工程";
......@@ -98,25 +129,31 @@ public class ReportController extends BaseController {
} 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("12")) {
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+",";
departmentStr = departmentStr + value + ",";
}
report.setSupplementType(typeStr.substring(0,typeStr.length()-1));
report.setSupplementType(departmentStr.substring(0, departmentStr.length() - 1));
}
}
page.setList(reportlist);
......@@ -128,6 +165,121 @@ public class ReportController extends BaseController {
return "modules/report/reportList";
}
/**
* 区域举报列表
*
* @param reportEntity
* @param model
* @param request
* @param response
* @return
*/
@RequestMapping(value = "qylist")
public String qyList(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表 flag为2，跳转到已处理举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
Page<ReportEntity> page = new Page<ReportEntity>(request, response);
page.setPageSize(10);
if (!reportService.checkRole(user)) {
page = reportService.findQyList(page, reportEntity);
} else {
reportEntity.setIsAdmin("1");
page = reportService.findQyList(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 = "工程";
} 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 = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
}
departmentStr = departmentStr + value + ",";
}
report.setSupplementType(departmentStr.substring(0, departmentStr.length() - 1));
}
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
model.addAttribute("page", page);
model.addAttribute("report", reportEntity);
model.addAttribute("flag", flag);
model.addAttribute("isAdmin", isAdmin);
return "modules/report/reportQyList";
}
/**
* 举报添加
*
......@@ -149,12 +301,13 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "addReport")
public String addReport(ReportEntity reportEntity, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
public String addReport(ReportEntity reportEntity, HttpServletRequest request, Model
model, RedirectAttributes redirectAttributes) {
if (!beanValidator(model, reportEntity)) {
return form(reportEntity, model);
}
reportService.saveReport(reportEntity,request);
addMessage(redirectAttributes, "添加举报"+ reportEntity.getReportProject() + "'成功");
reportService.saveReport(reportEntity, request);
addMessage(redirectAttributes, "添加举报" + reportEntity.getReportProject() + "'成功");
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
}
......@@ -175,7 +328,7 @@ public class ReportController extends BaseController {
reportAttachment.setReportId(reportEntity.getId());
reportAttachment.setAttachmentType("0");
if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
String supplementType="";
String supplementType = "";
String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
String typeNumber[] = reportEntity.getSupplementType().split(",");
for (int i = 0; i < typeNumber.length; i++) {
......@@ -185,11 +338,11 @@ public class ReportController extends BaseController {
reportEntity.setSupplementType(supplementType);
}
String isSendEmail = reportEntity.getIsSendEmail();
if (StringUtils.isNotBlank(isSendEmail)){
if (isSendEmail.equals("1")){
if (StringUtils.isNotBlank(isSendEmail)) {
if (isSendEmail.equals("1")) {
isSendEmail = "是";
}
}else {
} else {
isSendEmail = "否";
}
reportEntity.setIsSendEmail(isSendEmail);
......@@ -208,7 +361,7 @@ public class ReportController extends BaseController {
User user = UserUtils.getUser();
Integer count = noticeService.getMessageCount(user.getId());
String result = "";
if (count != 0){
if (count != 0) {
result = count.toString();
}
model.addAttribute("isAdmin", isAdmin);
......@@ -228,7 +381,8 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "track")
public String track(ReportEntity reportEntity,HttpServletRequest request, HttpServletResponse response, Model model) {
public String track(ReportEntity reportEntity, HttpServletRequest request, HttpServletResponse
response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
......@@ -264,15 +418,15 @@ public class ReportController extends BaseController {
supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
}
reportEntity.setDealPerson(reportEntity.getDealPersonName());
if (StringUtils.isBlank(reportEntity.getDealPersonName())){
if (StringUtils.isBlank(reportEntity.getDealPersonName())) {
reportEntity.setDealPerson(user.getName());
}
String isSendEmail = reportEntity.getIsSendEmail();
if (StringUtils.isNotBlank(isSendEmail)){
if (isSendEmail.equals("1")){
if (StringUtils.isNotBlank(isSendEmail)) {
if (isSendEmail.equals("1")) {
isSendEmail = "是";
}
}else {
} else {
isSendEmail = "否";
}
reportEntity.setIsSendEmail(isSendEmail);
......@@ -290,6 +444,7 @@ public class ReportController extends BaseController {
model.addAttribute("supplementTypeStr", supplementTypeStr);
return "modules/report/reportTrack";
}
/**
* 举报跟踪信息保存
*
......@@ -298,7 +453,8 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "addTrack")
public String addTrack(ReportEntity reportEntity,HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
public String addTrack(ReportEntity reportEntity, HttpServletRequest request, Model
model, RedirectAttributes redirectAttributes) {
String ifDone = request.getParameter("ifDone"); // 是否完成
String transferUser = request.getParameter("exchangeAfterUser"); //选择移交人员
if (!beanValidator(model, reportEntity)) {
......@@ -315,32 +471,32 @@ public class ReportController extends BaseController {
if ("ifDone".equals(ifDone)) {
reportEntity.setReportStatus("2");
}
if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())){
if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())) {
String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
reportEntity.setExchangeAfterUser(exchangeAfterUser);
}
if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2") || reportEntity.getDealResult().equals("4")
|| (reportEntity.getDealResult().equals("3") && StringUtils.isNotBlank(ifDone))) {
if (StringUtils.isBlank(reportEntity.getDealPersonName())){
if (StringUtils.isBlank(reportEntity.getDealPersonName())) {
reportEntity.setDealPersonName(reportEntity.getDealPerson());
}
}
reportService.saveTrack(reportEntity,transferUser);
reportService.saveTrack(reportEntity, transferUser);
if (StringUtils.isNotBlank(transferUser) && StringUtils.isBlank(reportEntity.getDealResult())){
if (StringUtils.isNotBlank(transferUser) && StringUtils.isBlank(reportEntity.getDealResult())) {
//管理员移交给他人处理
reportService.addNotice(reportEntity,"transfer",ifDone);
reportService.addRecord(reportEntity,"1");
}else if (StringUtils.isNotBlank(reportEntity.getDealResult()) && StringUtils.isBlank(transferUser)){
reportService.addNotice(reportEntity, "transfer", ifDone);
reportService.addRecord(reportEntity, "1");
} else if (StringUtils.isNotBlank(reportEntity.getDealResult()) && StringUtils.isBlank(transferUser)) {
//自行处理
if (!(StringUtils.isBlank(ifDone))) {
reportService.addNotice(reportEntity, "answer", ifDone);
}
}else if (StringUtils.isNotBlank(transferUser) && StringUtils.isNotBlank(reportEntity.getDealResult())){
} else if (StringUtils.isNotBlank(transferUser) && StringUtils.isNotBlank(reportEntity.getDealResult())) {
//管理员进行处理，同时移交给他人
reportService.addNotice(reportEntity,"meanWhile",ifDone);
reportService.addNotice(reportEntity, "meanWhile", ifDone);
}
addMessage(redirectAttributes, "补充举报"+ reportEntity.getSupplementTitle() + "'成功");
addMessage(redirectAttributes, "补充举报" + reportEntity.getSupplementTitle() + "'成功");
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
}
......@@ -353,7 +509,8 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "viewTransfer")
public void viewTransfer(User user,String flag,HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
public void viewTransfer(User user, String flag, HttpServletRequest request, HttpServletResponse
response, Model model) throws IOException {
Page<User> page = reportService.findUserPage(new Page<User>(request, response), user);
StringBuffer html = new StringBuffer();
html.append("<table id='contentTable' class='table table-striped table-bordered table-condensed'>");
......@@ -368,7 +525,7 @@ public class ReportController extends BaseController {
html.append(" <th>所属公司</th>");
html.append(" <th>所属部门</th>");
html.append(" <th>职位</th>");
}else if (flag.equals("2")){//转交
} else if (flag.equals("2")) {//转交
html.append(" <th>选择</th>");
html.append(" <th>ID</th>");
html.append(" <th>用户名</th>");
......@@ -380,9 +537,9 @@ public class ReportController extends BaseController {
html.append(" </tr>");
html.append(" </thead>");
html.append(" <tbody>");
if (page.getList().size() > 0){
if (page.getList().size() > 0) {
int i = 1;
for (User userEntity : page.getList()){
for (User userEntity : page.getList()) {
html.append(" <tr>");
if (flag.equals("1")) {
html.append(" <td><input type='radio' value='" + userEntity.getId() + "' onclick='chooseRen(this);'></td>");
......@@ -392,12 +549,12 @@ public class ReportController extends BaseController {
html.append(" <td>" + (userEntity.getMobile() == null ? "" : userEntity.getMobile()) + "</td>");
html.append(" <td>" + (userEntity.getCompany() == null ? "" : userEntity.getCompany().getName()) + "</td>");
html.append(" <td>" + (userEntity.getOffice() == null ? "" : userEntity.getOffice().getName()) + "</td>");
if (userEntity.getPosition() != null){
if (userEntity.getPosition() != null) {
html.append(" <td>" + (userEntity.getPosition().getName() == null ? "" : userEntity.getPosition().getName()) + "</td>");
}else {
} else {
html.append(" <td></td>");
}
}else if (flag.equals("2")){
} else if (flag.equals("2")) {
html.append(" <td><input type='radio' value='" + userEntity.getId() + "' onclick='chooseRen(this);'></td>");
html.append(" <td>" + i + "</td>");
html.append(" <td>" + (userEntity.getLoginName() == null ? "" : userEntity.getLoginName()) + "</td>");
......@@ -413,11 +570,11 @@ public class ReportController extends BaseController {
html.append(" </tbody>");
html.append("</table>");
html.append("<span id='chooseItem'></span>");
if (page.getList().size() == 0){
if (page.getList().size() == 0) {
html.append(" <span style='color: #999999;margin: 20px 0 70px 20px;display: block;'>未查询到相关内容</span>");
}
if (page.getList().size() > 0){
html.append(" <div class='pagination'>"+page+"</div>");
if (page.getList().size() > 0) {
html.append(" <div class='pagination'>" + page + "</div>");
}
PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8");
......@@ -426,21 +583,22 @@ public class ReportController extends BaseController {
}
@RequestMapping(value = "export", method = RequestMethod.POST)
public String export(ReportEntity reportEntity,String flag, HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) {
public String export(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
if (!isAdmin){
if (!isAdmin) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)){
if (flag.equals("0")){
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("0");
}
}
}else{
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
......@@ -448,12 +606,12 @@ public class ReportController extends BaseController {
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = reportService.getReportList(reportEntity);
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request,response, fileName).dispose();
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息：" + e.getMessage());
}
return "redirect:" + adminPath + "/report/list/?repage&flag="+flag;
return "redirect:" + adminPath + "/report/list/?repage&flag=" + flag;
}
/**
......@@ -466,10 +624,11 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "deliverList")
public String deliverList(ReportEntity reportEntity, HttpServletRequest request, HttpServletResponse response, Model model) {
public String deliverList(ReportEntity reportEntity, HttpServletRequest request, HttpServletResponse
response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)){
if (!reportService.checkRole(user)) {
reportEntity.setExchangeAfterUser(user.getId());
}
......@@ -477,39 +636,23 @@ public class ReportController extends BaseController {
User userEntity = new User();
Page<User> userPage = reportService.findUserPage(new Page<User>(1, 20), userEntity);
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist){
String typeStr="";
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 ="投资开发";
}
typeStr =typeStr+value+",";
typeStr = typeStr + value + ",";
}
report.setSupplementType(typeStr.substring(0,typeStr.length()-1));
report.setSupplementType(typeStr.substring(0, typeStr.length() - 1));
}
}
page.setList(reportlist);
......@@ -530,8 +673,9 @@ public class ReportController extends BaseController {
* @return
*/
@RequestMapping(value = "deliver")
public void deliver(String[] reportIds,String userId, HttpServletRequest request, HttpServletResponse response) throws IOException {
reportService.deliverReport(reportIds,userId);
public void deliver(String[] reportIds, String userId, HttpServletRequest request, HttpServletResponse
response) throws IOException {
reportService.deliverReport(reportIds, userId);
String result = "1";
PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8");
......
src/main/java/com/ejweb/modules/sys/entity/User.java
......@@ -21,6 +21,7 @@ import java.util.List;
/**
* 用户Entity
*
* @author ThinkGem
* @version 2013-12-05
*/
......@@ -44,7 +45,7 @@ public class User extends DataEntity<User> {
private String officeName; // 部门长名称
private String oldLoginName;// 原登录名
private String newPassword; // 新密码
private String area;//所属区域
private String oldLoginIp; // 上次登陆IP
private Date oldLoginDate; // 上次登陆日期
private String roleId;
......@@ -56,21 +57,29 @@ public class User extends DataEntity<User> {
private Position position; //职位
private String devision; //组织
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public User() {
super();
this.loginFlag = GConstants.YES;
}
public User(String id){
public User(String id) {
super(id);
}
public User(String id, String loginName){
public User(String id, String loginName) {
super(id);
this.loginName = loginName;
}
public User(Role role){
public User(Role role) {
super();
this.role = role;
}
......@@ -91,15 +100,15 @@ public class User extends DataEntity<User> {
this.loginFlag = loginFlag;
}
@SupCol(isUnique="true", isHide="true")
@ExcelField(title="ID", type=1, align=2, sort=1)
@SupCol(isUnique = "true", isHide = "true")
@ExcelField(title = "ID", type = 1, align = 2, sort = 1)
public String getId() {
return id;
}
@JsonIgnore
@NotNull(message="归属公司不能为空")
@ExcelField(title="归属公司", align=2, sort=20)
@NotNull(message = "归属公司不能为空")
@ExcelField(title = "归属公司", align = 2, sort = 20)
public Office getCompany() {
return company;
}
......@@ -109,8 +118,8 @@ public class User extends DataEntity<User> {
}
@JsonIgnore
@NotNull(message="归属部门不能为空")
@ExcelField(title="归属部门", align=2, sort=25)
@NotNull(message = "归属部门不能为空")
@ExcelField(title = "归属部门", align = 2, sort = 25)
public Office getOffice() {
return office;
}
......@@ -119,8 +128,8 @@ public class User extends DataEntity<User> {
this.office = office;
}
@Length(min=1, max=100, message="登录名长度必须介于 1 和 100 之间")
@ExcelField(title="登录名", align=2, sort=30)
@Length(min = 1, max = 100, message = "登录名长度必须介于 1 和 100 之间")
@ExcelField(title = "登录名", align = 2, sort = 30)
public String getLoginName() {
return loginName;
}
......@@ -130,7 +139,7 @@ public class User extends DataEntity<User> {
}
@JsonIgnore
@Length(min=1, max=100, message="密码长度必须介于 1 和 100 之间")
@Length(min = 1, max = 100, message = "密码长度必须介于 1 和 100 之间")
public String getPassword() {
return password;
}
......@@ -139,14 +148,14 @@ public class User extends DataEntity<User> {
this.password = password;
}
@Length(min=1, max=100, message="姓名长度必须介于 1 和 100 之间")
@ExcelField(title="姓名", align=2, sort=40)
@Length(min = 1, max = 100, message = "姓名长度必须介于 1 和 100 之间")
@ExcelField(title = "姓名", align = 2, sort = 40)
public String getName() {
return name;
}
@Length(min=1, max=100, message="工号长度必须介于 1 和 100 之间")
@ExcelField(title="工号", align=2, sort=45)
@Length(min = 1, max = 100, message = "工号长度必须介于 1 和 100 之间")
@ExcelField(title = "工号", align = 2, sort = 45)
public String getNo() {
return no;
}
......@@ -159,9 +168,9 @@ public class User extends DataEntity<User> {
this.name = name;
}
@Email(message="邮箱格式不正确")
@Length(min=0, max=200, message="邮箱长度必须介于 1 和 200 之间")
@ExcelField(title="邮箱", align=1, sort=50)
@Email(message = "邮箱格式不正确")
@Length(min = 0, max = 200, message = "邮箱长度必须介于 1 和 200 之间")
@ExcelField(title = "邮箱", align = 1, sort = 50)
public String getEmail() {
return email;
}
......@@ -170,8 +179,8 @@ public class User extends DataEntity<User> {
this.email = email;
}
@Length(min=0, max=200, message="电话长度必须介于 1 和 200 之间")
@ExcelField(title="电话", align=2, sort=60)
@Length(min = 0, max = 200, message = "电话长度必须介于 1 和 200 之间")
@ExcelField(title = "电话", align = 2, sort = 60)
public String getPhone() {
return phone;
}
......@@ -180,8 +189,8 @@ public class User extends DataEntity<User> {
this.phone = phone;
}
@Length(min=0, max=200, message="手机长度必须介于 1 和 200 之间")
@ExcelField(title="手机", align=2, sort=70)
@Length(min = 0, max = 200, message = "手机长度必须介于 1 和 200 之间")
@ExcelField(title = "手机", align = 2, sort = 70)
public String getMobile() {
return mobile;
}
......@@ -190,13 +199,13 @@ public class User extends DataEntity<User> {
this.mobile = mobile;
}
@ExcelField(title="备注", align=1, sort=900)
@ExcelField(title = "备注", align = 1, sort = 900)
public String getRemarks() {
return remarks;
}
@Length(min=0, max=100, message="用户类型长度必须介于 1 和 100 之间")
@ExcelField(title="用户类型", align=2, sort=80, dictType="sys_user_type")
@Length(min = 0, max = 100, message = "用户类型长度必须介于 1 和 100 之间")
@ExcelField(title = "用户类型", align = 2, sort = 80, dictType = "sys_user_type")
public String getUserType() {
return userType;
}
......@@ -205,12 +214,12 @@ public class User extends DataEntity<User> {
this.userType = userType;
}
@ExcelField(title="创建时间", type=0, align=1, sort=90)
@ExcelField(title = "创建时间", type = 0, align = 1, sort = 90)
public Date getCreateDate() {
return createDate;
}
@ExcelField(title="最后登录IP", type=1, align=1, sort=100)
@ExcelField(title = "最后登录IP", type = 1, align = 1, sort = 100)
public String getLoginIp() {
return loginIp;
}
......@@ -220,7 +229,7 @@ public class User extends DataEntity<User> {
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelField(title="最后登录日期", type=1, align=1, sort=110)
@ExcelField(title = "最后登录日期", type = 1, align = 1, sort = 110)
public Date getLoginDate() {
return loginDate;
}
......@@ -246,7 +255,7 @@ public class User extends DataEntity<User> {
}
public String getOldLoginIp() {
if (oldLoginIp == null){
if (oldLoginIp == null) {
return loginIp;
}
return oldLoginIp;
......@@ -258,7 +267,7 @@ public class User extends DataEntity<User> {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getOldLoginDate() {
if (oldLoginDate == null){
if (oldLoginDate == null) {
return loginDate;
}
return oldLoginDate;
......@@ -285,7 +294,7 @@ public class User extends DataEntity<User> {
}
@JsonIgnore
@ExcelField(title="拥有角色", align=1, sort=800, fieldType=RoleListType.class)
@ExcelField(title = "拥有角色", align = 1, sort = 800, fieldType = RoleListType.class)
public List<Role> getRoleList() {
return roleList;
}
......@@ -311,6 +320,7 @@ public class User extends DataEntity<User> {
roleList.add(role);
}
}
/**
* 获取数据库名称
*/
......@@ -318,6 +328,7 @@ public class User extends DataEntity<User> {
public String getDbName() {
return GConstants.getValue("jdbc.type", "mysql");
}
public Position getPosition() {
return position;
}
......@@ -341,11 +352,11 @@ public class User extends DataEntity<User> {
return Collections3.extractToString(roleList, "name", ",");
}
public boolean isAdmin(){
public boolean isAdmin() {
return isAdmin(this.id);
}
public static boolean isAdmin(String id){
public static boolean isAdmin(String id) {
return id != null && "1".equals(id);
}
......
src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java
......@@ -33,6 +33,8 @@ public class WorkbenchBean {
private int confirmed = 0;
private int verified = 0;
private int unsettled = 0;
private int unreaListic = 0;
private int transfer = 0;
//总体
private int total = 0;
......@@ -59,6 +61,29 @@ public class WorkbenchBean {
private int businessManagement = 0;
private int rAndD = 0;
private int iAndD = 0;
private int propertyManagement = 0;
private int hotelManagement = 0;
private int development = 0;
private int Other = 0;
private int land = 0;
public int getLand() {
return land;
}
public void setLand(int land) {
this.land = land;
}
public int getForensic() {
return forensic;
}
public void setForensic(int forensic) {
this.forensic = forensic;
}
private int forensic = 0;
public WorkbenchBean() {
}
......@@ -374,4 +399,53 @@ public class WorkbenchBean {
public void setUnsettled(int unsettled) {
this.unsettled = unsettled;
}
public int getUnreaListic() {
return unreaListic;
}
public void setUnreaListic(int unreaListic) {
this.unreaListic = unreaListic;
}
public int getTransfer() {
return transfer;
}
public void setTransfer(int transfer) {
this.transfer = transfer;
}
public int getPropertyManagement() {
return propertyManagement;
}
public void setPropertyManagement(int propertyManagement) {
this.propertyManagement = propertyManagement;
}
public int getHotelManagement() {
return hotelManagement;
}
public void setHotelManagement(int hotelManagement) {
this.hotelManagement = hotelManagement;
}
public int getDevelopment() {
return development;
}
public void setDevelopment(int development) {
this.development = development;
}
public int getOther() {
return Other;
}
public void setOther(int other) {
Other = other;
}
}
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -24,143 +24,161 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
@Autowired
private ReportDao reportDao;
public WorkbenchBean getWorkbench(WorkbenchBean workbench) throws Exception{
public WorkbenchBean getWorkbench(WorkbenchBean workbench) throws Exception {
// WorkbenchBean workbench = new WorkbenchBean();
if(StringUtils.isBlank(workbench.getStartDate()) && StringUtils.isBlank(workbench.getEndDate())){
if (StringUtils.isBlank(workbench.getStartDate()) && StringUtils.isBlank(workbench.getEndDate())) {
workbench.setEndDate(DateUtils.getDate());
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
Calendar c = Calendar.getInstance();
c.setTime(df.parse(workbench.getEndDate()));
c.set(Calendar.DATE, c.get(Calendar.DATE)-30);
c.set(Calendar.DATE, c.get(Calendar.DATE) - 30);
String startDate = df.format(c.getTime());
workbench.setStartDate(startDate);
}else if(StringUtils.isNotBlank(workbench.getStartDate()) && StringUtils.isBlank(workbench.getEndDate())){
} else if (StringUtils.isNotBlank(workbench.getStartDate()) && StringUtils.isBlank(workbench.getEndDate())) {
workbench.setEndDate(DateUtils.getDate());
}else if(StringUtils.isBlank(workbench.getStartDate()) && StringUtils.isNotBlank(workbench.getEndDate())){
} else if (StringUtils.isBlank(workbench.getStartDate()) && StringUtils.isNotBlank(workbench.getEndDate())) {
workbench.setStartDate("2017-09-12");
}
workbench.setTotalCount(reportDao.getTotalNum(workbench));
List<HashMap> results = reportDao.getReportResult(workbench);
//举报结果
for (HashMap res:results) {
if(StringUtils.isNotBlank((String) res.get("DEAL_RESULT"))){
if("1".equals((String) res.get("DEAL_RESULT"))){
for (HashMap res : results) {
if (StringUtils.isNotBlank((String) res.get("DEAL_RESULT"))) {
if ("1".equals((String) res.get("DEAL_RESULT"))) {
//移交客诉
workbench.setComplainNum(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("2".equals((String) res.get("DEAL_RESULT"))){
} else if ("2".equals((String) res.get("DEAL_RESULT"))) {
//举报无效
workbench.setInvalid(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("3".equals((String) res.get("DEAL_RESULT"))){
} else if ("3".equals((String) res.get("DEAL_RESULT"))) {
//举报受理
workbench.setVerified(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("4".equals((String) res.get("DEAL_RESULT"))){
} else if ("4".equals((String) res.get("DEAL_RESULT"))) {
//举报属实
workbench.setConfirmed(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
} else if ("5".equals((String) res.get("DEAL_RESULT"))) {
//举报不实
workbench.setUnreaListic(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
} else if ("6".equals((String) res.get("DEAL_RESULT"))) {
//移交其他部门
workbench.setTransfer(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}
}
}
workbench.setRepResultTotal(workbench.getComplainNum()+workbench.getInvalid()+workbench.getVerified()+workbench.getConfirmed());
workbench.setUnsettled(workbench.getTotalCount()-workbench.getRepResultTotal());
workbench.setRepResultTotal(workbench.getComplainNum() + workbench.getInvalid() + workbench.getVerified() + workbench.getConfirmed());
workbench.setUnsettled(workbench.getTotalCount() - workbench.getRepResultTotal());
List<HashMap> statusList = reportDao.getReportStatus(workbench);
//举报状态
for(HashMap status:statusList){
if(StringUtils.isNotBlank((String) status.get("REPORT_STATUS"))){
if("1".equals(String.valueOf(status.get("REPORT_STATUS")))){
for (HashMap status : statusList) {
if (StringUtils.isNotBlank((String) status.get("REPORT_STATUS"))) {
if ("1".equals(String.valueOf(status.get("REPORT_STATUS")))) {
//处理中
workbench.setProcessing(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("2".equals(String.valueOf(status.get("REPORT_STATUS")))){
} else if ("2".equals(String.valueOf(status.get("REPORT_STATUS")))) {
//已处理
workbench.setProcessed(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("0".equals(String.valueOf(status.get("REPORT_STATUS")))){
} else if ("0".equals(String.valueOf(status.get("REPORT_STATUS")))) {
//未处理
workbench.setUnProcess(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("3".equals(String.valueOf(status.get("REPORT_STATUS")))){
} else if ("3".equals(String.valueOf(status.get("REPORT_STATUS")))) {
//已关闭
workbench.setClosed(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}
}
}
workbench.setRepStatusTotal(workbench.getUnProcess()+workbench.getProcessing()+workbench.getProcessed()+workbench.getClosed());
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 manpower = type.get("manpower");
workbench.setManpower(Integer.valueOf(manpower.toString()));
//物业
Object tenement = type.get("tenement");
workbench.setTenement(Integer.valueOf(tenement.toString()));
//投诉
Object complain = type.get("complain");
workbench.setComplain(Integer.valueOf(complain.toString()));
//行政
Object administration = type.get("administration");
workbench.setAdministration(Integer.valueOf(administration.toString()));
//财务
Object finance = type.get("finance");
workbench.setFinance(Integer.valueOf(finance.toString()));
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 propertyManagement = type.get("propertyManagement");
workbench.setiAndD(Integer.valueOf(propertyManagement.toString()));
//酒店管理
Object hotelManagement = type.get("hotelManagement");
workbench.setiAndD(Integer.valueOf(hotelManagement.toString()));
//商业管理
Object businessManagement = type.get("businessManagement");
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 syManagement = type.get("businessManagement");
workbench.setiAndD(Integer.valueOf(syManagement.toString()));
}
List<HashMap> totals = reportDao.getTotal(workbench);
for (HashMap total:totals){
if(StringUtils.isNotBlank((String) total.get("REPORT_SOURCE"))){
if("web".equals((String) total.get("REPORT_SOURCE"))){
for (HashMap total : totals) {
if (StringUtils.isNotBlank((String) total.get("REPORT_SOURCE"))) {
if ("web".equals((String) total.get("REPORT_SOURCE"))) {
//官网
workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("oa".contains((String) total.get("REPORT_SOURCE"))){
} else if ("oa".contains((String) total.get("REPORT_SOURCE"))) {
//融创oa
workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("supplier".equals(String.valueOf(total.get("REPORT_SOURCE")))){
} else if ("supplier".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//供应商
workbench.setSupplier(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("wechat".equals(String.valueOf(total.get("REPORT_SOURCE")))){
} else if ("wechat".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//微信公众号
workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("sunacE".equals(String.valueOf(total.get("REPORT_SOURCE")))){
} else if ("sunacE".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//融E
workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("offline".equals(String.valueOf(total.get("REPORT_SOURCE")))){
} else if ("offline".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//线下扫码
workbench.setOffline(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("tel".equals(String.valueOf(total.get("REPORT_SOURCE")))){
} else if ("tel".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//电话
workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("email".equals((String) total.get("REPORT_SOURCE"))){
} else if ("email".equals((String) total.get("REPORT_SOURCE"))) {
//邮件
workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("visit".equals((String) total.get("REPORT_SOURCE"))){
} else if ("visit".equals((String) total.get("REPORT_SOURCE"))) {
//来访
workbench.setVisit(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}
}
}
workbench.setTotal(workbench.getWeb()+workbench.getOa()+workbench.getSupplier()+workbench.getWeChat()+
workbench.getSunacE()+workbench.getOffline()+workbench.getPhone()+workbench.getEmail()+workbench.getVisit());
workbench.setTotal(workbench.getWeb() + workbench.getOa() + workbench.getSupplier() + workbench.getWeChat() +
workbench.getSunacE() + workbench.getOffline() + workbench.getPhone() + workbench.getEmail() + workbench.getVisit());
return workbench;
}
public List<ReportEntity> getRepList(WorkbenchBean benchBean) throws Exception{
public List<ReportEntity> getRepList(WorkbenchBean benchBean) throws Exception {
return reportDao.getRepList(benchBean);
}
}
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
......@@ -34,20 +34,20 @@ public class WorkbenchController extends BaseController {
private ReportService reportService;
@RequiresPermissions("workbench:view")
@RequestMapping(value={"list",""})
public String getWorkbench(Model model,WorkbenchBean bean){
@RequestMapping(value = {"list", ""})
public String getWorkbench(Model model, WorkbenchBean bean) {
WorkbenchBean workbench;
try {
User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean);
if(StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())){
if (StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())) {
bean.setProcessStatus("0");
}else if("1".equals(bean.getProcessStatus())){
} else if ("1".equals(bean.getProcessStatus())) {
bean.setProcessStatus("1");
}
List<ReportEntity> repList = workbenchService.getRepList(bean);
model.addAttribute("workbench",bean);
model.addAttribute("repList",repList);
model.addAttribute("workbench", bean);
model.addAttribute("repList", repList);
} catch (Exception e) {
e.printStackTrace();
}
......@@ -56,41 +56,45 @@ public class WorkbenchController extends BaseController {
@RequestMapping("/getHighcharts")
@ResponseBody
public void getHighcharts(WorkbenchBean bean,HttpServletResponse response){
public void getHighcharts(WorkbenchBean bean, HttpServletResponse response) {
JSONObject res = new JSONObject();
try {
User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean);
res.put("bench",bean);
res.put("bench", bean);
//举报状态
res.put("unProcess",bean.getUnProcess());
res.put("processing",bean.getProcessing());
res.put("processed",bean.getProcessed());
res.put("closed",bean.getClosed());
res.put("unProcess", bean.getUnProcess());
res.put("processing", bean.getProcessing());
res.put("processed", bean.getProcessed());
res.put("closed", bean.getClosed());
//举报结果
res.put("unsettled",bean.getUnsettled());
res.put("invalid",bean.getInvalid());
res.put("complainNum",bean.getComplainNum());
res.put("verified",bean.getVerified());
res.put("confirmed",bean.getConfirmed());
res.put("startDate",bean.getStartDate());
res.put("endDate",bean.getEndDate());
res.put("unsettled", bean.getUnsettled());
res.put("invalid", bean.getInvalid());
res.put("complainNum", bean.getComplainNum());
res.put("verified", bean.getVerified());
res.put("confirmed", bean.getConfirmed());
res.put("unreaListic", bean.getConfirmed());
res.put("transfer", bean.getConfirmed());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报类型
res.put("sale",bean.getSale());
res.put("project",bean.getProject());
res.put("cost",bean.getCost());
res.put("forMining",bean.getForMining());
res.put("manpower",bean.getManpower());
res.put("tenement",bean.getTenement());
res.put("complain",bean.getComplain());
res.put("administration",bean.getAdministration());
res.put("finance",bean.getFinance());
res.put("businessManagement",bean.getBusinessManagement());
res.put("rAndD",bean.getrAndD());
res.put("iAndD",bean.getiAndD());
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("propertyManagement", bean.getPropertyManagement());
res.put("hotelManagement", bean.getHotelManagement());
res.put("businessManagement", bean.getBusinessManagement());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
String jsonStr = res.toJSONString();
PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8");
......@@ -101,8 +105,8 @@ public class WorkbenchController extends BaseController {
}
}
public WorkbenchBean getWorkbenchByUser(User user,WorkbenchBean bean){
if(user != null) {
public WorkbenchBean getWorkbenchByUser(User user, WorkbenchBean bean) {
if (user != null) {
try {
//判断登录人的角色
String roleName = reportService.findRole(user);
......
src/main/resources/jdbc.properties
......@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
##融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
#jdbc.username= easdba
#jdbc.password= oracle
#正式数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -58,7 +58,7 @@
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
<where>
1 = 1
<if test="exchangeAfterUser != null and exchangeAfterUser != ''">
<if test="isAdmin == null">
AND r.exchange_after_user = #{exchangeAfterUser}
</if>
<if test="reportStatus != null and reportStatus != ''">
......@@ -121,6 +121,80 @@
ORDER BY r.update_date DESC
</select>
<select id="findQyList" parameterType="ReportEntity" resultType="ReportEntity">
SELECT
<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
<where>
1 = 1
<if test="isAdmin == null">
AND r.create_by = #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
AND r.supplement_area !='Group' AND r.supplement_area IS NOT NULL
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
</if>
<if test="supplementTitle != null and supplementTitle != ''">
AND r.supplement_title LIKE
<if test="dbName == 'oracle'">'%'||#{supplementTitle}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{supplementTitle}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementTitle}, '%')</if>
</if>
<if test="reportProject != null and reportProject != ''">
AND (r.report_project LIKE
<if test="dbName == 'oracle'">'%'||#{reportProject}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{reportProject}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{reportProject}, '%')</if>
OR r.supplement_department LIKE
<if test="dbName == 'oracle'">'%'||#{reportProject}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{reportProject}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{reportProject}, '%')</if>
)
</if>
<if test="reportTimeFrom != null and reportTimeFrom != ''">
AND r.report_time &gt;= #{reportTimeFrom}
</if>
<if test="reportTimeTo != null and reportTimeTo != ''">
AND r.report_time &lt;= #{reportTimeTo}|| ' 23:59:59'
</if>
<if test="reportPersonName != null and reportPersonName != ''">
AND r.report_person_name LIKE
<if test="dbName == 'oracle'">'%'||#{reportPersonName}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{reportPersonName}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{reportPersonName}, '%')</if>
</if>
<if test="reportPersonTel != null and reportPersonTel != ''">
AND r.report_person_tel LIKE
<if test="dbName == 'oracle'">'%'||#{reportPersonTel}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{reportPersonTel}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{reportPersonTel}, '%')</if>
</if>
<if test="supplementType != null and supplementType != ''">
AND r.supplement_type LIKE
<if test="dbName == 'oracle'">'%'||#{supplementType}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{supplementType}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementType}, '%')</if>
</if>
<if test="dealResult != null and dealResult != ''">
AND r.deal_result = #{dealResult}
</if>
<if test="supplementInformant != null and supplementInformant != ''">
AND r.supplement_informant LIKE
<if test="dbName == 'oracle'">'%'||#{supplementInformant}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{supplementInformant}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementInformant}, '%')</if>
</if>
<if test="supplementArea != null and supplementArea != ''">
AND r.supplement_area = #{supplementArea}
</if>
</where>
ORDER BY r.update_date DESC
</select>
<select id="findAllList" parameterType="ReportEntity" resultType="ReportEntity">
SELECT
<include refid="reportColumns"/>
......@@ -166,7 +240,7 @@
report_source,
report_status,
supplement_informant,
supplement_title，
supplement_title,
exchange_before_user,
exchange_after_user,
exchange_type,
......@@ -188,7 +262,7 @@
#{reportPersonEmail},
#{reportSource},
#{reportStatus},
#{supplementInformant}，
#{supplementInformant},
#{supplementTitle},
#{exchangeBeforeUser},
#{exchangeAfterUser},
......@@ -225,6 +299,7 @@
UPDATE ct_bbtc_report SET
supplement_informant = #{supplementInformant},
supplement_type = #{supplementType},
transfer_department=#{transferDepartment},
supplement_area = #{supplementArea},
supplement_project = #{supplementProject},
supplement_content = #{supplementContent},
......@@ -256,7 +331,7 @@
sp.position_name AS "position.name",
sr.name AS "role.name",
<if test="dbName == 'oracle'">NVL (sac. NAME, NULL) || '-' || NVL (sao. NAME, NULL) AS "devision"</if>
<if test="dbName == 'mysql'"> CONCAT(IFNULL(sac.name,""),"-",IFNULL(sao.name,"")) AS "devision"</if>
<if test="dbName == 'mysql'">CONCAT(IFNULL(sac.name,""),"-",IFNULL(sao.name,"")) AS "devision"</if>
FROM
ct_bbtc_sys_user su
LEFT JOIN ct_bbtc_sys_office so1 ON so1.id = su.company_id
......@@ -309,8 +384,12 @@
<select id="getOfficeList" parameterType="Office" resultType="Office">
SELECT
so.id AS "id",
<if test="dbName == 'oracle'">so.name||'('||(SELECT s.name FROM ct_bbtc_sys_office s WHERE s.id = so.parent_id)||')' AS "name"</if>
<if test="dbName == 'mysql'">CONCAT(so.name,'(',(SELECT s.name FROM ct_bbtc_sys_office s WHERE s.id = so.parent_id),')') AS "name"</if>
<if test="dbName == 'oracle'">so.name||'('||(SELECT s.name FROM ct_bbtc_sys_office s WHERE s.id =
so.parent_id)||')' AS "name"
</if>
<if test="dbName == 'mysql'">CONCAT(so.name,'(',(SELECT s.name FROM ct_bbtc_sys_office s WHERE s.id =
so.parent_id),')') AS "name"
</if>
FROM ct_bbtc_sys_office so
WHERE so.type = '2'
</select>
......@@ -411,7 +490,8 @@
)
</insert>
<select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
<select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
resultType="java.util.HashMap">
select report_status,COUNT(report_status)
FROM ct_bbtc_report
WHERE 1=1
......@@ -419,17 +499,20 @@
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
GROUP BY report_status
</select>
<select id="getReportResult" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
<select id="getReportResult" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
resultType="java.util.HashMap">
select deal_result,COUNT(deal_result)
FROM ct_bbtc_report
WHERE 1 = 1
......@@ -437,12 +520,14 @@
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
GROUP BY deal_result
</select>
......@@ -455,42 +540,64 @@
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
GROUP BY report_source
</select>
<select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
<select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
resultType="java.util.HashMap">
SELECT
SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS "sale",
SUM(CASE WHEN supplement_type||',' LIKE '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 "manpower",
SUM(CASE WHEN supplement_type||',' LIKE '6,%' OR supplement_type||',' LIKE '%,6,%' THEN 1 ELSE 0 END) AS "tenement",
SUM(CASE WHEN supplement_type||',' LIKE '7,%' OR supplement_type||',' LIKE '%,7,%' THEN 1 ELSE 0 END) AS "complain",
SUM(CASE WHEN supplement_type||',' LIKE '8,%' OR supplement_type||',' LIKE '%,8,%' THEN 1 ELSE 0 END) AS "administration",
SUM(CASE WHEN supplement_type||',' LIKE '9,%' OR supplement_type||',' LIKE '%,9,%' THEN 1 ELSE 0 END) AS "finance",
SUM(CASE WHEN supplement_type||',' LIKE '10,%' OR supplement_type||',' LIKE '%,10,%' THEN 1 ELSE 0 END) AS "businessManagement",
SUM(CASE WHEN supplement_type||',' LIKE '11,%' OR supplement_type||',' LIKE '%,11,%' THEN 1 ELSE 0 END) AS "rAndD",
SUM(CASE WHEN supplement_type||',' LIKE '12,%' OR supplement_type||',' LIKE '%,12,%' THEN 1 ELSE 0 END) AS "iAndD"
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 '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
"hotelManagement",
SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
"businessManagement"
FROM ct_bbtc_report
WHERE 1=1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
</select>
......@@ -530,21 +637,24 @@
AND r.exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
order by r.create_date desc
)
WHERE
<if test="dbName == 'oracle'">rownum &lt;= 10</if>
<if test="dbName == 'mysql'"> limit 0,10</if>
<if test="dbName == 'mysql'">limit 0,10</if>
</select>
<select id="getChooseReportList" parameterType="com.ejweb.modules.report.entity.ReportEntity" resultType="com.ejweb.modules.report.entity.ReportEntity">
<select id="getChooseReportList" parameterType="com.ejweb.modules.report.entity.ReportEntity"
resultType="com.ejweb.modules.report.entity.ReportEntity">
SELECT
r.id AS "id",
r.report_project AS "reportProject",
......@@ -610,16 +720,18 @@
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
</select>
<delete id="deleteConclusion" >
<delete id="deleteConclusion">
delete from ct_bbtc_report
where id = #{id}
</delete>
......
src/main/resources/mappings/modules/sys/UserDao.xml
......@@ -234,6 +234,7 @@
password,
no,
name,
area,
email,
phone,
mobile,
......@@ -254,6 +255,7 @@
#{password},
#{no},
#{name},
#{area},
#{email},
#{phone},
#{mobile},
......@@ -288,6 +290,7 @@
password = #{password},
no = #{no},
name = #{name},
area=#{area},
email = #{email},
phone = #{phone},
mobile = #{mobile},
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -191,7 +191,6 @@
<form:input id="supplementType"
path="supplementType"
htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -219,13 +219,13 @@
/*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/
.t_r_content {
width: 100%;
height: 358px;
height: 410px;
background: #fff;
overflow: auto;
}
.cl_freeze {
height: 341px;
height: 410px;
overflow: hidden;
width: 101%;
}
......@@ -268,7 +268,9 @@
<ul class="nav nav-tabs">
<li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">跟踪中举报列表</a></li>
<li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/list?flag=0">未处理举报列表</a></li>
<li <c:if test="${flag eq '2'}">class="active"</c:if>><a href="${ctx}/report/list?flag=2">已处理举报列表</a></li>
<li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li>
<%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%>
</ul>
<form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post"
......@@ -300,7 +302,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('supplement_type')}" itemLabel="label" itemValue="value"
<form:options items="${fns:getDictList('business_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>
......@@ -334,7 +336,7 @@
<thead>
<tr>
<th style="width:5%">ID</th>
<th style="width:15%">标题</th>
<th style="width:15%" align="center">标题</th>
</tr>
</thead>
<tbody>
......@@ -342,7 +344,7 @@
<c:forEach items="${page.list}" var="report" varStatus="vs">
<tr class="reportList">
<td style="width:5%"></td>
<td style="width:15%">${report.supplementTitle}</td>
<td style="width:15%" align="left">${report.supplementTitle}</td>
</c:forEach>
</c:if>
</tr>
......@@ -369,6 +371,7 @@
<th>举报时间</th>
<th>状态</th>
<th>处理结论</th>
<th>移交部门</th>
<th>处理人</th>
<c:if test="${isAdmin eq true}">
<th>移交给</th>
......@@ -430,7 +433,10 @@
<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>${report.transferDepartment}</td>
<td><c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
</td>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -11,13 +11,15 @@
$("#inputForm").validate({
submitHandler: function (form) {
messages: {
supplementContent: {maxlength: "最多输入{0}个字符"}
supplementContent: {
maxlength: "最多输入{0}个字符"
}
if ($("#supplementType").val() == " "){
}
if ($("#supplementType").val() == " ") {
top.$.jBox.tip('请选择业务类型', 'warning');
}else if ($("#supplementArea").val() == " "){
} else if ($("#supplementArea").val() == " ") {
top.$.jBox.tip('请选择被举报区域', 'warning');
}else {
} else {
submitCount += 1;
if (submitCount == 1) {
loading('正在提交，请稍等...');
......@@ -73,12 +75,12 @@
<%--$(":radio[name='reportSource'][value='" + source + "']").prop("checked", "checked");--%>
var supplementType = $("#supplementType").find("option:selected").text();
var supplementInformant = "${report.supplementInformant}";
if(supplementType == "请选择"){
if (supplementType == "请选择") {
supplementType = "${report.reportProject}";
}
//判断是否显示是否完成选择框
var dealResult = $("#dealResult").val();
if (dealResult != null && dealResult != ' '){
if (dealResult != null && dealResult != ' ') {
$("#selectDone").show();
}
});
......@@ -94,7 +96,7 @@
* @author:xuzengqiang
* @since :2015-1-27 10:26:11
**/
var Browser=Browser || (function(window){
var Browser = Browser || (function (window) {
var document = window.document,
navigator = window.navigator,
agent = navigator.userAgent.toLowerCase(),
......@@ -103,128 +105,128 @@
//IE10:10(兼容模式7||8||9)
IEMode = document.documentMode,
//chorme
chrome = window.chrome || false ,
chrome = window.chrome || false,
System = {
//user-agent
agent : agent,
agent: agent,
//是否为IE
isIE : /msie/.test(agent),
isIE: /msie/.test(agent),
//Gecko内核
isGecko: agent.indexOf( "gecko" )> 0 && agent.indexOf( "like gecko" )< 0 ,
isGecko: agent.indexOf("gecko") > 0 && agent.indexOf("like gecko") < 0,
//webkit内核
isWebkit: agent.indexOf( "webkit" )> 0 ,
isWebkit: agent.indexOf("webkit") > 0,
//是否为标准模式
isStrict: document.compatMode === "CSS1Compat" ,
isStrict: document.compatMode === "CSS1Compat",
//是否支持subtitle
supportSubTitle:function(){
return "track" in document.createElement( "track" );
supportSubTitle: function () {
return "track" in document.createElement("track");
},
//是否支持scoped
supportScope:function(){
return "scoped" in document.createElement( "style" );
supportScope: function () {
return "scoped" in document.createElement("style");
},
//获取IE的版本号
ieVersion:function(){
ieVersion: function () {
try {
return agent.match(/msie ([\d.]+)/)[ 1 ] || 0 ;
return agent.match(/msie ([\d.]+)/)[1] || 0;
} catch (e) {
console.log( "error" );
console.log("error");
return IEMode;
}
},
//Opera版本号
operaVersion:function(){
operaVersion: function () {
try {
if (window.opera) {
return agent.match(/opera.([\d.]+)/)[ 1 ];
} else if (agent.indexOf( "opr" ) > 0 ) {
return agent.match(/opr\/([\d.]+)/)[ 1 ];
return agent.match(/opera.([\d.]+)/)[1];
} else if (agent.indexOf("opr") > 0) {
return agent.match(/opr\/([\d.]+)/)[1];
}
} catch (e) {
console.log( "error" );
return 0 ;
console.log("error");
return 0;
}
},
//描述:version过滤.如31.0.252.152 只保留31.0
versionFilter:function(){
if (arguments.length === 1 && typeof arguments[ 0 ] === "string" ) {
var version = arguments[ 0 ];
start = version.indexOf( "." );
if (start> 0 ){
end = version.indexOf( "." ,start+ 1 );
if (end !== - 1 ) {
return version.substr( 0 ,end);
versionFilter: function () {
if (arguments.length === 1 && typeof arguments[0] === "string") {
var version = arguments[0];
start = version.indexOf(".");
if (start > 0) {
end = version.indexOf(".", start + 1);
if (end !== -1) {
return version.substr(0, end);
}
}
return version;
} else if (arguments.length === 1 ) {
return arguments[ 0 ];
} else if (arguments.length === 1) {
return arguments[0];
}
return 0 ;
return 0;
}
};
try {
//浏览器类型(IE、Opera、Chrome、Safari、Firefox)
System.type = System.isIE? "IE" :
window.opera || (agent.indexOf( "opr" ) > 0 )? "Opera" :
(agent.indexOf( "chrome" )> 0 )? "Chrome" :
System.type = System.isIE ? "IE" :
window.opera || (agent.indexOf("opr") > 0) ? "Opera" :
(agent.indexOf("chrome") > 0) ? "Chrome" :
//safari也提供了专门的判定方式
window.openDatabase? "Safari" :
(agent.indexOf( "firefox" )> 0 )? "Firefox" :
'unknow' ;
window.openDatabase ? "Safari" :
(agent.indexOf("firefox") > 0) ? "Firefox" :
'unknow';
//版本号
System.version = (System.type === "IE" )?System.ieVersion():
(System.type === "Firefox" )?agent.match(/firefox\/([\d.]+)/)[ 1 ]:
(System.type === "Chrome" )?agent.match(/chrome\/([\d.]+)/)[ 1 ]:
(System.type === "Opera" )?System.operaVersion():
(System.type === "Safari" )?agent.match(/version\/([\d.]+)/)[ 1 ]:
"0" ;
System.version = (System.type === "IE") ? System.ieVersion() :
(System.type === "Firefox") ? agent.match(/firefox\/([\d.]+)/)[1] :
(System.type === "Chrome") ? agent.match(/chrome\/([\d.]+)/)[1] :
(System.type === "Opera") ? System.operaVersion() :
(System.type === "Safari") ? agent.match(/version\/([\d.]+)/)[1] :
"0";
//浏览器外壳
System.shell=function(){
System.shell = function () {
//遨游浏览器
if (agent.indexOf( "maxthon" ) > 0 ) {
System.version = agent.match(/maxthon\/([\d.]+)/)[ 1 ] || System.version ;
return "傲游浏览器" ;
if (agent.indexOf("maxthon") > 0) {
System.version = agent.match(/maxthon\/([\d.]+)/)[1] || System.version;
return "傲游浏览器";
}
//QQ浏览器
if (agent.indexOf( "qqbrowser" ) > 0 ) {
System.version = agent.match(/qqbrowser\/([\d.]+)/)[ 1 ] || System.version ;
return "QQ浏览器" ;
if (agent.indexOf("qqbrowser") > 0) {
System.version = agent.match(/qqbrowser\/([\d.]+)/)[1] || System.version;
return "QQ浏览器";
}
//搜狗浏览器
if ( agent.indexOf( "se 2.x" )> 0 ) {
return '搜狗浏览器' ;
if (agent.indexOf("se 2.x") > 0) {
return '搜狗浏览器';
}
//Chrome:也可以使用window.chrome && window.chrome.webstore判断
if (chrome && System.type !== "Opera" ) {
if (chrome && System.type !== "Opera") {
var external = window.external,
clientInfo = window.clientInformation,
//客户端语言:zh-cn,zh.360下面会返回undefined
clientLanguage = clientInfo.languages;
//猎豹浏览器:或者agent.indexOf("lbbrowser")>0
if ( external && 'LiebaoGetVersion' in external) {
return '猎豹浏览器' ;
if (external && 'LiebaoGetVersion' in external) {
return '猎豹浏览器';
}
//百度浏览器
if (agent.indexOf( "bidubrowser" )> 0 ) {
System.version = agent.match(/bidubrowser\/([\d.]+)/)[ 1 ] ||
agent.match(/chrome\/([\d.]+)/)[ 1 ];
return "百度浏览器" ;
if (agent.indexOf("bidubrowser") > 0) {
System.version = agent.match(/bidubrowser\/([\d.]+)/)[1] ||
agent.match(/chrome\/([\d.]+)/)[1];
return "百度浏览器";
}
//360极速浏览器和360安全浏览器
if ( System.supportSubTitle() && typeof clientLanguage === "undefined" ) {
if (System.supportSubTitle() && typeof clientLanguage === "undefined") {
//object.key()返回一个数组.包含可枚举属性和方法名称
var storeKeyLen = Object.keys(chrome.webstore).length,
v8Locale = "v8Locale" in window;
return storeKeyLen > 1 ? '360极速浏览器' : '360安全浏览器' ;
return storeKeyLen > 1 ? '360极速浏览器' : '360安全浏览器';
}
return "Chrome" ;
return "Chrome";
}
return System.type;
};
......@@ -235,37 +237,39 @@
System.version = System.versionFilter(System.version);
} catch (e) {
console.log( "error" );
console.log("error");
}
return {
client:System
client: System
};
})(window);
var userBrowser = Browser.client.name;
console.log(userBrowser);
function recordEmail() {
//记录已发送邮件
var reportId = $("#reportId").val();
$.ajax({
url: "${ctx}/report/recordEmail?reportId="+reportId,
url: "${ctx}/report/recordEmail?reportId=" + reportId,
dataType: "text",
success: function(result) { //登录成功后返回的数据
success: function (result) { //登录成功后返回的数据
console.log(result);
}
});
send();
}
//发邮件
function send(){
function send() {
var supplementType = $("#supplementType").find("option:selected").text();
var supplementInformant = "${report.supplementInformant}";
if(supplementType == "请选择"){
if (supplementType == "请选择") {
supplementType = "${report.reportProject}";
}
var path1 = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作";
var path1 = "mailto:?subject=举报核查-" + supplementType + "-" + supplementInformant + "违规操作";
path1 += "&body=Dear,%0D%0A附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。%0D%0A谢谢！";
path1 += "&body=Dear,%0D%0A附件是举报核查-" + supplementType + "-" + supplementInformant + "违规操作，请核实是否属实。%0D%0A谢谢！";
path1 += "%0D%0A%0D%0A举报内容%0D%0A";
path1 += "被举报项目/部门:${report.reportProject}%0D%0A";
path1 += "标题:${report.supplementTitle}%0D%0A";
......@@ -275,16 +279,16 @@
path1 += "IP来源:${report.reportIp}%0D%0A";
path1 += "IP所属城市:${report.ipCity}%0D%0A";
var isSendEmail = "${report.isSendEmail}";
if (isSendEmail == '1'){
if (isSendEmail == '1') {
isSendEmail = "是";
}else{
} else {
isSendEmail = "否";
}
path1 += "是否已发送邮件:"+isSendEmail+"%0D%0A";
path1 += "是否已发送邮件:" + isSendEmail + "%0D%0A";
var reportContent = $("#reportContent").val();
path1 += "内容:";
var path2 = "%0D%0A附件:%0D%0A";
$("#attachment1").find("[class='attachmentClass']").each(function(){
$("#attachment1").find("[class='attachmentClass']").each(function () {
var url = $(this).text();
path2 += url;
});
......@@ -293,61 +297,61 @@
path2 += "手机号:${report.reportPersonTel}%0D%0A";
path2 += "Email:${report.reportPersonEmail}%0D%0A";
var reportSource = "${report.reportSource}";
if (reportSource == "web"){
if (reportSource == "web") {
reportSource = "官网";
}else if (reportSource == "oa"){
} else if (reportSource == "oa") {
reportSource = "融创OA系统";
}else if (reportSource == "supplier"){
} else if (reportSource == "supplier") {
reportSource = "供应商系统";
}else if (reportSource == "wechat"){
} else if (reportSource == "wechat") {
reportSource = "微信公众号";
}else if (reportSource == "sunacE"){
} else if (reportSource == "sunacE") {
reportSource = "融E";
}else if (reportSource == "offline"){
} else if (reportSource == "offline") {
reportSource = "线下扫码";
}else if (reportSource == "tel"){
} else if (reportSource == "tel") {
reportSource = "电话";
}else if (reportSource == "email"){
} else if (reportSource == "email") {
reportSource = "邮件";
}else if (reportSource == "visit"){
} else if (reportSource == "visit") {
reportSource = "来访";
}
path2 += "举报途径:"+reportSource+"%0D%0A";
path2 += "举报途径:" + reportSource + "%0D%0A";
var reportStatus = "${report.reportStatus}";
if (reportStatus != "0"){
if (reportStatus != "0") {
path2 += "举报信息补充%0D%0A";
var supplementTypeStr = "${supplementTypeStr}";
path2 += "业务类型:"+supplementTypeStr+"%0D%0A";
path2 += "业务类型:" + supplementTypeStr + "%0D%0A";
var supplementArea = "${report.supplementArea}";
if (supplementArea == "North China"){
if (supplementArea == "North China") {
supplementArea = "华北区域公司";
}else if (supplementArea == "BeiJing"){
} else if (supplementArea == "BeiJing") {
supplementArea = "北京区域公司";
}else if (supplementArea == "ShangHai"){
} else if (supplementArea == "ShangHai") {
supplementArea = "上海区域公司";
}else if (supplementArea == "SouthWest"){
} else if (supplementArea == "SouthWest") {
supplementArea = "西南区域公司";
}else if (supplementArea == "SouthEast"){
} else if (supplementArea == "SouthEast") {
supplementArea = "东南区域公司";
}else if (supplementArea == "Central China"){
} else if (supplementArea == "Central China") {
supplementArea = "华中区域公司";
}else if (supplementArea == "GuangShen"){
} else if (supplementArea == "GuangShen") {
supplementArea = "广深区域公司";
}else if (supplementArea == "Hainan"){
} else if (supplementArea == "Hainan") {
supplementArea = "海南区域公司";
}else if (supplementArea == "Group"){
} else if (supplementArea == "Group") {
supplementArea = "集团本部";
}
path2 += "被举报区域:"+ supplementArea +"%0D%0A";
path2 += "被举报区域:" + supplementArea + "%0D%0A";
var supplementContent = $("#supplementContent").val();
path2 += "内容:";
var path3 = "%0D%0A附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function(){
$("#attachment2").find("[class='attachmentClass']").each(function () {
var url = $(this).text();
path3 += url;
});
}
var path = path1+reportContent+path2+supplementContent+path3;
var path = path1 + reportContent + path2 + supplementContent + path3;
console.log(path);
var pathLength = "";
if (userBrowser == "Chrome" || userBrowser == "QQ浏览器"
......@@ -358,17 +362,17 @@
path = path1 + path2 + path3;
pathLength = path.replace(/[^\x00-\xff]/g, "*********").length;
alert("填写信息过长,请手动补充缺少的举报内容。推荐使用IE浏览器");
if (pathLength > 1000){
if (pathLength > 1000) {
path = path1 + path2;
}
}
}else if (userBrowser == "IE") {
} else if (userBrowser == "IE") {
pathLength = path.replace(/[^\x00-\xff]/g, "*").length;
if (pathLength > 1000) {
path = path1 + reportContent + path2 + path3;
pathLength = path.replace(/[^\x00-\xff]/g, "*").length;
alert("填写信息过长,请手动补充缺少的举报内容");
if (pathLength > 1000){
if (pathLength > 1000) {
path = path1 + path2 + path3;
}
}
......@@ -383,39 +387,49 @@
console.log(path);
console.log(pathLength);
// window.location.href = path;
$("#sendE").attr("href",path);
$("#sendE").attr("href", path);
}
//显示是否完成选择框
function showDone(){
function showDone() {
var dealResult = $("#dealResult").val();
if (dealResult != null && dealResult != ' '){
if (dealResult != null && dealResult != ' ') {
if (dealResult == "6") {
$("#selectType").show();
} else {
$("#selectType").hide();
}
$("#selectDone").show();
}else {
} else {
$("#selectDone").hide();
}
}
function getPersonName() {
var dealPersonName = $("#dealPerson").val();
$("#dealPersonName").val(dealPersonName);
}
</script>
<style type="text/css">
.title{
font-size:16px;
font-weight:bold;
.title {
font-size: 16px;
font-weight: bold;
}
.black_overlay{
.black_overlay {
display: none;
position: absolute;
top: 0%;
left: 0%;
width: 100%;
height: 100%;
z-index:1001;
z-index: 1001;
-moz-opacity: 0.8;
opacity:.80;
opacity: .80;
filter: alpha(opacity=80);
}
.white_content {
display: none;
position: absolute;
......@@ -425,11 +439,11 @@
height: 80%;
border: 1px solid;
background-color: white;
z-index:1002;
z-index: 1002;
overflow: auto;
}
#chooseContent{
#chooseContent {
margin: 20px 20px 20px 20px;
}
</style>
......@@ -439,53 +453,59 @@
<li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:hidden id="reportId" path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<form:hidden id="reportId" path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
</div>
<div id="reportDetail">
</div>
<div id="reportDetail">
<span class="title">举报内容</span>
<div class="control-group">
<label class="control-label">被举报项目/部门:</label>
<div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportProject" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">标题:</label>
<div class="controls">
<form:input path="supplementTitle" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="supplementTitle" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报人:</label>
<div class="controls">
<form:input path="supplementInformant" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="supplementInformant" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报时间:</label>
<div class="controls">
<form:input path="reportTime" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportTime" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">所在城市:</label>
<div class="controls">
<form:input path="reportCity" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportCity" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">IP来源:</label>
<div class="controls">
<form:input path="reportIp" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportIp" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
......@@ -497,13 +517,15 @@
<div class="control-group">
<label class="control-label">是否已发送邮件:</label>
<div class="controls">
<form:input path="isSendEmail" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="isSendEmail" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="reportContent" htmlEscape="true" style="width:90%" path="reportContent" rows="6" maxlength="500" class="input-xxlarge" disabled="true"/>
<form:textarea id="reportContent" htmlEscape="true" style="width:90%" path="reportContent" rows="6"
maxlength="500" class="input-xxlarge" disabled="true"/>
</div>
</div>
<div class="control-group">
......@@ -518,39 +540,44 @@
<div class="control-group">
<label class="control-label">姓名:</label>
<div class="controls">
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">手机号:</label>
<div class="controls">
<form:input path="reportPersonTel" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportPersonTel" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">Email:</label>
<div class="controls">
<form:input path="reportPersonEmail" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
<form:input path="reportPersonEmail" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label"
itemValue="value"
htmlEscape="false" disabled="true" style="margin-right: -23px\9;"/>
</div>
</div>
</div>
<span class="title">举报信息补充</span>
<div class="control-group">
</div>
<span class="title">举报信息补充</span>
<div class="control-group">
<label class="control-label">业务类型:</label>
<div class="controls">
<span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value" class="required"/>
<form:checkboxes path="supplementType" items="${fns:getDictList('business_type')}"
itemLabel="label" itemValue="value" class="required"/>
</span>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">被举报区域:</label>
<div class="controls">
<form:select id="supplementArea" path="supplementArea" class="input-small required">
......@@ -559,16 +586,16 @@
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="6"
style="width:90%"
maxlength="3000" class="input-xxlarge" placeholder="最多输入3000个字符"/>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">附件:</label>
<div id="attachment2" class="controls">
<c:if test="${supplementAttachmentList ne null}">
......@@ -581,17 +608,18 @@
<sys:ckfinder input="nameFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div>
<span class="title">处理结果</span>
<div class="control-group">
</div>
<span class="title">处理结果</span>
<div class="control-group">
<label class="control-label">处理人:</label>
<div class="controls">
<input type="text" id="dealPersonName" name="dealPersonName" value="" style="display:none;"/>
<form:input path="dealPerson" id="dealPerson" htmlEscape="false" maxlength="200" class="input-xlarge required" onchange="getPersonName();"/>
<form:input path="dealPerson" id="dealPerson" htmlEscape="false" maxlength="200" class="input-xlarge required"
onchange="getPersonName();"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">处理成果文件:</label>
<div id="attachment3" class="controls">
<c:if test="${dealAttachmentList ne null}">
......@@ -610,10 +638,22 @@
<div class="controls">
<form:select path="dealResult" id="dealResult" class="input-small required" onchange="showDone();">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>
</form:select>
</div>
<br>
<div id="selectType" class="control-group" style="display:none">
<label class="control-label">移交部门:</label>
<div class="controls">
<form:select id="" path="transferDepartment" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<br>
<div class="controls" id="selectDone" style="display:none">
<input type="checkbox" id="ifDone" name="ifDone" value="ifDone"/>是否完成
</div>
......@@ -622,9 +662,11 @@
<label class="control-label">移交:</label>
<div class="controls">
<input type="text" id="userId" name="exchangeAfterUser" value="" style="display:none;"/>
<input id="chooseUser" type="text" <c:if test="${report.exchangeType eq null}">value="选择移交人员" </c:if>
<input id="chooseUser" type="text"
<c:if test="${report.exchangeType eq null}">value="选择移交人员" </c:if>
<c:if test="${report.exchangeAfterUser ne null && report.exchangeType ne null}">value="${report.transferName}" </c:if>
<c:if test="${isAdmin eq false}">disabled="true" style="color:#888"</c:if> htmlEscape="false" maxlength="200" class="input-xlarge"/>
<c:if test="${isAdmin eq false}">disabled="true" style="color:#888"</c:if> htmlEscape="false"
maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="form-actions">
......@@ -637,7 +679,7 @@
<div id="chooseDiv" class="white_content">
<div id="chooseContent">
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$("#btnSearch").click(function () {
$.ajax({
url: "${ctx}/report/viewTransfer?flag=1",
......@@ -646,13 +688,13 @@
cache: false,
beforeSend: function () {
// 禁用按钮防止重复提交
$("#btnSearch").attr({ disabled: "disabled" });
$("#btnSearch").attr({disabled: "disabled"});
},
success: function(data) { //登录成功后返回的数据
success: function (data) { //登录成功后返回的数据
$("#userList").empty();
$("#userList").html($(data));
},
error:function(){
error: function () {
alert("数据错误！");
},
complete: function () {
......@@ -662,24 +704,27 @@
});
$("input:radio").click(function () {
$("input:radio").attr("checked",false);
$("input:radio").attr("checked", false);
$("#chooseItem").empty();
$(this).attr("checked",true);
$("#chooseItem").html("已选择 " + b.parent().next().next().next().html()+"<span onclick='remove();'><font size='5'> ×</font></span>");
$(this).attr("checked", true);
$("#chooseItem").html("已选择 " + b.parent().next().next().next().html() + "<span onclick='remove();'><font size='5'> ×</font></span>");
});
});
function chooseRen(obj) {
$("input:radio").attr("checked",false);
$("input:radio").attr("checked", false);
$("#chooseItem").empty();
obj.checked = true;
$("#chooseItem").html("已选择 " + $("input:radio:checked").parent().next().next().next().html()+"<span onclick='remove();'><font size='5'> ×</font></span>");
$("#chooseItem").html("已选择 " + $("input:radio:checked").parent().next().next().next().html() + "<span onclick='remove();'><font size='5'> ×</font></span>");
}
function remove(){
$("input:radio").attr("checked",false);
function remove() {
$("input:radio").attr("checked", false);
$("#chooseItem").empty();
}
function page(n,s){
function page(n, s) {
$("#pageNo").val(n);
$("#pageSize").val(s);
$.ajax({
......@@ -687,16 +732,17 @@
dataType: "html",
data: $('#searchForm').serialize(),
cache: false,
success: function(data) { //登录成功后返回的数据
success: function (data) { //登录成功后返回的数据
$("#userList").empty();
$("#userList").html($(data));
},
error:function(){
error: function () {
alert("数据错误！");
}
});
return false;
}
function resetPageNo() {
$("#pageNo").val(0);
}
......@@ -706,9 +752,12 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<ul class="ul-form">
<li><label>员工号：</label><form:input onchange="resetPageNo();" path="no" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>姓名：</label><form:input onchange="resetPageNo();" path="name" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>手机号：</label><form:input onchange="resetPageNo();" path="mobile" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>员工号：</label><form:input onchange="resetPageNo();" path="no" htmlEscape="false"
maxlength="50" class="input-small"/></li>
<li><label>姓名：</label><form:input onchange="resetPageNo();" path="name" htmlEscape="false"
maxlength="50" class="input-small"/></li>
<li><label>手机号：</label><form:input onchange="resetPageNo();" path="mobile" htmlEscape="false"
maxlength="50" class="input-small"/></li>
<li><label>公司：</label><form:select onchange="resetPageNo();" path="company.id" class="input-small ">
<form:option value=" ">请选择</form:option>
<form:options items="${companyList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
......@@ -716,12 +765,16 @@
<li class="clearfix"></li>
<li><label>部门：</label><form:select onchange="resetPageNo();" path="office.id" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${officeList}" itemLabel="name" itemValue="id" htmlEscape="false"/></form:select></li>
<li><label>职位：</label><form:select onchange="resetPageNo();" path="position.name" class="input-small">
<form:options items="${officeList}" itemLabel="name" itemValue="id"
htmlEscape="false"/></form:select></li>
<li><label>职位：</label><form:select onchange="resetPageNo();" path="position.name"
class="input-small">
<form:option value=" " selected="selected">请选择</form:option>
<form:options items="${positionList}" itemLabel="name" itemValue="id" htmlEscape="false"/></form:select></li>
<form:options items="${positionList}" itemLabel="name" itemValue="id"
htmlEscape="false"/></form:select></li>
<li class="btns">
<label style="width:auto;"><input id="btnSearch" class="btn btn-primary" type="button" value="筛选"/>&nbsp;&nbsp;</label>
<label style="width:auto;"><input id="btnSearch" class="btn btn-primary" type="button"
value="筛选"/>&nbsp;&nbsp;</label>
</li>
<li class="clearfix"></li>
</ul>
......
src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>用户管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$("#no").focus();
$("#inputForm").validate({
rules: {
......@@ -15,14 +15,14 @@
loginName: {remote: "用户登录名已存在"},
confirmNewPassword: {equalTo: "输入与上面相同的密码"}
},
submitHandler: function(form){
submitHandler: function (form) {
loading('正在提交，请稍等...');
form.submit();
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
errorPlacement: function (error, element) {
$("#messageBox").text("输入有误，请先更正。");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
error.appendTo(element.parent().parent());
} else {
error.insertAfter(element);
......@@ -33,11 +33,14 @@
</script>
</head>
<body>
<ul class="nav nav-tabs">
<ul class="nav nav-tabs">
<li><a href="${ctx}/sys/user/list">用户列表</a></li>
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul><br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<%--<div class="control-group">
......@@ -83,6 +86,16 @@
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<%--<div class="control-group">
<label class="control-label">密码:</label>
<div class="controls">
......@@ -137,7 +150,8 @@
<div class="control-group">
<label class="control-label">用户角色:</label>
<div class="controls">
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
......@@ -162,9 +176,10 @@
</div>
</c:if>--%>
<div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
</div>
</form:form>
</form:form>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>工作台</title>
......@@ -13,12 +13,12 @@
$(function () {
var startDate = $("#startDate").val();
var endDate = $("#endDate").val();
var start = startDate.substring(5).replace("-",".");
var end = endDate.substring(5).replace("-",".");
var start = startDate.substring(5).replace("-", ".");
var end = endDate.substring(5).replace("-", ".");
$.ajax({
type: "POST",
dataType: "JSON",
data: {"startDate":startDate,"endDate":endDate},
data: {"startDate": startDate, "endDate": endDate},
url: "getHighcharts.action",
success: function (result) {
$('#repStatus').highcharts({
......@@ -38,16 +38,16 @@
spacingLeft: 0
},
title: {//主标题
style: { "color": "#333333", "fontSize": "15px" },
text: '举报状态('+start+'-'+end+')'
style: {"color": "#333333", "fontSize": "15px"},
text: '举报状态(' + start + '-' + end + ')'
},
subtitle: {//副标题
align: 'right',
text: '总数&nbsp;:&nbsp;'+result.bench.totalCount+'<br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/>已处理&nbsp;:&nbsp;'+result.processed+'<br/>已关闭&nbsp;:&nbsp;'+result.closed,
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>未处理&nbsp;:&nbsp;' + result.unProcess + '<br/>跟踪中&nbsp;:&nbsp;' + result.processing + '<br/>已处理&nbsp;:&nbsp;' + result.processed + '<br/>已关闭&nbsp;:&nbsp;' + result.closed,
useHTML: true,
verticalAlign: 'top' ,
x: -5 ,
y: 80 ,
verticalAlign: 'top',
x: -5,
y: 80,
},
// legend : {
// align: 'left'
......@@ -101,27 +101,36 @@
},
xAxis: [{
categories: [
'营销',
'工程',
'成本',
'招采',
'人力',
'物业',
'投诉',
'行政',
'财务',
'商业管理',
'研发',
'投资开发'
'地产',
'物业管理',
'酒店管理',
'商业管理'
],
labels:{
enabled:false
// categories: [
// '营销',
// '工程',
// '成本',
// '招采',
// '财务',
// '法务',
// '行政',
// '人力',
// '开发',
// '研发',
// '投资',
// '其他',
// '物业管理',
// '酒店管理',
// '商业管理'
// ],
labels: {
enabled: false
},
crosshair: true
}],
yAxis: {
min: 0,
allowDecimals:false,
allowDecimals: false,
title: {
text: '人数'
}
......@@ -148,43 +157,66 @@
}
},
series: [{
name: '营销',
data: [result.sale]
}, {
name: '工程',
data: [result.project]
}, {
name: '成本',
data: [result.cost]
}, {
name: '招采',
data: [result.forMining]
name: '地产',
data: [result.land]
}, {
name: '人力',
data: [result.manpower]
name: '物业管理',
data: [result.propertyManagement]
}, {
name: '物业',
data: [result.tenement]
}, {
name: '投诉',
data: [result.complain]
}, {
name: '行政',
data: [result.administration]
}, {
name: '财务',
data: [result.finance]
name: '酒店管理',
data: [result.hotelManagement]
}, {
name: '商业管理',
data: [result.businessManagement]
}, {
name: '研发',
data: [result.rAndD]
}, {
name: '投资开发',
data: [result.iAndD]
}
]
// 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: {
......@@ -202,16 +234,16 @@
plotShadow: false
},
title: {//主标题
style: { "color": "#333333", "fontSize": "15px" },
text: '信息分类('+start+'-'+end+')'
style: {"color": "#333333", "fontSize": "15px"},
text: '信息分类(' + start + '-' + end + ')'
},
subtitle: {//副标题
align: 'right',
text: '总数&nbsp;:&nbsp;'+result.bench.totalCount+'<br/>举报无效&nbsp;:&nbsp;'+result.invalid+'<br/>移交客诉&nbsp;:&nbsp;'+result.complainNum+'<br/>举报受理&nbsp;:&nbsp;'+result.verified+'<br/>举报属实&nbsp;:&nbsp;'+result.confirmed+'<br/>举报未处理&nbsp;:&nbsp;'+result.unsettled,
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>举报未处理&nbsp;:&nbsp;' + result.unsettled + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
useHTML: true,
verticalAlign: 'top' ,
x: -5 ,
y: 80 ,
verticalAlign: 'top',
x: -5,
y: 80,
},
tooltip: {
headerFormat: '{series.name}<br>',
......@@ -235,7 +267,9 @@
['移交客诉', result.complainNum],
['举报受理', result.verified],
['举报属实', result.confirmed],
['举报不实', result.unreaListic],
['举报未处理', result.unsettled],
['移交其它部门', result.transfer]
]
}]
});
......@@ -247,11 +281,12 @@
</script>
</head>
<body>
<form:form id="searchForm" modelAttribute="" action="${ctx}/workbench/list" method="post" class="breadcrumb form-search">
<form:form id="searchForm" modelAttribute="" action="${ctx}/workbench/list" method="post"
class="breadcrumb form-search">
<%--<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
<%--<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
<%--<input id="flag" name="flag" type="hidden" value="${flag}"/>--%>
<ul class="ul-form" >
<ul class="ul-form">
<li><label><h3>工作台</h3></label></li>
<li class="btns" style="float: right">
<label style="width:auto;">
......@@ -259,25 +294,36 @@
</label>
</li>
<li style="float: right"><label>至：</label><input id="endDate" name="endDate" readonly="readonly" type="text"
maxlength="200" class="Wdate" style="width: auto" onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})" value="${workbench.endDate}" /></li>
<li style="float: right"><label>日期：</label><input id="startDate" name="startDate" readonly="readonly" type="text"
maxlength="200" class="Wdate" style="width: auto" onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})" value="${workbench.startDate}" /></li>
maxlength="200" class="Wdate" style="width: auto"
onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
value="${workbench.endDate}"/></li>
<li style="float: right"><label>日期：</label><input id="startDate" name="startDate" readonly="readonly"
type="text"
maxlength="200" class="Wdate" style="width: auto"
onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
value="${workbench.startDate}"/></li>
</ul>
<ul class="ul-form">
<div>
<div id="repStatus" style="min-width:40%;height:280px;float:left;background-color:#FFFFFF " class="breadcrumb form-search"></div>
<div id="total" style="max-width:54%;min-width:54%;height:280px;float:right;background-color: #FFFFFF" class="breadcrumb form-search">
<div id="repStatus" style="min-width:40%;height:280px;float:left;background-color:#FFFFFF "
class="breadcrumb form-search"></div>
<div id="total" style="max-width:54%;min-width:54%;height:280px;float:right;background-color: #FFFFFF"
class="breadcrumb form-search">
<li><h5>总体</h5></li>
<br/><br/>
<table>
<tr height="60">
<td style="width: 10% "></td>
<td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;微信公众号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.weChat}</td>
<td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;官网&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.web}</td>
<td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;微信公众号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.weChat}</td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;官网&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.web}</td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
</tr>
<tr height="60">
<td style="width: 10%"><h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.totalCount}</h4>
<td style="width: 10%"><h4>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.totalCount}</h4>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;举报事件
</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;融创OA系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.oa}</td>
......@@ -296,18 +342,24 @@
</ul>
<ul class="ul-form">
<div style="background-color: #FFFFFF">
<div id="repResult" style="min-width:40%;height:280px;float:left;background-color:#FFFFFF " class="breadcrumb form-search"></div>
<div id="repType" style="min-width:54%;height:280px;float:right;background-color: #FFFFFF" class="breadcrumb form-search"></div>
<div id="repResult" style="min-width:40%;height:280px;float:left;background-color:#FFFFFF "
class="breadcrumb form-search"></div>
<div id="repType" style="min-width:54%;height:280px;float:right;background-color: #FFFFFF"
class="breadcrumb form-search"></div>
</div>
</ul>
</form:form>
<ul class="nav nav-tabs">
<li <c:if test="${workbench.processStatus eq '0'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=0&startDate=${workbench.startDate}&endDate=${workbench.endDate}">未处理举报</a></li>
<li <c:if test="${workbench.processStatus eq '1'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=1&startDate=${workbench.startDate}&endDate=${workbench.endDate}">跟踪中举报</a></li>
</form:form>
<ul class="nav nav-tabs">
<li <c:if test="${workbench.processStatus eq '0'}">class="active"</c:if>><a
href="${ctx}/workbench/list?processStatus=0&startDate=${workbench.startDate}&endDate=${workbench.endDate}">未处理举报</a>
</li>
<li <c:if test="${workbench.processStatus eq '1'}">class="active"</c:if>><a
href="${ctx}/workbench/list?processStatus=1&startDate=${workbench.startDate}&endDate=${workbench.endDate}">跟踪中举报</a>
</li>
<li style="float: right;"><a href="${ctx}/report/list">查看更多</a></li>
</ul>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
</ul>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>ID</th>
......@@ -344,11 +396,11 @@
</c:forEach>
</c:if>
</tbody>
</table>
<c:if test="${repList.size()=='0'}">
</table>
<c:if test="${repList.size()=='0'}">
<span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
</c:if>
<%-- <c:if test="${page.list.size()>0}">
</c:if>
<%-- <c:if test="${page.list.size()>0}">
<div class="pagination">${page}</div>
</c:if>--%>
</body>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>用户管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$("#no").focus();
$("#inputForm").validate({
rules: {
......@@ -15,14 +15,14 @@
loginName: {remote: "用户登录名已存在"},
confirmNewPassword: {equalTo: "输入与上面相同的密码"}
},
submitHandler: function(form){
submitHandler: function (form) {
loading('正在提交，请稍等...');
form.submit();
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
errorPlacement: function (error, element) {
$("#messageBox").text("输入有误，请先更正。");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
error.appendTo(element.parent().parent());
} else {
error.insertAfter(element);
......@@ -33,11 +33,14 @@
</script>
</head>
<body>
<ul class="nav nav-tabs">
<ul class="nav nav-tabs">
<li><a href="${ctx}/sys/user/list">用户列表</a></li>
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul><br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<%--<div class="control-group">
......@@ -83,6 +86,16 @@
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<%--<div class="control-group">
<label class="control-label">密码:</label>
<div class="controls">
......@@ -137,7 +150,8 @@
<div class="control-group">
<label class="control-label">用户角色:</label>
<div class="controls">
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
......@@ -162,9 +176,10 @@
</div>
</c:if>--%>
<div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
</div>
</form:form>
</form:form>
</body>
</html>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties
......@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
##融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
#jdbc.username= easdba
#jdbc.password= oracle
#正式数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -234,6 +234,7 @@
password,
no,
name,
area,
email,
phone,
mobile,
......@@ -254,6 +255,7 @@
#{password},
#{no},
#{name},
#{area},
#{email},
#{phone},
#{mobile},
......@@ -288,6 +290,7 @@
password = #{password},
no = #{no},
name = #{name},
area=#{area},
email = #{email},
phone = #{phone},
mobile = #{mobile},
......
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>用户管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$("#no").focus();
$("#inputForm").validate({
rules: {
......@@ -15,14 +15,14 @@
loginName: {remote: "用户登录名已存在"},
confirmNewPassword: {equalTo: "输入与上面相同的密码"}
},
submitHandler: function(form){
submitHandler: function (form) {
loading('正在提交，请稍等...');
form.submit();
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
errorPlacement: function (error, element) {
$("#messageBox").text("输入有误，请先更正。");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
error.appendTo(element.parent().parent());
} else {
error.insertAfter(element);
......@@ -33,11 +33,14 @@
</script>
</head>
<body>
<ul class="nav nav-tabs">
<ul class="nav nav-tabs">
<li><a href="${ctx}/sys/user/list">用户列表</a></li>
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul><br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<%--<div class="control-group">
......@@ -83,6 +86,16 @@
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<%--<div class="control-group">
<label class="control-label">密码:</label>
<div class="controls">
......@@ -137,7 +150,8 @@
<div class="control-group">
<label class="control-label">用户角色:</label>
<div class="controls">
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
......@@ -162,9 +176,10 @@
</div>
</c:if>--%>
<div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
</div>
</form:form>
</form:form>
</body>
</html>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/jdbc.properties
......@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
##融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
#jdbc.username= easdba
#jdbc.password= oracle
#正式数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -234,6 +234,7 @@
password,
no,
name,
area,
email,
phone,
mobile,
......@@ -254,6 +255,7 @@
#{password},
#{no},
#{name},
#{area},
#{email},
#{phone},
#{mobile},
......@@ -288,6 +290,7 @@
password = #{password},
no = #{no},
name = #{name},
area=#{area},
email = #{email},
phone = #{phone},
mobile = #{mobile},
......
target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>用户管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function () {
$("#no").focus();
$("#inputForm").validate({
rules: {
......@@ -15,14 +15,14 @@
loginName: {remote: "用户登录名已存在"},
confirmNewPassword: {equalTo: "输入与上面相同的密码"}
},
submitHandler: function(form){
submitHandler: function (form) {
loading('正在提交，请稍等...');
form.submit();
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
errorPlacement: function (error, element) {
$("#messageBox").text("输入有误，请先更正。");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
error.appendTo(element.parent().parent());
} else {
error.insertAfter(element);
......@@ -33,11 +33,14 @@
</script>
</head>
<body>
<ul class="nav nav-tabs">
<ul class="nav nav-tabs">
<li><a href="${ctx}/sys/user/list">用户列表</a></li>
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul><br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户<shiro:hasPermission
name="sys:user:edit">${not empty user.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission
name="sys:user:edit">查看</shiro:lacksPermission></a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<%--<div class="control-group">
......@@ -83,6 +86,16 @@
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<%--<div class="control-group">
<label class="control-label">密码:</label>
<div class="controls">
......@@ -137,7 +150,8 @@
<div class="control-group">
<label class="control-label">用户角色:</label>
<div class="controls">
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false"
class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
......@@ -162,9 +176,10 @@
</div>
</c:if>--%>
<div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit"
value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
</div>
</form:form>
</form:form>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment