Skip to content

M
manager
Commit ae9ee6ae by kangxiaoshan
Options

Merge branch 'contract_rela' into 31762_2_bugfix

parents 318643f9 298adca5
Showing with 65 additions and 1105 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="manage:war exploded" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/common/model/FlowChange.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/common/repository/FlowChangeRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/model/Contract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractChange.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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file 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="333">
<caret line="252" column="44" selection-start-line="252" selection-start-column="44" selection-end-line="252" selection-end-column="44" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="e#1175#1186#0" />
<element signature="class#1420:2200" />
<element signature="initializer##0;class#1420:2200" />
<element signature="e#2260#2319#0" />
<element signature="method#findAll#0;class#ContractController#0" />
<element signature="e#2662#2775#0" />
<element signature="method#export#0;class#ContractController#0" />
<element signature="e#3370#3933#1" />
<element signature="e#3415#3923#1" />
<element signature="e#4025#4084#0" />
<element signature="e#4107#4151#0" />
<element signature="e#4800#4917#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5608#5978#1" />
<element signature="e#5655#5968#1" />
<element signature="e#6070#6129#0" />
<element signature="e#6152#6196#0" />
<element signature="e#6944#7006#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="e#7185#7252#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="e#7484#7548#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="e#7860#7924#0" />
<element signature="e#8074#8138#0" />
<element signature="method#findCode#0;class#ContractController#0" />
<element signature="e#8389#8459#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="e#8657#8726#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="e#8886#8951#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#9445#9507#0" />
<element signature="method#create#0;class#ContractController#0" />
<element signature="e#10005#10085#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="method#baseCreate#0;class#ContractController#0" />
<element signature="method#contractCodeAll#0;class#ContractController#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file 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="157">
<caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="14" column="62" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file 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="301">
<caret line="1144" column="65" selection-start-line="1144" selection-start-column="65" selection-end-line="1144" selection-end-column="65" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/FlowChangeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/FlowChange.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#604#605#0" expanded="true" />
<element signature="e#629#630#0" expanded="true" />
<element signature="e#732#733#0" expanded="true" />
<element signature="e#771#772#0" expanded="true" />
<element signature="e#1865#1866#0" expanded="true" />
<element signature="e#1900#1901#0" expanded="true" />
<element signature="e#1956#1957#0" expanded="true" />
<element signature="e#2004#2005#0" expanded="true" />
<element signature="e#2036#2037#0" expanded="true" />
<element signature="e#2064#2065#0" expanded="true" />
<element signature="e#2106#2107#0" expanded="true" />
<element signature="e#2140#2141#0" expanded="true" />
<element signature="e#2174#2175#0" expanded="true" />
<element signature="e#2204#2205#0" expanded="true" />
<element signature="e#2250#2251#0" expanded="true" />
<element signature="e#2288#2289#0" expanded="true" />
<element signature="e#2351#2352#0" expanded="true" />
<element signature="e#2379#2380#0" expanded="true" />
<element signature="e#2421#2422#0" expanded="true" />
<element signature="e#2455#2456#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="33" column="3" selection-start-line="33" selection-start-column="3" selection-end-line="34" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3389#3390#0" expanded="true" />
<element signature="e#3417#3418#0" expanded="true" />
<element signature="e#3459#3460#0" expanded="true" />
<element signature="e#3493#3494#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="121" column="57" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1264">
<caret line="88" column="40" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>AuthorizationInterceptor</find>
<find>loginUser</find>
<find>accountmng</find>
<find>ContractMoneyRepository</find>
<find>flow.setContractCode</find>
<find>find/pricelevel</find>
<find>增值</find>
<find>find/body</find>
<find>checkTime</find>
<find>find</find>
<find>setContractCode</find>
<find>setStatus</find>
<find>contractIds</find>
<find>find/auth</find>
<find>============</find>
<find>payMoney</find>
<find>pricelevel&quot;</find>
<find>priceLevelName</find>
<find>saleName</find>
<find>list</find>
<find>mailList</find>
<find>Constant.mailList</find>
<find>Constant.mlist</find>
<find>mail.list</find>
<find>已回款</find>
<find>findByDsAndRoile</find>
<find>测试环境</find>
<find>find/pay</find>
<find>contractMoneyRepository.s</find>
<find>contractMoneyRepository.save</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/.gitignore" />
<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/model/ContractRelation.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/util/Constant.java" />
<option value="$PROJECT_DIR$/src/main/resources/mail.properties" />
<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$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/util/MailUtils.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/FlowChange.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/FlowChangeRepository.java" />
</list>
</option>
</component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
<option name="FILTER_INFO" value="true" />
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
<component name="MavenImportPreferences">
<option name="enabledProfiles">
<list>
<option value="test" />
</list>
</option>
<option name="disabledProfiles">
<list>
<option value="dev" />
</list>
</option>
</component>
<component name="MavenProjectNavigator">
<treeState>
<expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
</path>
</expand>
<select />
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="y" value="2" />
<option name="width" value="1378" />
<option name="height" value="733" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="manage" type="b2602c69:ProjectViewProjectNode" />
<item name="manager" type="462c0819:PsiDirectoryNode" />
</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>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="sshConsole" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Tomcat Server.tomcat">
<configuration name="ContractServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="common.service.impl.ContractServiceImpl" />
<module name="manage" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="common.service.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="LoginController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="common.controller.LoginController" />
<module name="manage" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="common.controller.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="UserServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="common.service.impl.UserServiceImpl" />
<module name="manage" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="common.service.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.321" ALTERNATIVE_JRE_ENABLED="false">
<option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
<option name="UPDATING_POLICY" value="restart-server" />
<deployment>
<artifact name="manage:war exploded">
<settings>
<option name="CONTEXT_PATH" value="/" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_manage_2" />
<option name="HTTP_PORT" value="8083" />
<option name="JNDI_PORT" value="1029" />
</server-settings>
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
<predefined_log_file id="Tomcat Manager" />
<predefined_log_file id="Tomcat Host Manager" />
<predefined_log_file id="Tomcat Localhost Access" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="50136" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method v="2">
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="manage:war exploded" />
</option>
</method>
</configuration>
<list>
<item itemvalue="Application.LoginController" />
<item itemvalue="Application.UserServiceImpl" />
<item itemvalue="Application.ContractServiceImpl" />
<item itemvalue="Tomcat Server.tomcat" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.ContractServiceImpl" />
<item itemvalue="Application.UserServiceImpl" />
<item itemvalue="Application.LoginController" />
</list>
</recent_temporary>
</component>
<component name="SshConsoleOptionsProvider">
<option name="myEncoding" value="UTF-8" />
<option name="myConnectionType" value="NONE" />
</component>
<component name="SvnConfiguration">
<configuration>C:\Users\reyun\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment="" />
<created>1556090111073</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1556090111073</updated>
<workItem from="1556090113838" duration="2748000" />
<workItem from="1556157974475" duration="603000" />
<workItem from="1556246315995" duration="115000" />
<workItem from="1556504898324" duration="85000" />
<workItem from="1556505038023" duration="24140000" />
<workItem from="1558578871392" duration="4010000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="69856000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21978852" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Designer" order="4" />
<window_info id="Web" order="5" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32899022" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.5439739" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<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="Spring" order="8" />
<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="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.32899022" />
<window_info anchor="bottom" id="Java Enterprise" order="13" />
<window_info anchor="bottom" id="Database Changes" order="14" />
<window_info anchor="bottom" id="Version Control" order="15" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Maven" order="3" weight="0.1918429" />
<window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Remote Host" order="5" />
<window_info anchor="right" id="Database" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Bean Validation" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
</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="324">
<caret line="400" column="8" selection-start-line="400" selection-start-column="8" selection-end-line="400" selection-end-column="8" />
</state>
</provider>
</entry>
<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="192">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/OtPkgDevStatsRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3664">
<caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="130" column="16" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="92" column="44" selection-start-line="92" selection-start-column="30" selection-end-line="92" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-992">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="45" column="38" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-160">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</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="112">
<caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
</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="-963">
<caret line="185" column="23" selection-start-line="185" selection-start-column="23" selection-end-line="185" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116">
<caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-32">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2048">
<caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1136">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/persistence.properties">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/redis.properties">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/rest-servlet.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-144" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="7" column="12" lean-forward="true" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="445">
<caret line="75" column="15" selection-start-line="75" selection-start-column="15" selection-end-line="75" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" 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="8" column="17" 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/dic/ContractStatusEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="16" column="25" lean-forward="true" selection-start-line="12" selection-end-line="16" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-752">
<caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="212" column="30" lean-forward="true" selection-start-line="212" selection-start-column="30" selection-end-line="212" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="55" column="59" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />
<folding>
<element signature="e#1316#1317#0" expanded="true" />
<element signature="e#1356#1357#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="79" selection-start-line="79" selection-end-line="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mail.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
</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="176">
<caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
</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="256">
<caret line="19" column="71" selection-start-line="19" selection-start-column="71" selection-end-line="19" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/MailUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="105" column="18" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="97" column="13" selection-start-line="97" selection-start-column="13" selection-end-line="97" selection-end-column="17" />
</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="176">
<caret line="16" column="29" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="29" />
</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="224">
<caret line="14" column="62" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1264">
<caret line="88" column="40" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="40" />
</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="157">
<caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
</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="333">
<caret line="252" column="44" selection-start-line="252" selection-start-column="44" selection-end-line="252" selection-end-column="44" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="e#1175#1186#0" />
<element signature="class#1420:2200" />
<element signature="initializer##0;class#1420:2200" />
<element signature="e#2260#2319#0" />
<element signature="method#findAll#0;class#ContractController#0" />
<element signature="e#2662#2775#0" />
<element signature="method#export#0;class#ContractController#0" />
<element signature="e#3370#3933#1" />
<element signature="e#3415#3923#1" />
<element signature="e#4025#4084#0" />
<element signature="e#4107#4151#0" />
<element signature="e#4800#4917#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5608#5978#1" />
<element signature="e#5655#5968#1" />
<element signature="e#6070#6129#0" />
<element signature="e#6152#6196#0" />
<element signature="e#6944#7006#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="e#7185#7252#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="e#7484#7548#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="e#7860#7924#0" />
<element signature="e#8074#8138#0" />
<element signature="method#findCode#0;class#ContractController#0" />
<element signature="e#8389#8459#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="e#8657#8726#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="e#8886#8951#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#9445#9507#0" />
<element signature="method#create#0;class#ContractController#0" />
<element signature="e#10005#10085#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="method#baseCreate#0;class#ContractController#0" />
<element signature="method#contractCodeAll#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="301">
<caret line="1144" column="65" selection-start-line="1144" selection-start-column="65" selection-end-line="1144" selection-end-column="65" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/FlowChangeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="33" column="3" selection-start-line="33" selection-start-column="3" selection-end-line="34" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3389#3390#0" expanded="true" />
<element signature="e#3417#3418#0" expanded="true" />
<element signature="e#3459#3460#0" expanded="true" />
<element signature="e#3493#3494#0" expanded="true" />
</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="128">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="121" column="57" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/FlowChange.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#604#605#0" expanded="true" />
<element signature="e#629#630#0" expanded="true" />
<element signature="e#732#733#0" expanded="true" />
<element signature="e#771#772#0" expanded="true" />
<element signature="e#1865#1866#0" expanded="true" />
<element signature="e#1900#1901#0" expanded="true" />
<element signature="e#1956#1957#0" expanded="true" />
<element signature="e#2004#2005#0" expanded="true" />
<element signature="e#2036#2037#0" expanded="true" />
<element signature="e#2064#2065#0" expanded="true" />
<element signature="e#2106#2107#0" expanded="true" />
<element signature="e#2140#2141#0" expanded="true" />
<element signature="e#2174#2175#0" expanded="true" />
<element signature="e#2204#2205#0" expanded="true" />
<element signature="e#2250#2251#0" expanded="true" />
<element signature="e#2288#2289#0" expanded="true" />
<element signature="e#2351#2352#0" expanded="true" />
<element signature="e#2379#2380#0" expanded="true" />
<element signature="e#2421#2422#0" expanded="true" />
<element signature="e#2455#2456#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
src/main/java/common/controller/ContractController.java
......@@ -40,17 +40,31 @@ public class ContractController {
private static final Logger logger = LoggerFactory.getLogger(ContractController.class);
private static final Map<String, String> CONTRACT_STATUS = new HashMap<String, String>() {{
put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
// put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
// put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
// put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
// put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
// put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
// put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
// put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
// put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
putdata(this,ContractStatusEnum.WAIT);
putdata(this,ContractStatusEnum.EXECUTING);
putdata(this,ContractStatusEnum.END);
putdata(this,ContractStatusEnum.CANCEL);
putdata(this,ContractStatusEnum.MONEY_BACK_ALL);
putdata(this,ContractStatusEnum.MONEY_BACK_PART);
putdata(this,ContractStatusEnum.MONEY_BACK_NONE);
putdata(this,ContractStatusEnum.DELETE);
}};
private static void putdata(Map map,ContractStatusEnum a){
map.put(a.getKey(),a.getValue());
}
@Autowired
private ContractService service;
......
src/main/java/common/repository/ContractRelationRepository.java
......@@ -4,6 +4,7 @@ import common.model.ContractRelation;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.math.BigInteger;
import java.util.List;
......@@ -12,8 +13,8 @@ import java.util.List;
*/
public interface ContractRelationRepository extends JpaRepository<ContractRelation, Long> {
@Query(value = "select relation_id id from contract_relation where main_contract = ?1 union all select main_contract id from contract_relation where relation_id = ?1",nativeQuery = true)
List<Long> findRelationIds(String contractId);
@Query(value = "select relation_id id from contract_relation where main_contract in ?1 union all select main_contract id from contract_relation where relation_id in ?1",nativeQuery = true)
List<BigInteger> findRelationIds(List contractId);
@Query(value = "select * from contract_relation where main_contract = ?1 and relation_id = ?2 and platform = ?3",nativeQuery = true)
ContractRelation findByRelationData(Long mainContract, Long relationId, String platform);
......
src/main/java/common/repository/ContractRepository.java
......@@ -60,10 +60,10 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
Contract findByCodePlatform(String contractCode, String platform);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform in ?3 and id in ?4 and status!='del' order by ds desc",nativeQuery=true)
List<Contract> findByDsRelation(String startDate, String endDate, List<String> platform, List<Long> contractIds);
List<Contract> findByDsRelation(String startDate, String endDate, List<String> platform, List<String> contractIds);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform in ?3 and create_account in ?4 and id in ?5 and status!='del' order by ds desc",nativeQuery=true)
List<Contract> findByDsAndRoileRelation(String startDate, String endDate, List<String> platform, List<Long> create_account, List<Long> contractIds);
List<Contract> findByDsAndRoileRelation(String startDate, String endDate, List<String> platform, List<Long> create_account, List<String> contractIds);
@Query(value = "select new map( c.id as id, c.contractCode as contractCode ) from Contract c where c.platform in ?1 and c.contractCode is not null and c.contractCode <> 'null' ")
......
src/main/java/common/service/IOpenApiService.java
package common.service;
import java.util.List;
/**
* description:
......
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -886,14 +886,16 @@ public class ContractServiceImpl implements ContractService {
}
}
List<Long> contractIds = null;
List<String> platforms = new ArrayList<>();
Map<String,String> idsDic = new HashMap<>();
platforms.add(platform);
if (!StringUtils.isEmpty(contractId)) {
//获取 关联合同列表
contractIds = contractRelationRepository.findRelationIds(contractId);
List<String> conIds = new ArrayList<>();
conIds.add(contractId);
this.getContractRelationIds(conIds,idsDic);
idsDic.remove(contractId);
if("fake".equals(platform)){
platforms.add("tkio");
}
......@@ -901,7 +903,7 @@ public class ContractServiceImpl implements ContractService {
List<Contract> contractList = new ArrayList<>();
List<String> ids = new ArrayList<>(idsDic.keySet());
if (loginAccount.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey()) || loginAccount.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey())) {
......@@ -917,8 +919,8 @@ public class ContractServiceImpl implements ContractService {
if(!StringUtils.isEmpty(contractId)){
//查看关联合同
if (contractIds != null && contractIds.size() > 0) {
contractList = contractRepository.findByDsAndRoileRelation(startDate, endDate, platforms, idList, contractIds);
if (ids != null && ids.size() > 0) {
contractList = contractRepository.findByDsAndRoileRelation(startDate, endDate, platforms, idList, ids);
}
}else{
......@@ -930,8 +932,8 @@ public class ContractServiceImpl implements ContractService {
// contractList = contractRepository.findByDs(startDate, endDate, platform);
if(!StringUtils.isEmpty(contractId)){
if (contractIds != null && contractIds.size() > 0) {
contractList = contractRepository.findByDsRelation(startDate, endDate, platforms, contractIds);
if (ids != null && ids.size() > 0) {
contractList = contractRepository.findByDsRelation(startDate, endDate, platforms, ids);
}
}else{
contractList = contractRepository.findByDs(startDate, endDate, platform);
......@@ -968,44 +970,31 @@ public class ContractServiceImpl implements ContractService {
return result;
}
// @Override
// 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;
// if (!loginAccount.getRole().equals(RoleEnum.MANAGER.getKey())) {
// //非 管理员
// List<User> userList = userService.findAllSons(loginAccount.getId());
// List<Long> idList = new ArrayList<>();
// idList.add(loginAccount.getId());
// for (User u : userList) {
// 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);
// }
//
// } else {
//
// if (contractIds != null && contractIds.size() > 0) {
// contractList = contractRepository.findByDsRelation(startDate, endDate, platform, contractIds);
// } else {
// contractList = contractRepository.findByDs(startDate, endDate, platform);
// }
//
// }
//
// return contractList;
// }
private void getContractRelationIds (List<String> contractId,Map<String,String> idsDic){
//获取 关联合同 id
List<String> contractIds = new ArrayList<>();
List<BigInteger> ids = contractRelationRepository.findRelationIds(contractId);
if (ids != null && ids.size() > 0) {
for(BigInteger id : ids){
String idss = id.toString();
if (idsDic.get(idss) == null) {
contractIds.add(idss);
idsDic.put(idss,"0");
}
}
if(contractIds.size()>0){
//递归 查询 id 查询所有相关联的合同
this.getContractRelationIds(contractIds,idsDic);
}
}
}
@Override
public Contract contractStatusUpdate(String platform, String contractId, String status) {
......
src/main/java/common/task/ContractTask.java
package common.task;
import com.google.common.base.Splitter;
import common.model.AppCategory;
import common.model.AppInfo;
import common.model.Contract;
import common.repository.AppCategoryRepository;
import common.repository.AppInfoRepository;
import common.repository.CityRepository;
import common.repository.ContractRepository;
import dmp.model.OtPkgDevStats;
import dmp.repository.OtPkgDevStatsRepository;
import dmp.repository.TagCrawlerAppsWandoujiaRepository;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.anarres.lzo.LzoAlgorithm;
import org.anarres.lzo.LzoDecompressor;
import org.anarres.lzo.LzoInputStream;
import org.anarres.lzo.LzoLibrary;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import util.*;
import util.DateUtil;
import util.ValidateUtil;
import java.io.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Created by zxy on 2017/12/26.
......
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