Skip to content

M
manager
Commit 880a5618 by manxiaoqiang
Options

合同

parent 6dcdfbdc
master … 0727_bugfix 1082_bugfix 1151_bugfix 1209_bugfix 1315_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 20180328_sale 20180411 20180525_adi 20180530_bpu 2578_bugfix 2580_fix 31762_2_bugfix 31762_bugfix 31969_bugfix 32400_fix 32599_bugfix 649_bugfix back_version back_version2 bigfix_20201028 bugfix_1608_new bugfix_1760 bugfix_master_1760 change_double contract_rela develper feature_20180116_new liushaowei manager_new master_mv mobvista_master month_flow
No related merge requests found
Showing with 803 additions and 328 deletions
.idea/workspace.xml
...@@ -2,11 +2,23 @@ ...@@ -2,11 +2,23 @@
<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/common/model/ReminderLevel.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.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/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.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/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.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/tkio/repository/SalesManLeaderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/DateUtil.java" afterPath="$PROJECT_DIR$/src/main/java/util/DateUtil.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" />
...@@ -27,52 +39,136 @@ ...@@ -27,52 +39,136 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.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="552"> <state relative-caret-position="276">
<caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" /> <caret line="15" column="14" lean-forward="false" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReminderLevel.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.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="-115">
<caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="15" /> <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false"> <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"> <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="125"> <state relative-caret-position="3887">
<caret line="158" column="89" lean-forward="true" selection-start-line="158" selection-start-column="89" selection-end-line="158" selection-end-column="89" /> <caret line="198" column="45" lean-forward="false" selection-start-line="198" selection-start-column="45" selection-end-line="198" selection-end-column="45" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true"> <file leaf-file-name="Reminder.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Reminder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329"> <state relative-caret-position="161">
<caret line="29" column="77" lean-forward="true" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" /> <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#623#624#0" expanded="false" />
<element signature="e#648#649#0" expanded="false" />
<element signature="e#682#683#0" expanded="false" />
<element signature="e#710#711#0" expanded="false" />
<element signature="e#744#745#0" expanded="false" />
<element signature="e#776#777#0" expanded="false" />
<element signature="e#824#825#0" expanded="false" />
<element signature="e#866#867#0" expanded="false" />
<element signature="e#898#899#0" expanded="false" />
<element signature="e#926#927#0" expanded="false" />
<element signature="e#968#969#0" expanded="false" />
<element signature="e#1002#1003#0" expanded="false" />
<element signature="e#1037#1038#0" expanded="false" />
<element signature="e#1068#1069#0" expanded="false" />
<element signature="e#1116#1117#0" expanded="false" />
<element signature="e#1156#1157#0" expanded="false" />
<element signature="e#1196#1197#0" expanded="false" />
<element signature="e#1231#1232#0" expanded="false" />
<element signature="e#1288#1289#0" expanded="false" />
<element signature="e#1336#1337#0" expanded="false" />
<element signature="e#1365#1366#0" expanded="false" />
<element signature="e#1392#1393#0" expanded="false" />
<element signature="e#1430#1431#0" expanded="false" />
<element signature="e#1462#1463#0" expanded="false" />
<element signature="e#1497#1498#0" expanded="false" />
<element signature="e#1530#1531#0" expanded="false" />
<element signature="e#1580#1581#0" expanded="false" />
<element signature="e#1624#1625#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1714#1715#0" expanded="false" />
<element signature="e#1742#1743#0" expanded="false" />
<element signature="e#1777#1778#0" expanded="false" />
<element signature="e#1808#1809#0" expanded="false" />
<element signature="e#1856#1857#0" expanded="false" />
<element signature="e#1896#1897#0" expanded="false" />
<element signature="e#1932#1933#0" expanded="false" />
<element signature="e#1964#1965#0" expanded="false" />
<element signature="e#2014#2015#0" expanded="false" />
<element signature="e#2056#2057#0" expanded="false" />
<element signature="e#2087#2088#0" expanded="false" />
<element signature="e#2116#2117#0" expanded="false" />
<element signature="e#2158#2159#0" expanded="false" />
<element signature="e#2194#2195#0" expanded="false" />
<element signature="e#2225#2226#0" expanded="false" />
<element signature="e#2254#2255#0" expanded="false" />
<element signature="e#2296#2297#0" expanded="false" />
<element signature="e#2332#2333#0" expanded="false" />
<element signature="e#2363#2364#0" expanded="false" />
<element signature="e#2392#2393#0" expanded="false" />
<element signature="e#2434#2435#0" expanded="false" />
<element signature="e#2470#2471#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.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="137"> <state relative-caret-position="644">
<caret line="29" column="78" lean-forward="true" selection-start-line="29" selection-start-column="78" selection-end-line="29" selection-end-column="78" /> <caret line="43" column="55" lean-forward="false" selection-start-line="43" selection-start-column="55" selection-end-line="43" selection-end-column="55" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -80,19 +176,47 @@ ...@@ -80,19 +176,47 @@
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-392"> <state relative-caret-position="621">
<caret line="169" column="83" lean-forward="true" selection-start-line="169" selection-start-column="66" selection-end-line="169" selection-end-column="83" /> <caret line="41" column="14" lean-forward="false" selection-start-line="41" selection-start-column="14" selection-end-line="41" selection-end-column="14" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1721#1722#0" expanded="false" />
<element signature="e#1778#1779#0" expanded="false" />
<element signature="e#2760#2761#0" expanded="false" />
<element signature="e#2817#2818#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.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="183"> <state relative-caret-position="3289">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="27" /> <caret line="160" column="21" lean-forward="false" selection-start-line="160" selection-start-column="21" selection-end-line="160" selection-end-column="21" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1490#1491#0" expanded="false" />
<element signature="e#1510#1511#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -127,6 +251,8 @@ ...@@ -127,6 +251,8 @@
<find>contractChangeRepository</find> <find>contractChangeRepository</find>
<find>contractMoneyRepository</find> <find>contractMoneyRepository</find>
<find>System.out.println</find> <find>System.out.println</find>
<find>sortString</find>
<find>isASC</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -148,16 +274,6 @@ ...@@ -148,16 +274,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/java/util/AwsS3Util.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/db.properties" /> <option value="$PROJECT_DIR$/src/main/resources/db.properties" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DBUtil.java" /> <option value="$PROJECT_DIR$/src/main/java/util/DBUtil.java" />
...@@ -169,7 +285,6 @@ ...@@ -169,7 +285,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractBody.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractBody.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
...@@ -191,14 +306,25 @@ ...@@ -191,14 +306,25 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" /> <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.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/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/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -293,9 +419,6 @@ ...@@ -293,9 +419,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -444,38 +567,11 @@ ...@@ -444,38 +567,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -493,18 +589,18 @@ ...@@ -493,18 +589,18 @@
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="E:\newgit\manager\src\main\resources" /> <recent name="$PROJECT_DIR$/src/main/resources/spring" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="common.repository" /> <recent name="common.repository" />
<recent name="common.model" />
<recent name="util" />
<recent name="common.controller" /> <recent name="common.controller" />
<recent name="common.service" /> <recent name="common.service" />
<recent name="tkio.service.impl" />
<recent name="office.service.impl" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/main/resources/spring" /> <recent name="E:\newgit\manager\src\main\resources" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Maven.manager"> <component name="RunManager" selected="Maven.manager">
...@@ -963,14 +1059,10 @@ ...@@ -963,14 +1059,10 @@
<workItem from="1516155511499" duration="43292000" /> <workItem from="1516155511499" duration="43292000" />
<workItem from="1516327450910" duration="12490000" /> <workItem from="1516327450910" duration="12490000" />
<workItem from="1516586760731" duration="18149000" /> <workItem from="1516586760731" duration="18149000" />
<workItem from="1516670938448" duration="3930000" /> <workItem from="1516670938448" duration="14117000" />
</task> <workItem from="1516763565872" duration="4970000" />
<task id="LOCAL-00006" summary="test pom"> <workItem from="1516843795236" duration="8291000" />
<created>1514873570341</created> <workItem from="1516932422302" duration="3635000" />
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1514873570341</updated>
</task> </task>
<task id="LOCAL-00007" summary="test pom"> <task id="LOCAL-00007" summary="test pom">
<created>1514873706283</created> <created>1514873706283</created>
...@@ -1308,11 +1400,18 @@ ...@@ -1308,11 +1400,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1516675424479</updated> <updated>1516675424479</updated>
</task> </task>
<option name="localTasksCounter" value="55" /> <task id="LOCAL-00055" summary="合同">
<created>1516676016551</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1516676016551</updated>
</task>
<option name="localTasksCounter" value="56" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="248639000" /> <option name="totallyTimeSpent" value="275722000" />
</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" />
...@@ -1339,7 +1438,7 @@ ...@@ -1339,7 +1438,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4304419" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4304419" sideWeight="0.49016643" order="9" 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.3289689" sideWeight="0.5" order="3" 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.3289689" sideWeight="0.5" order="3" 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.5581015" sideWeight="0.5" order="5" 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.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2934947" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2980333" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" 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="4" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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="7" side_tool="false" content_ui="tabs" />
...@@ -1394,7 +1493,7 @@ ...@@ -1394,7 +1493,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.3289689" sideWeight="0.5" order="3" 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.3289689" sideWeight="0.5" order="3" 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.5581015" sideWeight="0.5" order="5" 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.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="CheckStyle" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="CheckStyle" 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="4" 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.2934947" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2980333" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" 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="4" side_tool="true" content_ui="tabs" />
<window_info id="Gradle View" 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="17" side_tool="false" content_ui="tabs" /> <window_info id="Gradle View" 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="17" side_tool="false" content_ui="tabs" />
...@@ -1464,7 +1563,7 @@ ...@@ -1464,7 +1563,7 @@
<option name="timeStamp" value="5" /> <option name="timeStamp" value="5" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="23" /> <option name="time" value="24" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
...@@ -1473,140 +1572,6 @@ ...@@ -1473,140 +1572,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/SaleAuthController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="20" column="25" lean-forward="false" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="8" column="74" lean-forward="false" selection-start-line="8" selection-start-column="74" selection-end-line="8" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractBody.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="14" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/DateUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="765" column="33" lean-forward="false" selection-start-line="765" selection-start-column="25" selection-end-line="765" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Reminder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="11" column="30" lean-forward="true" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="11" column="83" lean-forward="false" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="jar://E:/Java/jdk1.8.0_65/src.zip!/java/math/BigDecimal.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="2300" column="28" lean-forward="false" selection-start-line="2300" selection-start-column="28" selection-end-line="2300" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3220">
<caret line="244" column="35" lean-forward="false" selection-start-line="244" selection-start-column="35" selection-end-line="244" selection-end-column="35" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1496#1497#0" expanded="false" />
<element signature="e#1529#1530#0" expanded="false" />
<element signature="e#1581#1582#0" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#2489#2490#0" expanded="false" />
<element signature="e#2519#2520#0" expanded="false" />
<element signature="e#2638#2639#0" expanded="false" />
<element signature="e#2671#2672#0" expanded="false" />
<element signature="e#4154#4155#0" expanded="false" />
<element signature="e#4183#4184#0" expanded="false" />
<element signature="e#4227#4228#0" expanded="false" />
<element signature="e#4263#4264#0" expanded="false" />
<element signature="e#4296#4297#0" expanded="false" />
<element signature="e#4327#4328#0" expanded="false" />
<element signature="e#4373#4374#0" expanded="false" />
<element signature="e#4413#4414#0" expanded="false" />
<element signature="e#4445#4446#0" expanded="false" />
<element signature="e#4475#4476#0" expanded="false" />
<element signature="e#4519#4520#0" expanded="false" />
<element signature="e#4557#4558#0" expanded="false" />
<element signature="e#4607#4608#0" expanded="false" />
<element signature="e#4638#4639#0" expanded="false" />
<element signature="e#4686#4687#0" expanded="false" />
<element signature="e#4726#4727#0" expanded="false" />
<element signature="e#4781#4782#0" expanded="false" />
<element signature="e#4818#4819#0" expanded="false" />
<element signature="e#4878#4879#0" expanded="false" />
<element signature="e#4930#4931#0" expanded="false" />
<element signature="e#5000#5001#0" expanded="false" />
<element signature="e#5052#5053#0" expanded="false" />
<element signature="e#5096#5097#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="75" column="0" lean-forward="false" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="96" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -1660,7 +1625,6 @@ ...@@ -1660,7 +1625,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575"> <state relative-caret-position="575">
<caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" /> <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1689,16 +1653,6 @@ ...@@ -1689,16 +1653,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23"> <state relative-caret-position="23">
<caret line="154" column="13" lean-forward="false" selection-start-line="154" selection-start-column="13" selection-end-line="154" selection-end-column="13" /> <caret line="154" column="13" lean-forward="false" selection-start-line="154" selection-start-column="13" selection-end-line="154" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="179" column="46" lean-forward="false" selection-start-line="179" selection-start-column="46" selection-end-line="179" selection-end-column="46" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1706,15 +1660,6 @@ ...@@ -1706,15 +1660,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389"> <state relative-caret-position="389">
<caret line="161" column="34" lean-forward="false" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" /> <caret line="161" column="34" lean-forward="false" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
<folding>
<element signature="e#2970#2971#0" expanded="true" />
<element signature="e#3001#3002#0" expanded="true" />
<element signature="e#3049#3050#0" expanded="true" />
<element signature="e#3089#3090#0" expanded="true" />
<element signature="e#3157#3158#0" expanded="true" />
<element signature="e#3207#3208#0" expanded="true" />
<element signature="e#3249#3250#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1722,7 +1667,6 @@ ...@@ -1722,7 +1667,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="253">
<caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" /> <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1730,11 +1674,6 @@ ...@@ -1730,11 +1674,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412"> <state relative-caret-position="412">
<caret line="134" column="33" lean-forward="false" selection-start-line="134" selection-start-column="33" selection-end-line="134" selection-end-column="33" /> <caret line="134" column="33" lean-forward="false" selection-start-line="134" selection-start-column="33" selection-end-line="134" selection-end-column="33" />
<folding>
<element signature="e#2638#2639#0" expanded="true" />
<element signature="e#2686#2687#0" expanded="true" />
<element signature="e#2726#2727#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1742,15 +1681,6 @@ ...@@ -1742,15 +1681,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="276">
<caret line="186" column="39" lean-forward="false" selection-start-line="186" selection-start-column="39" selection-end-line="186" selection-end-column="39" /> <caret line="186" column="39" lean-forward="false" selection-start-line="186" selection-start-column="39" selection-end-line="186" selection-end-column="39" />
<folding>
<element signature="e#3758#3759#0" expanded="false" />
<element signature="e#3818#3819#0" expanded="false" />
<element signature="e#3870#3871#0" expanded="false" />
<element signature="e#3910#3911#0" expanded="false" />
<element signature="e#3945#3946#0" expanded="false" />
<element signature="e#4002#4003#0" expanded="false" />
<element signature="e#4050#4051#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1758,7 +1688,6 @@ ...@@ -1758,7 +1688,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322"> <state relative-caret-position="322">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="31" selection-end-column="33" /> <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="31" selection-end-column="33" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1766,7 +1695,6 @@ ...@@ -1766,7 +1695,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="253">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1774,7 +1702,6 @@ ...@@ -1774,7 +1702,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391"> <state relative-caret-position="391">
<caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="45" /> <caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="45" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1782,7 +1709,6 @@ ...@@ -1782,7 +1709,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391"> <state relative-caret-position="391">
<caret line="24" column="35" lean-forward="false" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="35" /> <caret line="24" column="35" lean-forward="false" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="35" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1790,9 +1716,6 @@ ...@@ -1790,9 +1716,6 @@
<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="230">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="43" /> <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="43" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1800,7 +1723,6 @@ ...@@ -1800,7 +1723,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361"> <state relative-caret-position="361">
<caret line="24" column="27" lean-forward="false" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" /> <caret line="24" column="27" lean-forward="false" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1808,15 +1730,108 @@ ...@@ -1808,15 +1730,108 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552"> <state relative-caret-position="552">
<caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" /> <caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="235" column="43" lean-forward="true" selection-start-line="235" selection-start-column="43" selection-end-line="235" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="107" column="0" lean-forward="false" selection-start-line="107" selection-start-column="0" selection-end-line="139" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="40" column="58" lean-forward="true" selection-start-line="40" selection-start-column="58" selection-end-line="40" selection-end-column="58" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/DateUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2034">
<caret line="1101" column="24" lean-forward="true" selection-start-line="1101" selection-start-column="24" selection-end-line="1101" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="34" column="23" lean-forward="false" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="143" column="47" lean-forward="false" selection-start-line="143" selection-start-column="47" selection-end-line="143" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="22" column="1" lean-forward="true" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="9" column="72" lean-forward="false" selection-start-line="9" selection-start-column="72" selection-end-line="9" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="15" column="39" lean-forward="false" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1380">
<caret line="124" column="5" lean-forward="true" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="55" column="12" lean-forward="false" selection-start-line="55" selection-start-column="12" selection-end-line="55" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="42" column="202" lean-forward="false" selection-start-line="42" selection-start-column="202" selection-end-line="42" selection-end-column="202" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="309">
<caret line="46" column="37" lean-forward="true" selection-start-line="46" selection-start-column="37" selection-end-line="46" selection-end-column="37" /> <caret line="46" column="40" lean-forward="false" selection-start-line="46" selection-start-column="40" selection-end-line="46" selection-end-column="40" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1824,94 +1839,188 @@ ...@@ -1824,94 +1839,188 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
<caret line="15" column="8" lean-forward="false" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" /> <caret line="15" column="8" lean-forward="false" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173"> <state relative-caret-position="102">
<caret line="235" column="43" lean-forward="true" selection-start-line="235" selection-start-column="43" selection-end-line="235" selection-end-column="43" /> <caret line="62" column="49" lean-forward="true" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.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="23"> <state relative-caret-position="3289">
<caret line="107" column="0" lean-forward="false" selection-start-line="107" selection-start-column="0" selection-end-line="139" selection-end-column="5" /> <caret line="160" column="21" lean-forward="false" selection-start-line="160" selection-start-column="21" selection-end-line="160" selection-end-column="21" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1490#1491#0" expanded="false" />
<element signature="e#1510#1511#0" expanded="false" />
</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/common/repository/ReminderLevelRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23"> <state relative-caret-position="69">
<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="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260"> <state relative-caret-position="299">
<caret line="40" column="58" lean-forward="true" selection-start-line="40" selection-start-column="58" selection-end-line="40" selection-end-column="58" /> <caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1721#1722#0" expanded="false" />
<element signature="e#1778#1779#0" expanded="false" />
<element signature="e#2760#2761#0" expanded="false" />
<element signature="e#2817#2818#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4556"> <state relative-caret-position="621">
<caret line="57" column="15" lean-forward="false" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="15" /> <caret line="41" column="14" lean-forward="false" selection-start-line="41" selection-start-column="14" selection-end-line="41" selection-end-column="14" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
</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/AccountService.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="161">
<caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="15" /> <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</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/service/impl/AccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125"> <state relative-caret-position="161">
<caret line="158" column="89" lean-forward="true" selection-start-line="158" selection-start-column="89" selection-end-line="158" selection-end-column="89" /> <caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.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="183"> <state relative-caret-position="3887">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="27" /> <caret line="198" column="45" lean-forward="false" selection-start-line="198" selection-start-column="45" selection-end-line="198" selection-end-column="45" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Reminder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-392"> <state relative-caret-position="161">
<caret line="169" column="83" lean-forward="true" selection-start-line="169" selection-start-column="66" selection-end-line="169" selection-end-column="83" /> <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#623#624#0" expanded="false" />
<element signature="e#648#649#0" expanded="false" />
<element signature="e#682#683#0" expanded="false" />
<element signature="e#710#711#0" expanded="false" />
<element signature="e#744#745#0" expanded="false" />
<element signature="e#776#777#0" expanded="false" />
<element signature="e#824#825#0" expanded="false" />
<element signature="e#866#867#0" expanded="false" />
<element signature="e#898#899#0" expanded="false" />
<element signature="e#926#927#0" expanded="false" />
<element signature="e#968#969#0" expanded="false" />
<element signature="e#1002#1003#0" expanded="false" />
<element signature="e#1037#1038#0" expanded="false" />
<element signature="e#1068#1069#0" expanded="false" />
<element signature="e#1116#1117#0" expanded="false" />
<element signature="e#1156#1157#0" expanded="false" />
<element signature="e#1196#1197#0" expanded="false" />
<element signature="e#1231#1232#0" expanded="false" />
<element signature="e#1288#1289#0" expanded="false" />
<element signature="e#1336#1337#0" expanded="false" />
<element signature="e#1365#1366#0" expanded="false" />
<element signature="e#1392#1393#0" expanded="false" />
<element signature="e#1430#1431#0" expanded="false" />
<element signature="e#1462#1463#0" expanded="false" />
<element signature="e#1497#1498#0" expanded="false" />
<element signature="e#1530#1531#0" expanded="false" />
<element signature="e#1580#1581#0" expanded="false" />
<element signature="e#1624#1625#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1714#1715#0" expanded="false" />
<element signature="e#1742#1743#0" expanded="false" />
<element signature="e#1777#1778#0" expanded="false" />
<element signature="e#1808#1809#0" expanded="false" />
<element signature="e#1856#1857#0" expanded="false" />
<element signature="e#1896#1897#0" expanded="false" />
<element signature="e#1932#1933#0" expanded="false" />
<element signature="e#1964#1965#0" expanded="false" />
<element signature="e#2014#2015#0" expanded="false" />
<element signature="e#2056#2057#0" expanded="false" />
<element signature="e#2087#2088#0" expanded="false" />
<element signature="e#2116#2117#0" expanded="false" />
<element signature="e#2158#2159#0" expanded="false" />
<element signature="e#2194#2195#0" expanded="false" />
<element signature="e#2225#2226#0" expanded="false" />
<element signature="e#2254#2255#0" expanded="false" />
<element signature="e#2296#2297#0" expanded="false" />
<element signature="e#2332#2333#0" expanded="false" />
<element signature="e#2363#2364#0" expanded="false" />
<element signature="e#2392#2393#0" expanded="false" />
<element signature="e#2434#2435#0" expanded="false" />
<element signature="e#2470#2471#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137"> <state relative-caret-position="161">
<caret line="29" column="78" lean-forward="true" selection-start-line="29" selection-start-column="78" selection-end-line="29" selection-end-column="78" /> <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="43" column="55" lean-forward="false" selection-start-line="43" selection-start-column="55" selection-end-line="43" selection-end-column="55" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="15" column="14" lean-forward="false" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329"> <state relative-caret-position="-115">
<caret line="29" column="77" lean-forward="true" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" /> <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/controller/ContractController.java
...@@ -3,12 +3,16 @@ package common.controller; ...@@ -3,12 +3,16 @@ package common.controller;
import common.model.*; import common.model.*;
import common.service.ContractService; import common.service.ContractService;
import common.service.MenuService; import common.service.MenuService;
import dic.OperateObjectTypeEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import security.annotation.CurrentAccount; import security.annotation.CurrentAccount;
import util.NewUserLogThread;
import util.ResultModel; import util.ResultModel;
import util.UserLogThread;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
...@@ -76,8 +80,11 @@ public class ContractController { ...@@ -76,8 +80,11 @@ public class ContractController {
@RequestMapping(value = "create", method = RequestMethod.POST) @RequestMapping(value = "create", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ResultModel create(@CurrentAccount User loginAccount, @RequestBody Contract contract) { public ResultModel create(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
return ResultModel.OK(service.create(loginAccount, contract)); Contract contract1 = service.create(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "新建合同","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
} }
@RequestMapping(value = "update", method = RequestMethod.PUT) @RequestMapping(value = "update", method = RequestMethod.PUT)
......
src/main/java/common/model/Reminder.java
...@@ -17,6 +17,9 @@ public class Reminder { ...@@ -17,6 +17,9 @@ public class Reminder {
private Boolean remindStatus; private Boolean remindStatus;
private String closeDesc; private String closeDesc;
private Long user; private Long user;
private Long level1;
private Long level2;
private Long level3;
private String userName; private String userName;
private Date modifyTime; private Date modifyTime;
private String ds; private String ds;
...@@ -103,6 +106,30 @@ public class Reminder { ...@@ -103,6 +106,30 @@ public class Reminder {
this.closeDesc = closeDesc; this.closeDesc = closeDesc;
} }
public Long getLevel1() {
return level1;
}
public void setLevel1(Long level1) {
this.level1 = level1;
}
public Long getLevel2() {
return level2;
}
public void setLevel2(Long level2) {
this.level2 = level2;
}
public Long getLevel3() {
return level3;
}
public void setLevel3(Long level3) {
this.level3 = level3;
}
@Override @Override
public String toString() { public String toString() {
return "Reminder{" + return "Reminder{" +
......
src/main/java/common/model/ReminderLevel.java 0 → 100644
package common.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.Date;
@Entity
public class ReminderLevel {
private Long id;
private Long parent;
private Long level;
private String name;
private String type;
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getParent() {
return parent;
}
public void setParent(Long parent) {
this.parent = parent;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Long getLevel() {
return level;
}
public void setLevel(Long level) {
this.level = level;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}
src/main/java/common/model/UserLog.java
...@@ -21,6 +21,8 @@ public class UserLog ...@@ -21,6 +21,8 @@ public class UserLog
private String operateObject; private String operateObject;
private String operateType; private String operateType;
private String location; private String location;
private String OldObject;
private String newObject;
@Id @Id
@GeneratedValue @GeneratedValue
...@@ -114,18 +116,36 @@ public class UserLog ...@@ -114,18 +116,36 @@ public class UserLog
this.location = location; this.location = location;
} }
public String getOldObject() {
return OldObject;
}
public void setOldObject(String oldObject) {
OldObject = oldObject;
}
public String getNewObject() {
return newObject;
}
public void setNewObject(String newObject) {
this.newObject = newObject;
}
@Override @Override
public String toString() public String toString() {
{
return "UserLog{" + return "UserLog{" +
"id=" + id + "id=" + id +
", operateTime=" + operateTime + ", operateTime='" + operateTime + '\'' +
", operaAccount='" + operaAccount + '\'' + ", operaAccount='" + operaAccount + '\'' +
", accountName='" + accountName + '\'' + ", accountName='" + accountName + '\'' +
", ip='" + ip + '\'' + ", ip='" + ip + '\'' +
", operateObjectType='" + operateObjectType + '\'' + ", operateObjectType='" + operateObjectType + '\'' +
", operateObject='" + operateObject + '\'' + ", operateObject='" + operateObject + '\'' +
", operateType='" + operateType + '\'' + ", operateType='" + operateType + '\'' +
", location='" + location + '\'' +
", OldObject='" + OldObject + '\'' +
", newObject='" + newObject + '\'' +
'}'; '}';
} }
} }
src/main/java/common/repository/ReminderLevelRepository.java 0 → 100644
package common.repository;
import common.model.ReminderLevel;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public interface ReminderLevelRepository extends JpaRepository<ReminderLevel, Long> {
}
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import tkio.model.PackageType; import tkio.model.PackageType;
import tkio.repository.PackageTypeRepository; import tkio.repository.PackageTypeRepository;
import tkio.service.AccountService;
import util.DateUtil; import util.DateUtil;
import util.ValidateUtil; import util.ValidateUtil;
...@@ -37,6 +38,8 @@ public class ContractServiceImpl implements ContractService{ ...@@ -37,6 +38,8 @@ public class ContractServiceImpl implements ContractService{
ContractChangeRepository contractChangeRepository; ContractChangeRepository contractChangeRepository;
@Autowired @Autowired
ContractMoneyRepository contractMoneyRepository; ContractMoneyRepository contractMoneyRepository;
@Autowired
AccountService accountService;
@Override @Override
public Map<String, Object> checkAccount(String email) { public Map<String, Object> checkAccount(String email) {
...@@ -106,6 +109,11 @@ public class ContractServiceImpl implements ContractService{ ...@@ -106,6 +109,11 @@ public class ContractServiceImpl implements ContractService{
resource.setCreateAccount(loginUser.getId()); resource.setCreateAccount(loginUser.getId());
resource.setCreateTime(new Date()); resource.setCreateTime(new Date());
//同步修改trackingio的数据
if(resource.getPlatform().equals("tkio")){
accountService.update(resource);
}
return contractRepository.save(resource); return contractRepository.save(resource);
} }
...@@ -163,6 +171,10 @@ public class ContractServiceImpl implements ContractService{ ...@@ -163,6 +171,10 @@ public class ContractServiceImpl implements ContractService{
cc.setPlatform(contract.getPlatform()); cc.setPlatform(contract.getPlatform());
contractChangeRepository.save(cc); contractChangeRepository.save(cc);
//同步修改trackingio的数据
if(resource.getPlatform().equals("tkio")){
accountService.update(contract);
}
return contractRepository.save(contract); return contractRepository.save(contract);
} }
...@@ -251,7 +263,16 @@ public class ContractServiceImpl implements ContractService{ ...@@ -251,7 +263,16 @@ public class ContractServiceImpl implements ContractService{
BigDecimal bg = new BigDecimal(rebat); BigDecimal bg = new BigDecimal(rebat);
double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
contract.setRebate(f1); contract.setRebate(f1);
//同步修改trackingio的数据
if(resource.getPlatform().equals("tkio")){
accountService.update(contract);
}
}else{ }else{
//同步修改trackingio的数据
if(resource.getPlatform().equals("tkio")){
accountService.forbiden(contract);
}
contract.setStatus("cancel"); contract.setStatus("cancel");
} }
resource.setPlatform(contract.getPlatform()); resource.setPlatform(contract.getPlatform());
......
src/main/java/common/task/ReportCallable.java
...@@ -158,6 +158,8 @@ public class ReportCallable ...@@ -158,6 +158,8 @@ public class ReportCallable
if (!StringUtil.isEmpty(sortString)) { if (!StringUtil.isEmpty(sortString)) {
sortString = getSortMap().get(sortString); sortString = getSortMap().get(sortString);
resultOrderSql = String.format(orderSql, sortString, isASC!=null && isASC==0?"DESC":"ASC"); resultOrderSql = String.format(orderSql, sortString, isASC!=null && isASC==0?"DESC":"ASC");
} else{//
resultOrderSql = String.format(orderSql, "num", "DESC");
} }
String resultLimitSql = String.format(limitSql, pageNum*pageSize, pageSize); String resultLimitSql = String.format(limitSql, pageNum*pageSize, pageSize);
result = String.format(sql + " %s %s", app_sb.length()>0?" where ":"", result = String.format(sql + " %s %s", app_sb.length()>0?" where ":"",
......
src/main/java/tkio/controller/TkioAccountController.java
...@@ -38,6 +38,11 @@ public class TkioAccountController { ...@@ -38,6 +38,11 @@ public class TkioAccountController {
public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) { public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
return ResultModel.OK(tkioAccountService.findOne(email)); return ResultModel.OK(tkioAccountService.findOne(email));
} }
@RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET)
@ResponseBody
public ResultModel findReminderlevel() {
return ResultModel.OK(tkioAccountService.findReminderlevel());
}
//关闭到期提醒 //关闭到期提醒
@RequestMapping(value = "/forbiden", method = RequestMethod.PUT) @RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
......
src/main/java/tkio/repository/AccountRepository.java
...@@ -30,4 +30,7 @@ public interface AccountRepository extends JpaRepository<Account, Long> { ...@@ -30,4 +30,7 @@ public interface AccountRepository extends JpaRepository<Account, Long> {
@Query(value = "select count(*) from account where root_parent = ?1 and create_time > ?2 and create_time < ?3", nativeQuery = true) @Query(value = "select count(*) from account where root_parent = ?1 and create_time > ?2 and create_time < ?3", nativeQuery = true)
BigInteger countByRootParent(Long accountId, String startDate, String endDate); BigInteger countByRootParent(Long accountId, String startDate, String endDate);
@Query(value = "select * from account where email = ?1", nativeQuery = true)
Account findByEmail(String email);
} }
src/main/java/tkio/repository/SalesManLeaderRepository.java
...@@ -17,4 +17,7 @@ public interface SalesManLeaderRepository extends JpaRepository<SalesManLeader, ...@@ -17,4 +17,7 @@ public interface SalesManLeaderRepository extends JpaRepository<SalesManLeader,
@Query(value = "select * from sales_man_leader where email = ?1", nativeQuery = true) @Query(value = "select * from sales_man_leader where email = ?1", nativeQuery = true)
SalesManLeader findOneByEmail(String email); SalesManLeader findOneByEmail(String email);
@Query(value = "select * from sales_man_leader where email in ?1", nativeQuery = true)
List<SalesManLeader> findAllByEmails(List<String> emails);
} }
src/main/java/tkio/service/AccountService.java 0 → 100644
package tkio.service;
import common.model.Contract;
import tkio.model.Account;
/**
* Created by mxq on 2018/1/23.
*/
public interface AccountService {
Account update(Contract contract);
Account forbiden(Contract contract);
}
src/main/java/tkio/service/TkioAccountService.java
...@@ -12,6 +12,8 @@ public interface TkioAccountService { ...@@ -12,6 +12,8 @@ public interface TkioAccountService {
List<Account4Web> findAll(User user); List<Account4Web> findAll(User user);
Account4Web findOne(String email); Account4Web findOne(String email);
List<ReminderLevel> findReminderlevel();
//到期提醒关闭 //到期提醒关闭
Reminder forbiden(User user, Reminder resource); Reminder forbiden(User user, Reminder resource);
......
src/main/java/tkio/service/impl/AccountServiceImpl.java 0 → 100644
package tkio.service.impl;
import common.model.Contract;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import security.annotation.Authorization;
import tkio.model.Account;
import tkio.repository.AccountRepository;
import tkio.service.AccountService;
import util.DateUtil;
import util.ValidateUtil;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* Created by mxq on 2018/1/23.
*/
@Service
public class AccountServiceImpl implements AccountService {
@Autowired
AccountRepository accountRepository;
@Override
public Account update(Contract contract) {
Account account = accountRepository.findByEmail(contract.getEmail());
String today = DateUtil.getBeforeDays(0);
Date pubDate = DateUtil.getDate(contract.getStartDate());
account.setPastDate(contract.getEndDate());
account.setPubDate(pubDate);
account.setModifyPricelevelTime(contract.getStartDate());
account.setModifyTime(new Date());
account.setModifyAccount(0l);
account.setPricelevel(contract.getPriceLevel());
if(!(contract.getEndDate().compareTo(today) < 0)){
account.setStatus(1);
}
if(contract.getProduct().contains("io")){
account.setAllowBehavior(true);
}else{
account.setAllowBehavior(false);
}
Account save = accountRepository.save(account);
//修改子账号
List<Account> accountList = accountRepository.findByRootParent(account.getId());
if (ValidateUtil.isValid(accountList)){
List<Account> list = new ArrayList<>();
for(Account ac : accountList){
ac.setPastDate(contract.getEndDate());
ac.setPubDate(pubDate);
ac.setModifyPricelevelTime(contract.getStartDate());
ac.setPricelevel(contract.getPriceLevel());
ac.setAllowBehavior(save.getAllowBehavior());
list.add(ac);
}
accountRepository.save(list);
}
return save;
}
@Override
public Account forbiden(Contract contract) {
Account account = accountRepository.findByEmail(contract.getEmail());
account.setStatus(0);
return accountRepository.save(account);
}
}
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
...@@ -3,6 +3,7 @@ package tkio.service.impl; ...@@ -3,6 +3,7 @@ package tkio.service.impl;
import com.amazonaws.services.dynamodbv2.xspec.B; import com.amazonaws.services.dynamodbv2.xspec.B;
import common.model.*; import common.model.*;
import common.repository.*; import common.repository.*;
import common.service.UserService;
import dic.RoleEnum; import dic.RoleEnum;
import dic.RoleTypeEnum; import dic.RoleTypeEnum;
import org.apache.commons.collections.map.AbstractMapDecorator; import org.apache.commons.collections.map.AbstractMapDecorator;
...@@ -67,6 +68,11 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -67,6 +68,11 @@ public class TkioAccountServiceImpl implements TkioAccountService {
ContractChangeRepository contractChangeRepository; ContractChangeRepository contractChangeRepository;
@Autowired @Autowired
PackageTypeRepository packageTypeRepository; PackageTypeRepository packageTypeRepository;
@Autowired
UserService userService;
@Autowired
ReminderLevelRepository reminderLevelRepository;
@Override @Override
public List<Account4Web> findAll(User user) { public List<Account4Web> findAll(User user) {
List<Account4Web> result = new ArrayList<>(); List<Account4Web> result = new ArrayList<>();
...@@ -83,8 +89,21 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -83,8 +89,21 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} }
} }
}else{ }else{
SalesManLeader salesManLeader = salesManLeaderRepository.findOneByEmail(user.getEmail()); List<String> emailList = new ArrayList<>();
idList.add(salesManLeader.getId()); emailList.add(user.getEmail());
List<User> userList = userService.findAllSons(user.getId());
if(ValidateUtil.isValid(userList)){
for(User u : userList){
emailList.add(u.getEmail());
}
}
List<SalesManLeader> manLeaderList = salesManLeaderRepository.findAllByEmails(emailList);
if(ValidateUtil.isValid(manLeaderList)){
for(SalesManLeader a : manLeaderList){
idList.add(a.getId());
}
}
} }
if(ValidateUtil.isValid(idList)){ if(ValidateUtil.isValid(idList)){
List<Account> accountList = accountRepository.findBussnissMan(idList); List<Account> accountList = accountRepository.findBussnissMan(idList);
...@@ -172,6 +191,11 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -172,6 +191,11 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} }
@Override @Override
public List<ReminderLevel> findReminderlevel() {
return reminderLevelRepository.findAll();
}
@Override
public Reminder forbiden(User user, Reminder resource) { public Reminder forbiden(User user, Reminder resource) {
resource.setUser(user.getId()); resource.setUser(user.getId());
resource.setModifyTime(new Date()); resource.setModifyTime(new Date());
......
src/main/java/util/DateUtil.java
...@@ -33,6 +33,15 @@ public class DateUtil { ...@@ -33,6 +33,15 @@ public class DateUtil {
public static final int C_ONE_HOUR = 60 * C_ONE_MINUTE; public static final int C_ONE_HOUR = 60 * C_ONE_MINUTE;
public static final long C_ONE_DAY = 24L * C_ONE_HOUR; public static final long C_ONE_DAY = 24L * C_ONE_HOUR;
public static Date getDate(String dataStr){
SimpleDateFormat sdf = new SimpleDateFormat(C_DATE_PATTON_DEFAULT);
try {
return sdf.parse(dataStr);
} catch (ParseException e) {
e.printStackTrace();
}
return null;
}
/** /**
* Return the current date * Return the current date
* *
......
src/main/java/util/NewUserLogThread.java 0 → 100644
package util;
import common.context.AppUtils;
import common.model.UserLog;
import common.repository.UserLogRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/**
* Created by zxy on 2017/12/15.
*/
public class NewUserLogThread
extends Thread
{
protected Logger logger = LoggerFactory.getLogger(NewUserLogThread.class);
private UserLogRepository userLogRepository = AppUtils.getApplicationContext().getBean(UserLogRepository.class);
//操作用户
private String operaAccount;
//操作用户名
private String accountName;
//操作对象的类型：OperateObjectTypeEnum
private String operateObjectType;
//客户管理和系统账号管理是操作对象的账号，以后再加别的模块再定
private String operateObject;
//操作类型：“创建账号”“编辑账号”“录入缴费信息”“录入回访信息”“处理过期提醒”等等，如果都定下来有哪些，可以做一个字典
private String operateType;
//操作前的对象数据
private String oldObject;
//操作后的对象数据
private String newObject;
//为了获取ip及解析地点
private HttpServletRequest request;
/**
* 传入内容为对象
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
* userlog.start();
*/
public NewUserLogThread(String operaAccount, String accountName, String operateObjectType, String operateObject, String operateType, String oldObject, String newObject, HttpServletRequest request) {
this.operaAccount = operaAccount;
this.accountName = accountName;
this.operateObjectType = operateObjectType;
this.operateObject = operateObject;
this.operateType = operateType;
this.oldObject = oldObject;
this.newObject = newObject;
this.request = request;
}
@Override
public void run()
{
try
{
UserLog audit = new UserLog();
audit.setOperaAccount(this.operaAccount);
audit.setAccountName(this.accountName);
audit.setOperateObjectType(this.operateObjectType);
audit.setOperateObject(this.operateObject);
audit.setOperateTime(DateUtil.format(new Date(), DateUtil.C_TIME_PATTON_DEFAULT));
audit.setOperateType(this.operateType);
audit.setOldObject(this.oldObject);
audit.setNewObject(this.newObject);
if (this.request != null) {
String ipAddr = IPAddrUtil.getIpAddrNew(request);
audit.setIp(ipAddr);
if(ValidateUtil.isValid(ipAddr)){
String locationFromIpAddr = IPAddrUtil.getLocationFromIpAddr(ipAddr);
audit.setLocation(locationFromIpAddr);
}
}
userLogRepository.save(audit);
} catch (Exception e) {
e.printStackTrace();
}
}
}
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