Skip to content

S
sunac_report
Commit 0bb4990b by sunxin
Options

移交部门搜索条件添加

parent 953df9c1
Showing with 443 additions and 173 deletions
.idea/workspace.xml
...@@ -8,11 +8,17 @@ ...@@ -8,11 +8,17 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="人员管理修改区域二级显示"> <list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="人员管理修改区域二级显示 页面修整">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac.war" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userList.jsp" afterDir="false" />
</list> </list>
<ignored path="it-faq-manage.iws" /> <ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -63,12 +69,114 @@ ...@@ -63,12 +69,114 @@
<favorites_list name="it-faq-manage" /> <favorites_list name="it-faq-manage" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf>
<file 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="367">
<caret line="276" lean-forward="true" selection-start-line="247" selection-start-column="5" selection-end-line="276" />
<folding>
<element signature="n#style#0;n#th#21;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="234" column="18" selection-start-line="234" selection-start-column="18" selection-end-line="234" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189"> <state relative-caret-position="82">
<caret line="145" column="31" lean-forward="true" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" /> <caret line="119" column="63" lean-forward="true" selection-start-line="119" selection-start-column="63" selection-end-line="119" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="74">
<caret line="72" selection-start-line="72" selection-end-line="72" />
<folding>
<element signature="e#1510#1511#0" expanded="true" />
<element signature="e#1553#1554#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="266" column="30" selection-start-line="266" selection-start-column="30" selection-end-line="266" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="195">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="1093" column="23" lean-forward="true" selection-start-line="1093" selection-start-column="23" selection-end-line="1093" selection-end-column="23" />
<folding>
<marker date="1564133039874" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564133039874" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564133039874" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564133039874" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564133039874" expanded="true" signature="22272:23093" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23154:23244" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23335:26264" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="26363:26781" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26446:26523" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26611:26688" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26858:26976" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="27056:27167" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564133039874" expanded="true" signature="27225:27715" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564133039874" expanded="true" signature="27776:28197" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="28317:28494" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564133039874" expanded="true" signature="28589:28848" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="28900:29216" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564133039874" expanded="true" signature="29380:30467" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="30631:31713" ph="select deal_... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="31858:32944" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="36324:38990" ph="SELECT * FRO... id" />
<marker date="1564133039874" expanded="true" signature="36347:38867" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="39188:41118" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="41179:41394" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41473:41542" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564133039874" expanded="true" signature="41602:41686" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41745:42071" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42135:42212" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42276:42353" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="43659:43710" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43765:43830" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43946:44047" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="44124:44240" ph="SELECT id AS... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -85,14 +193,12 @@ ...@@ -85,14 +193,12 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>addT</find>
<find>集合</find> <find>集合</find>
<find>getBusCategory</find> <find>getBusCategory</find>
<find>send</find> <find>send</find>
<find>export</find> <find>export</find>
<find>getBusCategoryList</find> <find>getBusCategoryList</find>
<find>supplementAreaDiv</find> <find>supplementAreaDiv</find>
<find>getR</find>
<find>supplementArea</find> <find>supplementArea</find>
<find>reportEntity</find> <find>reportEntity</find>
<find>exch</find> <find>exch</find>
...@@ -113,8 +219,10 @@ ...@@ -113,8 +219,10 @@
<find>area</find> <find>area</find>
<find>userIndex</find> <find>userIndex</find>
<find>userColumns</find> <find>userColumns</find>
<find>list</find>
<find>find</find> <find>find</find>
<find>移交部门</find>
<find>list</find>
<find>getR</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>${db.table.prefix}</replace> <replace>${db.table.prefix}</replace>
...@@ -179,11 +287,8 @@ ...@@ -179,11 +287,8 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" />
<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/workbench/workbench.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" />
<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/CtBbtcBusCategoryController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
...@@ -192,6 +297,9 @@ ...@@ -192,6 +297,9 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" /> <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/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -349,8 +457,6 @@ ...@@ -349,8 +457,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -412,7 +518,7 @@ ...@@ -412,7 +518,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
...@@ -423,7 +529,7 @@ ...@@ -423,7 +529,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" /> <item name="entity" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -435,7 +541,7 @@ ...@@ -435,7 +541,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" /> <item name="web" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -507,21 +613,12 @@ ...@@ -507,21 +613,12 @@
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -1303,14 +1400,8 @@ ...@@ -1303,14 +1400,8 @@
<workItem from="1563930477196" duration="23466000" /> <workItem from="1563930477196" duration="23466000" />
<workItem from="1564017393575" duration="26783000" /> <workItem from="1564017393575" duration="26783000" />
<workItem from="1564103732268" duration="2278000" /> <workItem from="1564103732268" duration="2278000" />
<workItem from="1564112769708" duration="8056000" /> <workItem from="1564112769708" duration="9809000" />
</task> <workItem from="1564130831369" duration="2599000" />
<task id="LOCAL-00072" summary="处理texarea折行问题">
<created>1499244010123</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1499244010123</updated>
</task> </task>
<task id="LOCAL-00073" summary="按老金给的配置替换"> <task id="LOCAL-00073" summary="按老金给的配置替换">
<created>1499320715260</created> <created>1499320715260</created>
...@@ -1648,11 +1739,18 @@ ...@@ -1648,11 +1739,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1564124432970</updated> <updated>1564124432970</updated>
</task> </task>
<option name="localTasksCounter" value="121" /> <task id="LOCAL-00121" summary="人员管理修改区域二级显示 页面修整">
<created>1564124494373</created>
<option name="number" value="00121" />
<option name="presentableId" value="LOCAL-00121" />
<option name="project" value="LOCAL" />
<updated>1564124494373</updated>
</task>
<option name="localTasksCounter" value="122" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1206865000" /> <option name="totallyTimeSpent" value="1211217000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1667,7 +1765,7 @@ ...@@ -1667,7 +1765,7 @@
<frame x="-8" y="-8" width="1552" height="840" extended-state="0" /> <frame x="-8" y="-8" width="1552" height="840" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32083055" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.32551908" />
<window_info id="Structure" order="1" weight="0.25" /> <window_info id="Structure" order="1" weight="0.25" />
<window_info id="Nl-Palette" order="2" /> <window_info id="Nl-Palette" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
...@@ -1678,8 +1776,8 @@ ...@@ -1678,8 +1776,8 @@
<window_info id="Capture Tool" order="8" /> <window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32894737" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32894737" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2631579" /> <window_info anchor="bottom" id="Run" order="2" weight="0.37719297" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.078947365" /> <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.51900584" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.3295711" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.3295711" />
...@@ -1804,7 +1902,6 @@ ...@@ -1804,7 +1902,6 @@
<path value="$PROJECT_DIR$/../xinao-officeassets-core" /> <path value="$PROJECT_DIR$/../xinao-officeassets-core" />
<path value="$PROJECT_DIR$/../git/Git/repository" /> <path value="$PROJECT_DIR$/../git/Git/repository" />
</ignored-roots> </ignored-roots>
<MESSAGE value="屏蔽掉OA用户" />
<MESSAGE value="屏蔽oa用户的备注" /> <MESSAGE value="屏蔽oa用户的备注" />
<MESSAGE value="注掉提问的压缩图片" /> <MESSAGE value="注掉提问的压缩图片" />
<MESSAGE value="图片压缩问题" /> <MESSAGE value="图片压缩问题" />
...@@ -1829,7 +1926,8 @@ ...@@ -1829,7 +1926,8 @@
<MESSAGE value="测试git" /> <MESSAGE value="测试git" />
<MESSAGE value="基本完善" /> <MESSAGE value="基本完善" />
<MESSAGE value="人员管理修改区域二级显示" /> <MESSAGE value="人员管理修改区域二级显示" />
<option name="LAST_COMMIT_MESSAGE" value="人员管理修改区域二级显示" /> <MESSAGE value="人员管理修改区域二级显示 页面修整" />
<option name="LAST_COMMIT_MESSAGE" value="人员管理修改区域二级显示 页面修整" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -2123,13 +2221,6 @@ ...@@ -2123,13 +2221,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148"> <state relative-caret-position="148">
...@@ -2137,13 +2228,6 @@ ...@@ -2137,13 +2228,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.2.RELEASE/spring-core-4.2.2.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.2.RELEASE/spring-aop-4.2.2.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.2.2.RELEASE/spring-aop-4.2.2.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="128">
...@@ -2194,28 +2278,6 @@ ...@@ -2194,28 +2278,6 @@
</state> </state>
</provider> </provider>
</entry> </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="969">
<caret line="55" column="26" selection-start-line="55" selection-start-column="19" selection-end-line="55" selection-end-column="26" />
<folding>
<element signature="e#2877#2878#0" expanded="true" />
<element signature="e#2913#2914#0" expanded="true" />
<element signature="e#2971#2972#0" expanded="true" />
<element signature="e#3021#3022#0" expanded="true" />
<element signature="e#3123#3124#0" expanded="true" />
<element signature="e#3157#3158#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="62" column="20" selection-start-line="62" selection-start-column="20" selection-end-line="62" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4788"> <state relative-caret-position="4788">
...@@ -2223,17 +2285,6 @@ ...@@ -2223,17 +2285,6 @@
</state> </state>
</provider> </provider>
</entry> </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="931">
<caret line="72" column="27" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
<folding>
<element signature="e#1510#1511#0" expanded="true" />
<element signature="e#1553#1554#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129"> <state relative-caret-position="129">
...@@ -2255,61 +2306,6 @@ ...@@ -2255,61 +2306,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="480" column="25" lean-forward="true" selection-start-line="480" selection-start-column="25" selection-end-line="480" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362">
<caret line="67" column="36" lean-forward="true" selection-start-line="66" selection-start-column="7" selection-end-line="67" selection-end-column="36" />
<folding>
<marker date="1564046295646" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564046295646" expanded="true" signature="3087:8864" ph="SELECT ,su.n... " />
<marker date="1564046295646" expanded="true" signature="10721:17291" ph="SELECT ,su.n... " />
<marker date="1564046295646" expanded="true" signature="18209:18434" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564046295646" expanded="true" signature="18530:18725" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564046295646" expanded="true" signature="18777:20191" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564046295646" expanded="true" signature="20253:20593" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564046295646" expanded="true" signature="20644:21465" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="21526:21616" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="21707:24636" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564046295646" expanded="true" signature="24735:25153" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564046295646" expanded="true" signature="24818:24895" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564046295646" expanded="true" signature="24983:25060" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564046295646" expanded="true" signature="25230:25348" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564046295646" expanded="true" signature="25428:25539" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564046295646" expanded="true" signature="25597:26087" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564046295646" expanded="true" signature="26148:26569" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="26689:26866" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564046295646" expanded="true" signature="26961:27220" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564046295646" expanded="true" signature="27272:27588" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564046295646" expanded="true" signature="27752:28839" ph="select repor... ct_bbtc_report" />
<marker date="1564046295646" expanded="true" signature="29003:30085" ph="select deal_... ct_bbtc_report" />
<marker date="1564046295646" expanded="true" signature="30230:31316" ph="select repor... ct_bbtc_report" />
<marker date="1564046295646" expanded="true" signature="34696:37362" ph="SELECT * FRO... id" />
<marker date="1564046295646" expanded="true" signature="34719:37239" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564046295646" expanded="true" signature="37560:39490" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564046295646" expanded="true" signature="39551:39766" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="39845:39914" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564046295646" expanded="true" signature="39974:40058" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="40117:40443" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="40507:40584" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="40648:40725" ph="UPDATE ct_bb... " />
<marker date="1564046295646" expanded="true" signature="42031:42082" ph="delete from " />
<marker date="1564046295646" expanded="true" signature="42137:42202" ph="delete from " />
<marker date="1564046295646" expanded="true" signature="42318:42419" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564046295646" expanded="true" signature="42496:42612" ph="SELECT id AS... " />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265"> <state relative-caret-position="265">
...@@ -2317,13 +2313,6 @@ ...@@ -2317,13 +2313,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159">
<caret line="36" column="23" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333"> <state relative-caret-position="333">
...@@ -2344,13 +2333,6 @@ ...@@ -2344,13 +2333,6 @@
</state> </state>
</provider> </provider>
</entry> </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="419">
<caret line="522" column="41" lean-forward="true" selection-start-line="515" selection-start-column="34" selection-end-line="522" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="140">
...@@ -2367,8 +2349,127 @@ ...@@ -2367,8 +2349,127 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189"> <state relative-caret-position="94">
<caret line="145" column="31" lean-forward="true" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" /> <caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="266" column="30" selection-start-line="266" selection-start-column="30" selection-end-line="266" selection-end-column="30" />
</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="247">
<caret line="1093" column="23" lean-forward="true" selection-start-line="1093" selection-start-column="23" selection-end-line="1093" selection-end-column="23" />
<folding>
<marker date="1564133039874" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="3087:9408" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="11807:18919" ph="SELECT ,su.n... " />
<marker date="1564133039874" expanded="true" signature="19837:20062" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1564133039874" expanded="true" signature="20158:20353" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1564133039874" expanded="true" signature="20405:21819" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1564133039874" expanded="true" signature="21881:22221" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1564133039874" expanded="true" signature="22272:23093" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23154:23244" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="23335:26264" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="26363:26781" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26446:26523" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26611:26688" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="26858:26976" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1564133039874" expanded="true" signature="27056:27167" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1564133039874" expanded="true" signature="27225:27715" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1564133039874" expanded="true" signature="27776:28197" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="28317:28494" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1564133039874" expanded="true" signature="28589:28848" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="28900:29216" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1564133039874" expanded="true" signature="29380:30467" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="30631:31713" ph="select deal_... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="31858:32944" ph="select repor... ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="36324:38990" ph="SELECT * FRO... id" />
<marker date="1564133039874" expanded="true" signature="36347:38867" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="39188:41118" ph="SELECT r.id ct_bbtc_report" />
<marker date="1564133039874" expanded="true" signature="41179:41394" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41473:41542" ph="SELECT c.EXC... CT_BBTC_REPORT" />
<marker date="1564133039874" expanded="true" signature="41602:41686" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="41745:42071" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42135:42212" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="42276:42353" ph="UPDATE ct_bb... " />
<marker date="1564133039874" expanded="true" signature="43659:43710" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43765:43830" ph="delete from " />
<marker date="1564133039874" expanded="true" signature="43946:44047" ph="SELECT su.na... ct_bbtc_sys_user" />
<marker date="1564133039874" expanded="true" signature="44124:44240" ph="SELECT id AS... " />
</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="367">
<caret line="276" lean-forward="true" selection-start-line="247" selection-start-column="5" selection-end-line="276" />
<folding>
<element signature="n#style#0;n#th#21;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="234" column="18" selection-start-line="234" selection-start-column="18" selection-end-line="234" selection-end-column="18" />
</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="177">
<caret line="34" column="37" selection-start-line="34" selection-start-column="19" selection-end-line="34" selection-end-column="37" />
<folding>
<element signature="e#2877#2878#0" expanded="true" />
<element signature="e#2913#2914#0" expanded="true" />
<element signature="e#2971#2972#0" expanded="true" />
<element signature="e#3021#3022#0" expanded="true" />
<element signature="e#3123#3124#0" expanded="true" />
<element signature="e#3157#3158#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.2.RELEASE/spring-core-4.2.2.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
</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="74">
<caret line="72" selection-start-line="72" selection-end-line="72" />
<folding>
<element signature="e#1510#1511#0" expanded="true" />
<element signature="e#1553#1554#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="82">
<caret line="119" column="63" lean-forward="true" selection-start-line="119" selection-start-column="63" selection-end-line="119" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -172,6 +172,18 @@ ...@@ -172,6 +172,18 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
...@@ -230,6 +242,16 @@ ...@@ -230,6 +242,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
</where> </where>
</select> </select>
...@@ -353,6 +375,16 @@ ...@@ -353,6 +375,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if> <if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if> </if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''"> <if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource} AND r.report_source = #{reportSource}
</if> </if>
......
src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
a.update_by AS "updateBy.id", a.update_by AS "updateBy.id",
a.update_date, a.update_date,
a.del_flag, a.del_flag,
a.supplement_group AS supplementGroup,
c.name AS "company.name", c.name AS "company.name",
c.parent_id AS "company.parent.id", c.parent_id AS "company.parent.id",
c.parent_ids AS "company.parentIds", c.parent_ids AS "company.parentIds",
...@@ -102,7 +103,10 @@ ...@@ -102,7 +103,10 @@
ou.id AS "office.primaryPerson.id", ou.id AS "office.primaryPerson.id",
ou.name AS "office.primaryPerson.name", ou.name AS "office.primaryPerson.name",
ou2.id AS "office.deputyPerson.id", ou2.id AS "office.deputyPerson.id",
ou2.name AS "office.deputyPerson.name"<!-- , ou2.name AS "office.deputyPerson.name"
<!-- ,
r.id AS "roleList.id", r.id AS "roleList.id",
r.office_id AS "roleList.office.id", r.office_id AS "roleList.office.id",
r.name AS "roleList.name", r.name AS "roleList.name",
...@@ -119,9 +123,13 @@ ...@@ -119,9 +123,13 @@
LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!-- LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person
<!--
LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id --> LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id
-->
</sql> </sql>
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
...@@ -148,9 +156,12 @@ ...@@ -148,9 +156,12 @@
<select id="findList" resultType="User"> <select id="findList" resultType="User">
SELECT SELECT
role.id AS roleId, role.id AS roleId,
cr.name AS areaName,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id} JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if> </if>
...@@ -210,9 +221,12 @@ ...@@ -210,9 +221,12 @@
<!-- 查询全部用户 --> <!-- 查询全部用户 -->
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
cr.name AS areaName,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name ORDER BY c.code, o.code, a.name
</select> </select>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
slsb.append(new Option(data1[i].name,data1[i].id)); slsb.append(new Option(data1[i].name,data1[i].id));
} }
} }
var selectNode = $("#supplementType"); var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
...@@ -200,6 +201,7 @@ ...@@ -200,6 +201,7 @@
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].name,data2[i].id));
} }
} }
},error:function(data){ },error:function(data){
alert("系统错误"); alert("系统错误");
} }
...@@ -243,6 +245,36 @@ ...@@ -243,6 +245,36 @@
} }
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
} }
...@@ -417,6 +449,25 @@ ...@@ -417,6 +449,25 @@
</form:select> </form:select>
</li> </li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small"> <li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value=" ">请选择</form:option> <form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
...@@ -496,7 +547,7 @@ ...@@ -496,7 +547,7 @@
<th>举报时间</th> <th>举报时间</th>
<th>状态</th> <th>状态</th>
<th>处理结论</th> <th>处理结论</th>
<th>移交部门</th> <th><%--<td>移交集团</td><td>移交部门</td>--%>移交部门</th>
<th>处理人</th> <th>处理人</th>
<c:if test="${isAdmin eq '1'||isAdmin eq '2'}"> <c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
<th>移交给</th> <th>移交给</th>
...@@ -508,6 +559,7 @@ ...@@ -508,6 +559,7 @@
<th>邮件发送</th> <th>邮件发送</th>
<th style="width:10%">操作</th> <th style="width:10%">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:if test="${page.list.size()>0}"> <c:if test="${page.list.size()>0}">
......
src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp
...@@ -248,6 +248,37 @@ ...@@ -248,6 +248,37 @@
} }
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
} }
...@@ -416,7 +447,24 @@ ...@@ -416,7 +447,24 @@
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select> </form:select>
</li> </li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small"> <li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
a.update_by AS "updateBy.id", a.update_by AS "updateBy.id",
a.update_date, a.update_date,
a.del_flag, a.del_flag,
a.supplement_group AS supplementGroup,
c.name AS "company.name", c.name AS "company.name",
c.parent_id AS "company.parent.id", c.parent_id AS "company.parent.id",
c.parent_ids AS "company.parentIds", c.parent_ids AS "company.parentIds",
...@@ -102,7 +103,10 @@ ...@@ -102,7 +103,10 @@
ou.id AS "office.primaryPerson.id", ou.id AS "office.primaryPerson.id",
ou.name AS "office.primaryPerson.name", ou.name AS "office.primaryPerson.name",
ou2.id AS "office.deputyPerson.id", ou2.id AS "office.deputyPerson.id",
ou2.name AS "office.deputyPerson.name"<!-- , ou2.name AS "office.deputyPerson.name"
<!-- ,
r.id AS "roleList.id", r.id AS "roleList.id",
r.office_id AS "roleList.office.id", r.office_id AS "roleList.office.id",
r.name AS "roleList.name", r.name AS "roleList.name",
...@@ -119,9 +123,13 @@ ...@@ -119,9 +123,13 @@
LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!-- LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person
<!--
LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id --> LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id
-->
</sql> </sql>
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
...@@ -148,9 +156,12 @@ ...@@ -148,9 +156,12 @@
<select id="findList" resultType="User"> <select id="findList" resultType="User">
SELECT SELECT
role.id AS roleId, role.id AS roleId,
cr.name AS areaName,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id} JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if> </if>
...@@ -210,9 +221,12 @@ ...@@ -210,9 +221,12 @@
<!-- 查询全部用户 --> <!-- 查询全部用户 -->
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
cr.name AS areaName,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name ORDER BY c.code, o.code, a.name
</select> </select>
......
target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<label class="control-label">所属区域:</label> <label class="control-label">所属区域:</label>
<div class="controls"> <div class="controls">
<form:select id="supplementArea" path="area" class="input-small required"> <form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option> <form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value" <%-- <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%> htmlEscape="false"/>--%>
</form:select> </form:select>
......
target/report_sunac/WEB-INF/views/modules/sys/userList.jsp
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</form:form> </form:form>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed"> <table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead> <thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>所属集团</th><th>所属区域</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody> <tbody>
<c:forEach items="${page.list}" var="user"> <c:forEach items="${page.list}" var="user">
<tr> <tr>
...@@ -70,6 +70,15 @@ ...@@ -70,6 +70,15 @@
<td>${user.office.name}</td>--%> <td>${user.office.name}</td>--%>
<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginName}</a></td> <td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginName}</a></td>
<td>${user.name}</td> <td>${user.name}</td>
<td align="center">
<c:if test="${user.supplementGroup eq '3437402691677202102'}">集团本部</c:if>
<c:if test="${user.supplementGroup eq '3510129313047280678'}">区域集团</c:if>
<c:if test="${user.supplementGroup eq '3565898923067676254'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '3806696792996264972'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '3770618512934949260'}">文旅集团</c:if>
<c:if test="${user.supplementGroup eq null}">--</c:if>
</td>
<td>${user.areaName}</td>
<td>${user.phone}</td> <td>${user.phone}</td>
<td>${user.mobile}</td><%-- <td>${user.mobile}</td><%--
<td>${user.roleNames}</td> --%> <td>${user.roleNames}</td> --%>
......
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