Skip to content

M
manager
Commit 5fc737e7 by manxiaoqiang
Options

合同

parent 9e50ac7b
Showing with 559 additions and 198 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/User.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/User.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/UserService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/UserService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.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/model/Account4Web.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.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/service/ContractService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.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/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -29,46 +35,41 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3565">
<caret line="179" column="46" lean-forward="false" selection-start-line="179" selection-start-column="46" selection-end-line="179" selection-end-column="46" />
<folding>
<element signature="e#7562#7563#0" expanded="true" />
<element signature="e#7629#7630#0" expanded="true" />
</folding>
<state relative-caret-position="421">
<caret line="121" column="57" lean-forward="false" selection-start-line="121" selection-start-column="57" selection-end-line="121" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<state relative-caret-position="320">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="352">
<caret line="308" column="85" lean-forward="true" selection-start-line="308" selection-start-column="85" selection-end-line="308" selection-end-column="85" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<file leaf-file-name="ContractMoneyRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="35" selection-end-column="40" />
<state relative-caret-position="322">
<caret line="21" column="98" lean-forward="true" selection-start-line="21" selection-start-column="98" selection-end-line="21" selection-end-column="98" />
<folding />
</state>
</provider>
......@@ -77,8 +78,28 @@
<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="2208">
<caret line="109" column="89" lean-forward="false" selection-start-line="109" selection-start-column="89" selection-end-line="109" selection-end-column="89" />
<state relative-caret-position="223">
<caret line="84" column="39" lean-forward="true" selection-start-line="84" selection-start-column="39" selection-end-line="84" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="31" column="18" lean-forward="false" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1208">
<caret line="335" column="32" lean-forward="false" selection-start-line="335" selection-start-column="19" selection-end-line="335" selection-end-column="32" />
<folding />
</state>
</provider>
......@@ -111,6 +132,8 @@
<find>reyun</find>
<find>\t</find>
<find>rebat</find>
<find>contractChangeRepository</find>
<find>contractMoneyRepository</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -132,15 +155,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/util/Constant.java" />
<option value="$PROJECT_DIR$/src/main/resources/redis.properties" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
<option value="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" />
......@@ -168,14 +187,6 @@
<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/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/User.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
......@@ -183,6 +194,18 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
</list>
</option>
</component>
......@@ -391,6 +414,92 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="track" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="track" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</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="track" />
<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>
<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>
......@@ -427,9 +536,9 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -916,7 +1025,7 @@
<workItem from="1516096949113" duration="5148000" />
<workItem from="1516155511499" duration="43292000" />
<workItem from="1516327450910" duration="12490000" />
<workItem from="1516586760731" duration="1493000" />
<workItem from="1516586760731" duration="12309000" />
</task>
<task id="LOCAL-00003" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<created>1514871143365</created>
......@@ -1247,14 +1356,21 @@
<option name="project" value="LOCAL" />
<updated>1516272512766</updated>
</task>
<option name="localTasksCounter" value="50" />
<task id="LOCAL-00050" summary="合同">
<created>1516592276562</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1516592276562</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="228053000" />
<option name="totallyTimeSpent" value="238869000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
......@@ -1275,7 +1391,7 @@
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" 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.46644846" sideWeight="0.49319214" 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.49319214" 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="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.28895614" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
......@@ -1329,7 +1445,7 @@
<window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" 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.36988544" sideWeight="0.49319214" 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.49319214" 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="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" />
......@@ -1412,45 +1528,11 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/resources/db.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="20" lean-forward="false" selection-start-line="0" selection-start-column="20" selection-end-line="0" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="16" column="39" lean-forward="true" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="30" column="63" lean-forward="false" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/DBUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="20" column="71" lean-forward="false" selection-start-line="20" selection-start-column="65" selection-end-line="20" selection-end-column="71" />
</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="228">
<caret line="189" column="38" lean-forward="false" selection-start-line="189" selection-start-column="38" selection-end-line="189" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="66" column="0" lean-forward="true" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1472,6 +1554,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="713">
<caret line="51" column="43" lean-forward="false" selection-start-line="51" selection-start-column="43" selection-end-line="51" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
......@@ -1557,6 +1640,7 @@
<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>
......@@ -1592,6 +1676,7 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -1606,180 +1691,286 @@
<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/common/repository/ContractRepository.java">
<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="391">
<caret line="24" column="23" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="23" />
<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/common/model/ContractChange.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="143" column="35" lean-forward="false" selection-start-line="143" selection-start-column="35" selection-end-line="143" selection-end-column="35" />
<state relative-caret-position="0">
<caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="15" column="80" lean-forward="true" selection-start-line="15" selection-start-column="80" selection-end-line="15" selection-end-column="80" />
<state relative-caret-position="230">
<caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="174">
<caret line="164" column="18" lean-forward="false" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
<folding>
<element signature="e#2591#2592#0" expanded="false" />
<element signature="e#2611#2612#0" expanded="false" />
<element signature="e#2650#2651#0" expanded="false" />
<element signature="e#2677#2678#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="16" column="79" lean-forward="false" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="79" />
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="805">
<caret line="39" column="13" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<state relative-caret-position="207">
<caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6118">
<caret line="285" column="106" lean-forward="false" selection-start-line="285" selection-start-column="106" selection-end-line="285" selection-end-column="106" />
<state relative-caret-position="168">
<caret line="23" column="57" lean-forward="true" selection-start-line="23" selection-start-column="57" selection-end-line="23" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-289">
<caret line="23" column="13" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
<state relative-caret-position="171">
<caret line="27" column="50" lean-forward="false" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java">
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="31" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="31" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.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" />
<state relative-caret-position="207">
<caret line="16" column="29" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
<state relative-caret-position="274">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<state relative-caret-position="23">
<caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="35" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/User.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="174">
<caret line="164" column="18" lean-forward="false" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
<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" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
<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" />
<folding>
<element signature="e#7562#7563#0" expanded="false" />
<element signature="e#7629#7630#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<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="207">
<caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<state relative-caret-position="-82">
<caret line="199" column="25" lean-forward="false" selection-start-line="199" selection-start-column="25" selection-end-line="199" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="23" column="57" lean-forward="true" selection-start-line="23" selection-start-column="57" selection-end-line="23" selection-end-column="57" />
<state relative-caret-position="-140">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.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="171">
<caret line="27" column="50" lean-forward="false" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
<state relative-caret-position="421">
<caret line="121" column="57" lean-forward="false" selection-start-line="121" selection-start-column="57" selection-end-line="121" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2208">
<caret line="109" column="89" lean-forward="false" selection-start-line="109" selection-start-column="89" selection-end-line="109" selection-end-column="89" />
<state relative-caret-position="389">
<caret line="211" column="38" lean-forward="false" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
<folding>
<element signature="e#4327#4328#0" expanded="true" />
<element signature="e#4384#4385#0" expanded="true" />
<element signature="e#4432#4433#0" expanded="true" />
</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="320">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3565">
<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 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" />
<folding>
<element signature="e#7562#7563#0" expanded="true" />
<element signature="e#7629#7630#0" expanded="true" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<state relative-caret-position="297">
<caret line="27" column="27" lean-forward="true" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="35" selection-end-column="40" />
<state relative-caret-position="322">
<caret line="21" column="98" lean-forward="true" selection-start-line="21" selection-start-column="98" selection-end-line="21" selection-end-column="98" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="16" column="29" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="29" />
<state relative-caret-position="223">
<caret line="84" column="39" lean-forward="true" selection-start-line="84" selection-start-column="39" selection-end-line="84" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="194">
<caret line="31" column="18" lean-forward="false" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="imports" expanded="true" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1208">
<caret line="335" column="32" lean-forward="false" selection-start-line="335" selection-start-column="19" selection-end-line="335" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="308" column="85" lean-forward="true" selection-start-line="308" selection-start-column="85" selection-end-line="308" selection-end-column="85" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/controller/ContractController.java
......@@ -110,4 +110,11 @@ public class ContractController {
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract) {
return ResultModel.OK(service.updatePay(loginAccount, contract));
}
@RequestMapping(value = "find/payall", method = RequestMethod.GET)
@ResponseBody
public ResultModel findPayAll(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate) {
return ResultModel.OK(service.findPay(startDate, endDate));
}
}
src/main/java/common/model/Account4Web.java
......@@ -28,6 +28,9 @@ public class Account4Web {
private Boolean trackStatus;
private Boolean remStatus;
private Long bussinessMan;
private String contractStatus;
private Integer contractTime;
@Id
@GeneratedValue
public Long getId() {
......@@ -198,26 +201,19 @@ public class Account4Web {
this.createDs = createDs;
}
@Override
public String toString() {
return "Account4Web{" +
"id=" + id +
", email='" + email + '\'' +
", company='" + company + '\'' +
", createDate=" + createDate +
", status='" + status + '\'' +
", packageType='" + packageType + '\'' +
", pastDate='" + pastDate + '\'' +
", track=" + track +
", io=" + io +
", trackLimit=" + trackLimit +
", ioLimit=" + ioLimit +
", backTime=" + backTime +
", user='" + user + '\'' +
", tell='" + tell + '\'' +
", money=" + money +
", ioStatus=" + ioStatus +
", trackStatus=" + trackStatus +
'}';
public String getContractStatus() {
return contractStatus;
}
public void setContractStatus(String contractStatus) {
this.contractStatus = contractStatus;
}
public Integer getContractTime() {
return contractTime;
}
public void setContractTime(Integer contractTime) {
this.contractTime = contractTime;
}
}
src/main/java/common/model/ContractChange.java
......@@ -21,6 +21,8 @@ public class ContractChange {
private Long money;
private Long user;
private String createName;
private String platform;
private String levelName;
private Long modifyAccount;
private Long createAccount;
......@@ -148,4 +150,20 @@ public class ContractChange {
public void setCreateName(String createName) {
this.createName = createName;
}
public String getPlatform() {
return platform;
}
public void setPlatform(String platform) {
this.platform = platform;
}
public String getLevelName() {
return levelName;
}
public void setLevelName(String levelName) {
this.levelName = levelName;
}
}
src/main/java/common/model/ContractMoney.java
......@@ -19,6 +19,7 @@ public class ContractMoney {
private Long money;
private Long user;
private String createName;
private String platform;
private Long modifyAccount;
private Long createAccount;
......@@ -130,4 +131,12 @@ public class ContractMoney {
public void setCreateName(String createName) {
this.createName = createName;
}
public String getPlatform() {
return platform;
}
public void setPlatform(String platform) {
this.platform = platform;
}
}
src/main/java/common/repository/ContractChangeRepository.java
......@@ -16,4 +16,7 @@ public interface ContractChangeRepository extends JpaRepository<ContractChange,
@Query(value="select * from contract_change where ds >= ?1 and ds <= ?2 and contract_code = ?3 order by ds desc",nativeQuery=true)
List<ContractChange> findByDs(String startDate, String endDate, String code);
@Query(value="SELECT * from contract_change where platform = ?1 and email = ?2 and ds >= ?3 and ds <= ?4 order by ds desc",nativeQuery=true)
List<ContractChange> findByPlatformAndEmail(String platform, String email, String startDate, String endDate);
}
src/main/java/common/repository/ContractMoneyRepository.java
......@@ -14,4 +14,10 @@ public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Lo
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and contract_code = ?3 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate, String code);
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate);
@Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and email = ?3 and platform = ?4 order by ds desc",nativeQuery=true)
List<ContractMoney> findByDs(String startDate, String endDate, String email, String platform);
}
src/main/java/common/repository/ContractRepository.java
......@@ -23,4 +23,10 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
Contract findByCode(String contract_code);
@Query(value="SELECT * from contract where platform = ?1",nativeQuery=true)
List<Contract> findByPlatform(String platform);
@Query(value="SELECT * from contract where platform = ?1 and email = ?2",nativeQuery=true)
List<Contract> findByPlatformAndEmail(String platform, String email);
}
src/main/java/common/service/ContractService.java
......@@ -38,4 +38,6 @@ public interface ContractService {
List<ContractChange> findChange(String startDate, String endDate, String code);
Contract updatePay(User loginUser, ContractMoney resource);
List<ContractMoney> findPay(String startDate, String endDate);
}
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -160,6 +160,7 @@ public class ContractServiceImpl implements ContractService{
double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
contract.setRebate(f1);
}
cc.setPlatform(contract.getPlatform());
contractChangeRepository.save(cc);
return contractRepository.save(contract);
......@@ -204,6 +205,7 @@ public class ContractServiceImpl implements ContractService{
}
contractRepository.save(contract);
resource.setPlatform(contract.getPlatform());
resource.setCreateAccount(loginUser.getId());
resource.setCreateTime(new Date());
resource.setUser(loginUser.getId());
......@@ -226,6 +228,7 @@ public class ContractServiceImpl implements ContractService{
}else{
contract.setStatus("cancel");
}
resource.setPlatform(contract.getPlatform());
resource.setCreateAccount(loginUser.getId());
resource.setCreateTime(new Date());
resource.setDs(DateUtil.getBeforeDays(0));
......@@ -315,4 +318,25 @@ public class ContractServiceImpl implements ContractService{
save.setCreateName(saleMap.containsKey(save.getSale()) ? saleMap.get(save.getSale()) : "");
return save;
}
@Override
public List<ContractMoney> findPay(String startDate, String endDate) {
List<User> sales = userRepository.findAll();
Map<Long, String> saleMap = new HashMap<>();
if(ValidateUtil.isValid(sales)){
for(User s: sales){
saleMap.put(s.getId(), s.getName());
}
}
List<ContractMoney> result = new ArrayList<>();
List<ContractMoney> list = contractMoneyRepository.findByDs(startDate, endDate);
if(ValidateUtil.isValid(list)){
for(ContractMoney cm : list){
cm.setCreateName(saleMap.containsKey(cm.getUser()) ? saleMap.get(cm.getUser()) : "");
result.add(cm);
}
}
return result;
}
}
src/main/java/tkio/controller/TkioAccountController.java
......@@ -109,9 +109,25 @@ public class TkioAccountController {
@RequestMapping(value = "/find/pay/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findPay(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
@RequestParam String endDate, @RequestParam String email, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findPay(email,startDate,endDate));
}
//套餐变更查询
@RequestMapping(value = "/find/contract/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findChange(@CurrentAccount User loginAccount, @RequestParam String email, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findPay(accountId,startDate,endDate));
return ResultModel.OK(tkioAccountService.findContract(email));
}
//合同查询
@RequestMapping(value = "/find/change/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findContract(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @RequestParam String email, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findContractChange(email,startDate,endDate));
}
}
src/main/java/tkio/service/TkioAccountService.java
......@@ -33,6 +33,9 @@ public interface TkioAccountService {
List<BackVisit> findVisit(Long account, String startDate, String endDate);
List<Payment> findPay(Long account, String startDate, String endDate);
List<ContractMoney> findPay(String email, String startDate, String endDate);
List<Contract> findContract(String email);
List<ContractChange> findContractChange(String email, String startDate, String endDate);
}
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
......@@ -6,6 +6,7 @@ import common.repository.*;
import dic.RoleEnum;
import dic.RoleTypeEnum;
import org.apache.commons.collections.map.AbstractMapDecorator;
import org.apache.commons.collections4.list.TreeList;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
......@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import tkio.model.Account;
import tkio.model.PackageType;
import tkio.model.SalesManLeader;
import tkio.repository.*;
import tkio.service.AccountFlowRestrictService;
......@@ -57,7 +59,14 @@ public class TkioAccountServiceImpl implements TkioAccountService {
AccountFlowRestrictService accountFlowRestrictService;
@Autowired
UserRepository userRepository;
@Autowired
ContractMoneyRepository contractMoneyRepository;
@Autowired
ContractRepository contractRepository;
@Autowired
ContractChangeRepository contractChangeRepository;
@Autowired
PackageTypeRepository packageTypeRepository;
@Override
public List<Account4Web> findAll(User user) {
List<Account4Web> result = new ArrayList<>();
......@@ -88,6 +97,8 @@ public class TkioAccountServiceImpl implements TkioAccountService {
}
}
}
List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio");
Map<Long, Boolean> reMap = new HashMap<>();
if(ValidateUtil.isValid(reminderList)){
......@@ -95,9 +106,11 @@ public class TkioAccountServiceImpl implements TkioAccountService {
reMap.put(re.getAccountId(), re.getRemindStatus());
}
}
if(ValidateUtil.isValid(account4WebList)){
Map<String, Integer> backTimeMap = getBackTime();
Map<String, Long> payMap = getPayment();
Map<String, List<Contract>> payMap = getPay();
for(Account4Web aw : account4WebList){
if(backTimeMap.containsKey(aw.getEmail())){
aw.setBackTime(backTimeMap.get(aw.getEmail()));
......@@ -105,8 +118,13 @@ public class TkioAccountServiceImpl implements TkioAccountService {
aw.setBackTime(0);
}
if(payMap.containsKey(aw.getEmail())){
aw.setMoney(payMap.get(aw.getEmail()));
List<Contract> contractList = payMap.get(aw.getEmail());
aw.setMoney(contractList.get(contractList.size() - 1 ).getPayMoney());
aw.setContractStatus(contractList.get(contractList.size() - 1 ).getStatus());
aw.setContractTime(contractList.size());
} else{
aw.setContractTime(0);
aw.setContractStatus("empty");
aw.setMoney(0L);
}
if(reMap.containsKey(aw.getAccountId())){
......@@ -277,18 +295,73 @@ public class TkioAccountServiceImpl implements TkioAccountService {
}
@Override
public List<Payment> findPay(Long account, String startDate, String endDate) {
List<Payment> result = new ArrayList<>();
public List<ContractMoney> findPay(String email, String startDate, String endDate) {
List<ContractMoney> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<Payment> list = paymentRepository.findAll(account, startDate, endDate, "tkio");
if (ValidateUtil.isValid(list)) {
for(Payment re : list){
re.setUserName(userMap.get(re.getUser()));
result.add(re);
List<ContractMoney> list = contractMoneyRepository.findByDs(startDate, endDate, email,"tkio");
if(ValidateUtil.isValid(list)){
for(ContractMoney cm : list){
Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount();
cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : "");
result.add(cm);
}
}
return result;
}
@Override
public List<Contract> findContract(String email) {
List<Contract> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<PackageType> typeList = packageTypeRepository.findAll();
Map<Long, String> typeMap = new HashMap<>();
if(ValidateUtil.isValid(typeList)){
for(PackageType s: typeList){
typeMap.put(s.getId(), s.getPackageName());
}
}
List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", email);
if(ValidateUtil.isValid(contractList)){
for(Contract cm : contractList){
cm.setSaleName(userMap.containsKey(cm.getSale()) ? userMap.get(cm.getSale()) : "");
cm.setPriceLevelName(typeMap.containsKey(cm.getPriceLevel()) ? typeMap.get(cm.getPriceLevel()) : "");
result.add(cm);
}
}
return result;
}
@Override
public List<ContractChange> findContractChange(String email, String startDate, String endDate) {
List<ContractChange> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<PackageType> typeList = packageTypeRepository.findAll();
Map<Long, String> typeMap = new HashMap<>();
if(ValidateUtil.isValid(typeList)){
for(PackageType s: typeList){
typeMap.put(s.getId(), s.getPackageName());
}
}
List<ContractChange> contractChangeList = contractChangeRepository.findByPlatformAndEmail("tkio", email, startDate, endDate);
if(ValidateUtil.isValid(contractChangeList)){
for(ContractChange cm : contractChangeList){
Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount();
cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : "");
cm.setLevelName(typeMap.containsKey(cm.getLevel()) ? typeMap.get(cm.getLevel()) : "");
result.add(cm);
}
}
return result;
......@@ -310,18 +383,25 @@ public class TkioAccountServiceImpl implements TkioAccountService {
return map;
}
public Map<String, Long> getPayment(){
Map<String, Long> map = new HashMap<>();
List<Payment> all = paymentRepository.findAllByPlatform("tkio");
if (ValidateUtil.isValid(all)){
for(Payment pa : all){
public Map<String, List<Contract>> getPay(){
Map<String, List<Contract>> map = new HashMap<>();
List<Contract> contractList = contractRepository.findByPlatform("tkio");
if (ValidateUtil.isValid(contractList)){
for(Contract pa : contractList){
if(map.containsKey(pa.getEmail())){
map.put(pa.getEmail(), map.get(pa.getEmail()) + pa.getMoney());
List<Contract> list = map.get(pa.getEmail());
list.add(pa);
map.put(pa.getEmail(), list);
} else{
map.put(pa.getEmail(), pa.getMoney());
List<Contract> list = new TreeList<>();
list.add(pa);
map.put(pa.getEmail(), list);
}
}
}
return map;
}
}
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