Skip to content

Z
znks
Commit 12369c03 authored by leyboy's avatar leyboy
Browse files
Options

1.用户记录查询增加模糊查询

parent 0c32f520
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 214 deletions
.idea/workspace.xml
View file @ 12369c03
...@@ -8,14 +8,7 @@ ...@@ -8,14 +8,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment=""> <list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" /> <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-dev.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application-dev.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-prd.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application-prd.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" />
</list> </list>
<ignored path="$PROJECT_DIR$/adc-da-ui/target/" /> <ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -56,18 +49,7 @@ ...@@ -56,18 +49,7 @@
<select /> <select />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf />
<file leaf-file-name="PageInfo.java" pinned="false" current-in-tab="true">
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -151,7 +133,6 @@ ...@@ -151,7 +133,6 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java" />
...@@ -171,6 +152,7 @@ ...@@ -171,6 +152,7 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -675,117 +657,6 @@ ...@@ -675,117 +657,6 @@
<item name="znks" type="462c0819:PsiDirectoryNode" /> <item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" /> <item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="vo" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mybatis" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mybatis" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -1061,7 +932,7 @@ ...@@ -1061,7 +932,7 @@
<workItem from="1536837981631" duration="137000" /> <workItem from="1536837981631" duration="137000" />
<workItem from="1536838164874" duration="2991000" /> <workItem from="1536838164874" duration="2991000" />
<workItem from="1536885579712" duration="12549000" /> <workItem from="1536885579712" duration="12549000" />
<workItem from="1536901590633" duration="9339000" /> <workItem from="1536901590633" duration="11062000" />
</task> </task>
<task id="LOCAL-00001" summary="A"> <task id="LOCAL-00001" summary="A">
<created>1534412427208</created> <created>1534412427208</created>
...@@ -1175,7 +1046,14 @@ ...@@ -1175,7 +1046,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1536905008854</updated> <updated>1536905008854</updated>
</task> </task>
<option name="localTasksCounter" value="17" /> <task id="LOCAL-00017" summary="1.开锁记录增加模糊查询">
<created>1536912523016</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1536912523016</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -1193,7 +1071,7 @@ ...@@ -1193,7 +1071,7 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="330978000" /> <option name="totallyTimeSpent" value="332701000" />
</component> </component>
<component name="TodoView" selected-index="3"> <component name="TodoView" selected-index="3">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1228,7 +1106,7 @@ ...@@ -1228,7 +1106,7 @@
<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="11" 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="11" side_tool="false" content_ui="tabs" />
<window_info id="MyBatis Sql Log" 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="MyBatis Sql Log" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="13" 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.32933104" sideWeight="0.5" order="13" 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.31089258" sideWeight="0.5" 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.31089258" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" 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="true" 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.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Analysis" 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="Analysis" 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="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="9" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
...@@ -1305,7 +1183,8 @@ ...@@ -1305,7 +1183,8 @@
<MESSAGE value="注释" /> <MESSAGE value="注释" />
<MESSAGE value="1.Admin相关接口完成" /> <MESSAGE value="1.Admin相关接口完成" />
<MESSAGE value="1.开锁记录分页,用户分页,管理员分页完成" /> <MESSAGE value="1.开锁记录分页,用户分页,管理员分页完成" />
<option name="LAST_COMMIT_MESSAGE" value="1.开锁记录分页,用户分页,管理员分页完成" /> <MESSAGE value="1.开锁记录增加模糊查询" />
<option name="LAST_COMMIT_MESSAGE" value="1.开锁记录增加模糊查询" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1478,34 +1357,6 @@ ...@@ -1478,34 +1357,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="172" column="16" lean-forward="true" selection-start-line="172" selection-start-column="16" selection-end-line="172" selection-end-column="16" />
<folding>
<element signature="e#6466#6470#0" expanded="false" />
<marker date="1536893128393" expanded="true" signature="1617:1827" ph="insert into tb_user... " />
<marker date="1536893128393" expanded="true" signature="2928:3072" ph="update tb_user... " />
<marker date="1536893128393" expanded="true" signature="3215:3495" ph="update tb_user... " />
<marker date="1536893128393" expanded="true" signature="3655:3754" ph="select from tb_user" />
<marker date="1536893128393" expanded="true" signature="3878:3925" ph="delete from tb_user... " />
<marker date="1536893128393" expanded="true" signature="4096:4124" ph="select count... tb_user" />
<marker date="1536893128393" expanded="true" signature="4322:4610" ph="select from tb_user" />
<marker date="1536893128393" expanded="true" signature="5094:5208" ph="select way.m... tb_user" />
<marker date="1536893128393" expanded="true" signature="5323:5417" ph="select u.cli... tb_user" />
<marker date="1536893128393" expanded="true" signature="5828:6001" ph="SELECT u.`id... tb_user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="42" column="68" lean-forward="false" selection-start-line="42" selection-start-column="68" selection-end-line="42" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="102">
...@@ -1514,14 +1365,6 @@ ...@@ -1514,14 +1365,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="159" column="22" lean-forward="false" selection-start-line="159" selection-start-column="22" selection-end-line="159" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/AppPushUtils.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/AppPushUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
...@@ -1610,22 +1453,6 @@ ...@@ -1610,22 +1453,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="97" column="25" lean-forward="false" selection-start-line="97" selection-start-column="25" selection-end-line="97" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="544">
...@@ -1731,19 +1558,6 @@ ...@@ -1731,19 +1558,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="33" column="81" lean-forward="true" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="81" />
<folding>
<element signature="e#1604#1608#0" expanded="true" />
<marker date="1536901861727" expanded="true" signature="631:873" ph="update tb_admin... " />
<marker date="1536901861727" expanded="true" signature="986:1058" ph="select * fro... tb_admin" />
<marker date="1536901861727" expanded="true" signature="986:1060" ph="select from tb_admin" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="102">
...@@ -1776,26 +1590,91 @@ ...@@ -1776,26 +1590,91 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java">
<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="284">
<caret line="32" column="29" lean-forward="true" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" /> <caret line="32" column="19" lean-forward="false" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java"> <entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284"> <state relative-caret-position="170">
<caret line="32" column="19" lean-forward="false" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" /> <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="190">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="40" /> <caret line="92" column="57" lean-forward="false" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="158" column="41" lean-forward="true" selection-start-line="158" selection-start-column="41" selection-end-line="158" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
<folding>
<element signature="e#1604#1608#0" expanded="true" />
<marker date="1536901861727" expanded="true" signature="631:873" ph="update tb_admin... " />
<marker date="1536901861727" expanded="true" signature="986:1058" ph="select * fro... tb_admin" />
<marker date="1536901861727" expanded="true" signature="986:1060" ph="select from tb_admin" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-44">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="34" column="34" lean-forward="true" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="158" column="53" lean-forward="false" selection-start-line="158" selection-start-column="53" selection-end-line="158" selection-end-column="53" />
<folding>
<marker date="1536914147842" expanded="true" signature="1617:1827" ph="insert into tb_user... " />
<marker date="1536914147842" expanded="true" signature="2928:3072" ph="update tb_user... " />
<marker date="1536914147842" expanded="true" signature="3215:3495" ph="update tb_user... " />
<marker date="1536914147842" expanded="true" signature="3655:3754" ph="select from tb_user" />
<marker date="1536914147842" expanded="true" signature="3878:3925" ph="delete from tb_user... " />
<marker date="1536914147842" expanded="true" signature="4096:4124" ph="select count... tb_user" />
<marker date="1536914147842" expanded="true" signature="4322:4610" ph="select from tb_user" />
<marker date="1536914147842" expanded="true" signature="5094:5208" ph="select way.m... tb_user" />
<marker date="1536914147842" expanded="true" signature="5323:5417" ph="select u.cli... tb_user" />
<marker date="1536914147842" expanded="true" signature="5776:5932" ph="SELECT u.`id... tb_user" />
<marker date="1536914147842" expanded="true" signature="5776:6596" ph="SELECT u.`cr... tb_user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="34" column="48" lean-forward="true" selection-start-line="34" selection-start-column="48" selection-end-line="34" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml
View file @ 12369c03
...@@ -151,17 +151,17 @@ ...@@ -151,17 +151,17 @@
<result column="createTime" property="createTime"/> <result column="createTime" property="createTime"/>
<result column="telphone" property="telphone"/> <result column="telphone" property="telphone"/>
<result column="deviceNum" property="deviceNum"/> <result column="deviceNum" property="deviceNum"/>
<result column="userId" property="userId"/>
</resultMap> </resultMap>
<select id="listUserVOs" parameterType="object" resultMap="userVOMap"> <select id="listUserVOs" parameterType="object" resultMap="userVOMap">
SELECT u.`create_time` AS createTime,u.`temphone` AS telphone,COUNT(d.`id`) AS deviceNum FROM tb_user u SELECT u.`create_time` AS createTime,u.`temphone` AS telphone,COUNT(d.`id`) AS deviceNum FROM tb_user u
LEFT JOIN tb_device d ON u.`id` = d.`user_id` GROUP BY u.`id` LEFT JOIN tb_device d ON u.`id` = d.`user_id`
<where> <where>
<trim suffixOverrides="and"> <trim suffixOverrides="and">
<if test="userSearch.telphone != null and userSearch.telphone != ''"> <if test="userSearch.telphone != null and userSearch.telphone != ''">
u.`temphone` = #{userSearch.telphone} and <bind name="telphoneLike" value="'%'+userSearch.telphone+'%'"/>
u.`temphone` LIKE #{telphoneLike} and
</if> </if>
<if test="userSearch.createTime1!=null"> <if test="userSearch.createTime1!=null">
u.create_time >= #{userSearch.createTime1} and u.create_time >= #{userSearch.createTime1} and
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
</if> </if>
</trim> </trim>
</where> </where>
GROUP BY u.`id`
</select> </select>
</mapper> </mapper>
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