Skip to content

M
manager
Commit 2871f2df by kangxiaoshan
Options

大后台更新2

parent 9dc2bb7f
Showing with 574 additions and 104 deletions
.idea/workspace.xml
...@@ -7,15 +7,16 @@ ...@@ -7,15 +7,16 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment=""> <list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/manage.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/manager.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterDir="false" />
</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" />
...@@ -26,74 +27,128 @@ ...@@ -26,74 +27,128 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.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="-329"> <state relative-caret-position="317">
<caret line="96" column="76" selection-start-line="96" selection-start-column="69" selection-end-line="96" selection-end-column="76" /> <caret line="209" column="40" lean-forward="true" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="method#findPay#0;class#ContractController#0" />
<element signature="method#findChange#0;class#ContractController#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="268">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <caret line="230" selection-start-line="230" selection-end-line="230" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/cors/CorsFilter.java"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="686">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" /> <caret line="131" column="28" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="333">
<caret line="534" column="58" lean-forward="true" selection-start-line="534" selection-start-column="58" selection-end-line="534" selection-end-column="58" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
<element signature="e#2786#4190#0" />
<element signature="e#4196#5419#0" />
<element signature="e#25880#27874#0" />
<element signature="e#27880#28654#0" />
<element signature="e#28660#29443#0" />
<element signature="e#29449#31209#0" />
<element signature="e#31215#32004#0" />
<element signature="e#32718#32719#0" expanded="true" />
<element signature="e#32769#32770#0" expanded="true" />
<element signature="e#32834#32835#0" expanded="true" />
<element signature="e#32906#32907#0" expanded="true" />
<element signature="e#32276#32640#0" />
<element signature="e#32646#32970#0" />
<element signature="e#32976#34098#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/annotation/Authorization.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="80">
<caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" /> <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448"> <state relative-caret-position="252">
<caret line="48" column="37" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" /> <caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
<folding>
<element signature="e#5322#5323#0" expanded="true" />
<element signature="e#5357#5358#0" expanded="true" />
<element signature="e#5413#5414#0" expanded="true" />
<element signature="e#5461#5462#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387"> <state relative-caret-position="276">
<caret line="332" column="47" selection-start-line="332" selection-start-column="47" selection-end-line="332" selection-end-column="47" /> <caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="189">
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" /> <caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/resolvers/LoginUserMethodArgumentsResolver.java"> <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="160">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -103,6 +158,15 @@ ...@@ -103,6 +158,15 @@
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>AuthorizationInterceptor</find> <find>AuthorizationInterceptor</find>
<find>loginUser</find>
<find>accountmng</find>
<find>saleName</find>
<find>find/pay</find>
<find>ContractMoneyRepository</find>
<find>contractMoneyRepository.s</find>
<find>flow.setContractCode</find>
<find>find/pricelevel</find>
<find>增值</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -112,9 +176,16 @@ ...@@ -112,9 +176,16 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -168,6 +239,66 @@ ...@@ -168,6 +239,66 @@
<item name="manage" type="b2602c69:ProjectViewProjectNode" /> <item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" /> <item name="manager" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="repository" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="dic" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="tkio" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -330,12 +461,13 @@ ...@@ -330,12 +461,13 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3466000" /> <option name="totallyTimeSpent" value="12487000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24546827" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1623867" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="UI Designer" order="2" /> <window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
...@@ -350,7 +482,7 @@ ...@@ -350,7 +482,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Application Servers" order="7" weight="0.32899022" /> <window_info anchor="bottom" id="Application Servers" order="7" weight="0.32899022" />
<window_info anchor="bottom" id="Spring" order="8" /> <window_info anchor="bottom" id="Spring" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.8013029" /> <window_info anchor="bottom" id="Terminal" order="9" weight="0.8013029" />
<window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.32899022" /> <window_info anchor="bottom" id="Messages" order="12" weight="0.32899022" />
...@@ -372,13 +504,6 @@ ...@@ -372,13 +504,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5088" /> <state relative-caret-position="-5088" />
...@@ -411,8 +536,8 @@ ...@@ -411,8 +536,8 @@
</entry> </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="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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144"> <state relative-caret-position="128">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="17" /> <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -446,8 +571,11 @@ ...@@ -446,8 +571,11 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="176">
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" /> <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -465,10 +593,306 @@ ...@@ -465,10 +593,306 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/BPUContract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/City.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Code.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="9" column="13" 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/dic/RoleEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Email.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractIncrement.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16">
<caret line="9" column="13" 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/tkio/repository/PackageTypeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/KeyValue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Notice.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/PressMoney.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Payment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</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="128">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</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="128">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="9" column="13" 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/model/Role.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/SaleAuth.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/TrackAccount4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="9" column="13" 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/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/AppCategory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/TradeType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="53" column="33" selection-start-line="53" selection-start-column="33" selection-end-line="53" selection-end-column="33" />
<folding>
<element signature="e#1100#1101#0" expanded="true" />
<element signature="e#1148#1149#0" expanded="true" />
<element signature="e#1188#1189#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="14" column="85" selection-start-line="14" selection-start-column="85" selection-end-line="14" selection-end-column="85" />
</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="189">
<caret line="60" column="115" selection-start-line="60" selection-start-column="115" selection-end-line="60" selection-end-column="115" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="180" column="60" lean-forward="true" selection-start-line="180" selection-start-column="60" selection-end-line="180" selection-end-column="60" />
</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="340">
<caret line="584" column="74" selection-start-line="584" selection-start-column="50" selection-end-line="584" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" />
</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="189">
<caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" />
</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="268">
<caret line="230" selection-start-line="230" selection-end-line="230" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<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="686">
<caret line="96" column="76" selection-start-line="96" selection-start-column="69" selection-end-line="96" selection-end-column="76" /> <caret line="131" column="28" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
</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="252">
<caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
<folding>
<element signature="e#5322#5323#0" expanded="true" />
<element signature="e#5357#5358#0" expanded="true" />
<element signature="e#5413#5414#0" expanded="true" />
<element signature="e#5461#5462#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="209" column="40" lean-forward="true" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="method#findPay#0;class#ContractController#0" />
<element signature="method#findChange#0;class#ContractController#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
</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="333">
<caret line="534" column="58" lean-forward="true" selection-start-line="534" selection-start-column="58" selection-end-line="534" selection-end-column="58" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
<element signature="e#2786#4190#0" />
<element signature="e#4196#5419#0" />
<element signature="e#25880#27874#0" />
<element signature="e#27880#28654#0" />
<element signature="e#28660#29443#0" />
<element signature="e#29449#31209#0" />
<element signature="e#31215#32004#0" />
<element signature="e#32718#32719#0" expanded="true" />
<element signature="e#32769#32770#0" expanded="true" />
<element signature="e#32834#32835#0" expanded="true" />
<element signature="e#32906#32907#0" expanded="true" />
<element signature="e#32276#32640#0" />
<element signature="e#32646#32970#0" />
<element signature="e#32976#34098#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
pom.xml
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
<!--<report.url>http://localhost:9010</report.url>--> <!--<report.url>http://localhost:9010</report.url>-->
<report.url>http://http://10.3.20.41:11010</report.url> <report.url>http://10.3.20.41:11010</report.url>
<!--Redis setting--> <!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime> <redis.key.validtime>120</redis.key.validtime>
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
......
src/main/java/common/controller/ContractController.java
...@@ -53,16 +53,16 @@ public class ContractController { ...@@ -53,16 +53,16 @@ public class ContractController {
@RequestMapping(value = "find", method = RequestMethod.GET) @RequestMapping(value = "find", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResultModel findAll(@CurrentAccount User loginAccount, @PathVariable String platform, public ResultModel findAll(@CurrentAccount User loginAccount, @PathVariable String platform,
@RequestParam String startDate, @RequestParam String endDate) { @RequestParam String startDate, @RequestParam String endDate,String contractId) {
return ResultModel.OK(service.findAllContract(loginAccount,startDate, endDate, platform)); return ResultModel.OK(service.findAll(loginAccount,startDate, endDate, platform,contractId));
} }
@RequestMapping(value = "export", method = RequestMethod.GET,produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @RequestMapping(value = "export", method = RequestMethod.GET,produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@ResponseBody @ResponseBody
public ResponseEntity<byte[]> export(@CurrentAccount User loginAccount, @PathVariable String platform, @RequestParam String startDate public ResponseEntity<byte[]> export(@CurrentAccount User loginAccount, @PathVariable String platform, @RequestParam String startDate
, @RequestParam String endDate, HttpServletRequest request, HttpServletResponse response) { , @RequestParam String endDate, HttpServletRequest request, HttpServletResponse response) {
List<Contract> contractList = service.findAll(loginAccount, startDate, endDate, platform); List<Contract> contractList = service.findAll(loginAccount, startDate, endDate, platform,null);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("wait", "未执行"); map.put("wait", "未执行");
map.put("executing", "执行中"); map.put("executing", "执行中");
......
src/main/java/common/model/Contract.java
...@@ -4,6 +4,7 @@ import javax.persistence.Entity; ...@@ -4,6 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
...@@ -29,13 +30,14 @@ public class Contract { ...@@ -29,13 +30,14 @@ public class Contract {
private Double rebate; // private Double rebate; //
private Long sale; private Long sale;
//产品trackingio or adi ... //产品 trackingio or adi ...
private String platform; private String platform;
private String status; private String status;
private String saleName; private String saleName;
private Long payMoney; private Long payMoney;
private Long invoice; // 发票金额 private Long invoice; // 开票次数
private String invoiceMoney; // 发票金额
private String createName; private String createName;
//合同类型 主套餐 or 增值套餐 //合同类型 主套餐 or 增值套餐
private String type; private String type;
...@@ -53,7 +55,6 @@ public class Contract { ...@@ -53,7 +55,6 @@ public class Contract {
/** /**
* 新增字段 * 新增字段
*/ */
// private Long catogrey; //行业
private Long discountFlow; // 优惠流量 private Long discountFlow; // 优惠流量
private Long discountTimeLong; // 优惠时长 private Long discountTimeLong; // 优惠时长
private Double rebateMoney; //回款金额 private Double rebateMoney; //回款金额
...@@ -65,8 +66,6 @@ public class Contract { ...@@ -65,8 +66,6 @@ public class Contract {
private String createrName; // 录入人 private String createrName; // 录入人
@Id @Id
@GeneratedValue @GeneratedValue
public Long getId() { public Long getId() {
...@@ -257,6 +256,14 @@ public class Contract { ...@@ -257,6 +256,14 @@ public class Contract {
return invoice; return invoice;
} }
public String getInvoiceMoney() {
return invoiceMoney;
}
public void setInvoiceMoney(String invoiceMoney) {
this.invoiceMoney = invoiceMoney;
}
public void setInvoice(Long invoice) { public void setInvoice(Long invoice) {
this.invoice = invoice; this.invoice = invoice;
} }
......
src/main/java/common/model/ContractRelation.java
...@@ -16,6 +16,7 @@ public class ContractRelation { ...@@ -16,6 +16,7 @@ public class ContractRelation {
private Long mainContract; private Long mainContract;
private Long relationId; private Long relationId;
private Date createTime; private Date createTime;
private String platform;
@Id @Id
@GeneratedValue @GeneratedValue
...@@ -49,4 +50,12 @@ public class ContractRelation { ...@@ -49,4 +50,12 @@ public class ContractRelation {
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
public String getPlatform() {
return platform;
}
public void setPlatform(String platform) {
this.platform = platform;
}
} }
src/main/java/common/repository/ContractRelationRepository.java
...@@ -2,10 +2,16 @@ package common.repository; ...@@ -2,10 +2,16 @@ package common.repository;
import common.model.ContractRelation; import common.model.ContractRelation;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
/** /**
* 合同 关联信息 * 合同 关联信息
*/ */
public interface ContractRelationRepository extends JpaRepository<ContractRelation, Long> { public interface ContractRelationRepository extends JpaRepository<ContractRelation, Long> {
@Query(value = "select relation_id from contract_relation where main_contract = ?1",nativeQuery = true)
List<Long> findRelationIds(String contractId);
} }
src/main/java/common/repository/ContractRepository.java
...@@ -57,4 +57,10 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -57,4 +57,10 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value = "select * from contract where platform = ?1 and contract_code = ?2",nativeQuery = true) @Query(value = "select * from contract where platform = ?1 and contract_code = ?2",nativeQuery = true)
Contract findByCodePlatform(String contractCode, String platform); Contract findByCodePlatform(String contractCode, String platform);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and id in ?4 order by ds desc",nativeQuery=true)
List<Contract> findByDsRelation(String startDate, String endDate, String platform, List<Long> contractIds);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and sale in ?4 and id in ?5 order by ds desc",nativeQuery=true)
List<Contract> findByDsAndRoileRelation(String startDate, String endDate, String platform, List<Long> idList, List<Long> contractIds);
} }
src/main/java/common/service/ContractService.java
...@@ -31,7 +31,7 @@ public interface ContractService { ...@@ -31,7 +31,7 @@ public interface ContractService {
Contract update(User loginUser, Contract resource); Contract update(User loginUser, Contract resource);
List<Contract> findAll(User loginAccount,String startDate, String endDate, String platfrom); List<Contract> findAll(User loginAccount,String startDate, String endDate, String platfrom,String contractId);
Contract findOne(String code); Contract findOne(String code);
...@@ -55,5 +55,5 @@ public interface ContractService { ...@@ -55,5 +55,5 @@ public interface ContractService {
Map contractCodeAll(String platform); Map contractCodeAll(String platform);
List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform); List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform, String contractId);
} }
\ No newline at end of file
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -3,8 +3,6 @@ package common.service.impl; ...@@ -3,8 +3,6 @@ package common.service.impl;
import adi.dic.PackageEnum; import adi.dic.PackageEnum;
import adi.model.ADIUser; import adi.model.ADIUser;
import adi.service.ADIAccountService; import adi.service.ADIAccountService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.api.ads.adwords.lib.AdWordsProductFrameworkModule;
import common.model.*; import common.model.*;
import common.repository.*; import common.repository.*;
import common.service.ContractService; import common.service.ContractService;
...@@ -12,11 +10,9 @@ import common.service.UserService; ...@@ -12,11 +10,9 @@ import common.service.UserService;
import dic.ContractStatusEnum; import dic.ContractStatusEnum;
import dic.ContractTypeEnum; import dic.ContractTypeEnum;
import dic.RoleEnum; import dic.RoleEnum;
import dic.RoleTypeEnum;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import tkio.model.Account; import tkio.model.Account;
import tkio.model.IncrementFlow; import tkio.model.IncrementFlow;
import tkio.model.PackageType; import tkio.model.PackageType;
...@@ -33,7 +29,6 @@ import java.beans.BeanInfo; ...@@ -33,7 +29,6 @@ import java.beans.BeanInfo;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -190,7 +185,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -190,7 +185,7 @@ public class ContractServiceImpl implements ContractService{
}else{ }else{
lastCode = ""+(codeInt+1); lastCode = ""+(codeInt+1);
} }
return company+"-"+platform+"-"+DateUtil.getDays2(0)+"-"+lastCode; return (company + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase();
} }
@Override @Override
...@@ -214,6 +209,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -214,6 +209,7 @@ public class ContractServiceImpl implements ContractService{
p.setType("main"); p.setType("main");
list.add(p); list.add(p);
} }
// 增值套餐
List<ContractIncrement> increments = contractIncrementRepository.findAll(); List<ContractIncrement> increments = contractIncrementRepository.findAll();
list.addAll(increments); list.addAll(increments);
}else if("userdesk".equals(platform) || "dmp".equals(platform) || "fake".equals(platform)) { }else if("userdesk".equals(platform) || "dmp".equals(platform) || "fake".equals(platform)) {
...@@ -276,34 +272,6 @@ public class ContractServiceImpl implements ContractService{ ...@@ -276,34 +272,6 @@ public class ContractServiceImpl implements ContractService{
return null; return null;
} }
resource.setPayMoney(0L);
resource.setInvoice(0L);
resource.setStatus(ContractStatusEnum.EXECUTING.getKey());
resource.setCreateTime(new Date());
if(null != loginUser) {
resource.setCreateAccount(loginUser.getId());
resource.setCreaterName(loginUser.getName());
}
resource = contractRepository.save(resource);
if(resource.getRelationContract()>0){
//保存关联合同信息
ContractRelation relation = new ContractRelation();
relation.setCreateTime(new Date());
relation.setMainContract(resource.getId());
relation.setRelationId(resource.getRelationContract());
contractRelationRepository.save(relation);
}
if(true){
return resource;
}
// 老的逻辑 // 老的逻辑
String contractCode = getContractCode(resource.getMyBodyCode()); String contractCode = getContractCode(resource.getMyBodyCode());
...@@ -390,7 +358,21 @@ public class ContractServiceImpl implements ContractService{ ...@@ -390,7 +358,21 @@ public class ContractServiceImpl implements ContractService{
} }
} }
return contractRepository.save(resource); resource = contractRepository.save(resource);
if(resource.getRelationContract()!=null && resource.getRelationContract()>0){
//保存关联合同信息
ContractRelation relation = new ContractRelation();
relation.setCreateTime(new Date());
relation.setMainContract(resource.getId());
relation.setRelationId(resource.getRelationContract());
relation.setPlatform(resource.getPlatform());
contractRelationRepository.save(relation);
}
return resource;
} }
@Override @Override
...@@ -491,8 +473,9 @@ public class ContractServiceImpl implements ContractService{ ...@@ -491,8 +473,9 @@ public class ContractServiceImpl implements ContractService{
return contractRepository.save(contract); return contractRepository.save(contract);
} }
@Override @Override
public List<Contract> findAll(User loginAccount, String startDate, String endDate, String platfrom) { public List<Contract> findAll(User loginAccount, String startDate, String endDate, String platform,String contractId) {
List<Contract> result = new ArrayList<>(); List<Contract> result = new ArrayList<>();
List<User> sales = userRepository.findAll(); List<User> sales = userRepository.findAll();
Map<Long, String> saleMap = new HashMap<>(); Map<Long, String> saleMap = new HashMap<>();
...@@ -522,6 +505,14 @@ public class ContractServiceImpl implements ContractService{ ...@@ -522,6 +505,14 @@ public class ContractServiceImpl implements ContractService{
bpuMap.put(s.getId(), s.getPackageName()); bpuMap.put(s.getId(), s.getPackageName());
} }
} }
List<Long> contractIds =null;
if(!StringUtils.isEmpty(contractId)){
//获取 关联合同列表
contractIds = contractRelationRepository.findRelationIds(contractId);
}
List<Contract> contractList = null; List<Contract> contractList = null;
if(loginAccount.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey()) || loginAccount.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey())){ if(loginAccount.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey()) || loginAccount.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey())){
...@@ -532,15 +523,26 @@ public class ContractServiceImpl implements ContractService{ ...@@ -532,15 +523,26 @@ public class ContractServiceImpl implements ContractService{
idList.add(u.getId()); idList.add(u.getId());
} }
contractList = contractRepository.findByDsAndRoile(startDate, endDate, platfrom, idList); // contractList = contractRepository.findByDsAndRoile(startDate, endDate, platfrom, idList);
if(contractIds!=null && contractIds.size()>0){
contractList = contractRepository.findByDsAndRoileRelation(startDate, endDate, platform, idList,contractIds);
}else{
contractList = contractRepository.findByDsAndRoile(startDate, endDate, platform, idList);
}
}else{
// contractList = contractRepository.findByDs(startDate, endDate, platform);
if(contractIds!=null && contractIds.size()>0){
contractList = contractRepository.findByDsRelation(startDate, endDate, platform,contractIds);
}else{ }else{
contractList = contractRepository.findByDs(startDate, endDate, platfrom); contractList = contractRepository.findByDs(startDate, endDate, platform);
}
} }
if(ValidateUtil.isValid(contractList)){ if(ValidateUtil.isValid(contractList)){
for(Contract c : contractList){ for(Contract c : contractList){
c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : ""); c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : "");
if(c.getType().equals(ContractTypeEnum.MAIN.getKey()) && platfrom.contains("io")){ if(c.getType().equals(ContractTypeEnum.MAIN.getKey()) && platform.contains("io")){
c.setPriceLevelName(typeMap.containsKey(c.getPriceLevel()) ? typeMap.get(c.getPriceLevel()) : ""); c.setPriceLevelName(typeMap.containsKey(c.getPriceLevel()) ? typeMap.get(c.getPriceLevel()) : "");
} else if (c.getType().equals(ContractTypeEnum.MAIN.getKey())){ } else if (c.getType().equals(ContractTypeEnum.MAIN.getKey())){
c.setPriceLevelName(bpuMap.containsKey(c.getPriceLevel()) ? bpuMap.get(c.getPriceLevel()) : ""); c.setPriceLevelName(bpuMap.containsKey(c.getPriceLevel()) ? bpuMap.get(c.getPriceLevel()) : "");
...@@ -556,7 +558,14 @@ public class ContractServiceImpl implements ContractService{ ...@@ -556,7 +558,14 @@ public class ContractServiceImpl implements ContractService{
} }
@Override @Override
public List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform) { public List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform, String contractId) {
List<Long> contractIds =null;
if(!StringUtils.isEmpty(contractId)){
//获取 关联合同列表
contractIds = contractRelationRepository.findRelationIds(contractId);
}
List<Contract> contractList ; List<Contract> contractList ;
if(!loginAccount.getRole().equals(RoleEnum.MANAGER.getKey())){ if(!loginAccount.getRole().equals(RoleEnum.MANAGER.getKey())){
...@@ -567,12 +576,23 @@ public class ContractServiceImpl implements ContractService{ ...@@ -567,12 +576,23 @@ public class ContractServiceImpl implements ContractService{
for(User u : userList){ for(User u : userList){
idList.add(u.getId()); idList.add(u.getId());
} }
if(contractIds!=null && contractIds.size()>0){
contractList = contractRepository.findByDsAndRoileRelation(startDate, endDate, platform, idList,contractIds);
}else{
contractList = contractRepository.findByDsAndRoile(startDate, endDate, platform, idList); contractList = contractRepository.findByDsAndRoile(startDate, endDate, platform, idList);
}
}else{ }else{
if(contractIds!=null && contractIds.size()>0){
contractList = contractRepository.findByDsRelation(startDate, endDate, platform,contractIds);
}else{
contractList = contractRepository.findByDs(startDate, endDate, platform); contractList = contractRepository.findByDs(startDate, endDate, platform);
} }
}
return contractList; return contractList;
} }
...@@ -801,15 +821,11 @@ public class ContractServiceImpl implements ContractService{ ...@@ -801,15 +821,11 @@ public class ContractServiceImpl implements ContractService{
@Override @Override
public List<TradeType> getTradeData(String platform) { public List<TradeType> getTradeData(String platform) {
return tradeTypeRepsitory.findAll(); return tradeTypeRepsitory.findAll();
} }
@Override @Override
public Map contractCodeAll(String platform) { public Map contractCodeAll(String platform) {
return contractRepository.contractCodePlatform(platform); return contractRepository.contractCodePlatform(platform);
} }
......
src/main/java/tkio/controller/TkioAccountController.java
...@@ -118,6 +118,7 @@ public class TkioAccountController { ...@@ -118,6 +118,7 @@ public class TkioAccountController {
userlog.start(); userlog.start();
return ResultModel.OK( tkioAccountService.visit(loginAccount, resource)); return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
} }
//功能使用查询 //功能使用查询
@RequestMapping(value = "/find/function/{accountId}", method = RequestMethod.GET) @RequestMapping(value = "/find/function/{accountId}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
......
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