Skip to content

M
manager
Commit 4a1d5030 by manxiaoqiang
Options

app排序

parent e45688c9
Showing with 35 additions and 91 deletions
.idea/workspace.xml
...@@ -2,14 +2,8 @@ ...@@ -2,14 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/track/model/MeasuresTrackNew.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/track/repository/MeasureRepository.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/track/service/TrackAccountFlowRestrictService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" afterPath="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/track/task/AccountTask.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -60,61 +54,11 @@ ...@@ -60,61 +54,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="344">
<caret line="161" column="46" lean-forward="false" selection-start-line="161" selection-start-column="40" selection-end-line="161" selection-end-column="46" /> <caret line="169" column="36" lean-forward="true" selection-start-line="169" selection-start-column="36" selection-end-line="169" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="32" column="52" lean-forward="false" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="108" column="72" lean-forward="true" selection-start-line="108" selection-start-column="72" selection-end-line="108" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountRepository.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="24" column="88" lean-forward="false" selection-start-line="24" selection-start-column="88" selection-end-line="24" selection-end-column="88" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SalesManLeaderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -208,7 +152,6 @@ ...@@ -208,7 +152,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<option value="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" /> <option value="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
...@@ -225,6 +168,7 @@ ...@@ -225,6 +168,7 @@
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1278,14 +1222,7 @@ ...@@ -1278,14 +1222,7 @@
<workItem from="1516843795236" duration="8291000" /> <workItem from="1516843795236" duration="8291000" />
<workItem from="1516932422302" duration="5866000" /> <workItem from="1516932422302" duration="5866000" />
<workItem from="1517189406074" duration="8333000" /> <workItem from="1517189406074" duration="8333000" />
<workItem from="1517275427548" duration="6084000" /> <workItem from="1517275427548" duration="6544000" />
</task>
<task id="LOCAL-00011" summary="test pom">
<created>1514882467020</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1514882467020</updated>
</task> </task>
<task id="LOCAL-00012" summary="test pom"> <task id="LOCAL-00012" summary="test pom">
<created>1514887175849</created> <created>1514887175849</created>
...@@ -1623,15 +1560,22 @@ ...@@ -1623,15 +1560,22 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1517282798128</updated> <updated>1517282798128</updated>
</task> </task>
<option name="localTasksCounter" value="60" /> <task id="LOCAL-00060" summary="合同">
<created>1517299262540</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1517299262540</updated>
</task>
<option name="localTasksCounter" value="61" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="292370000" /> <option name="totallyTimeSpent" value="292830000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
...@@ -2191,50 +2135,50 @@ ...@@ -2191,50 +2135,50 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="230">
<caret line="161" column="46" lean-forward="false" selection-start-line="161" selection-start-column="40" selection-end-line="161" selection-end-column="46" /> <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214"> <state relative-caret-position="321">
<caret line="32" column="52" lean-forward="false" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" /> <caret line="31" column="73" lean-forward="false" selection-start-line="31" selection-start-column="73" selection-end-line="31" selection-end-column="73" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <state relative-caret-position="378">
<caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="108" column="72" lean-forward="true" selection-start-line="108" selection-start-column="72" selection-end-line="108" selection-end-column="72" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="184">
<caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="214">
<caret line="108" column="72" lean-forward="true" selection-start-line="108" selection-start-column="72" selection-end-line="108" selection-end-column="72" /> <caret line="32" column="52" lean-forward="false" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="344">
<caret line="24" column="88" lean-forward="false" selection-start-line="24" selection-start-column="88" selection-end-line="24" selection-end-column="88" /> <caret line="169" column="36" lean-forward="true" selection-start-line="169" selection-start-column="36" selection-end-line="169" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/task/ReportCallable.java
...@@ -166,7 +166,7 @@ public class ReportCallable ...@@ -166,7 +166,7 @@ public class ReportCallable
app_sb.length()>0?app_sb.substring(5):"", app_sb.length()>0?app_sb.substring(5):"",
data_sb.length()>0?" where ":"", data_sb.length()>0?" where ":"",
data_sb.length()>0?data_sb.substring(5):"", data_sb.length()>0?data_sb.substring(5):"",
StringUtil.isEmpty(sortString)?"":resultOrderSql, resultOrderSql,
resultLimitSql); resultLimitSql);
} }
......
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