Skip to content

M
manager
Commit f677dde1 by manxiaoqiang
Options

adi

parent c9169a52
master … 0727_bugfix 1082_bugfix 1151_bugfix 1209_bugfix 1315_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 20180530_bpu 2578_bugfix 2580_fix 31762_2_bugfix 31762_bugfix 31969_bugfix 32400_fix 32599_bugfix 649_bugfix back_version back_version2 bigfix_20201028 bugfix_1608_new bugfix_1760 bugfix_master_1760 change_double contract_rela develper liushaowei manager_new master_mv mobvista_master month_flow
No related merge requests found
Showing with 62 additions and 51 deletions
.idea/workspace.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" afterPath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -32,16 +32,6 @@ ...@@ -32,16 +32,6 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -97,8 +87,8 @@ ...@@ -97,8 +87,8 @@
<file leaf-file-name="ADIAccountController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ADIAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="457"> <state relative-caret-position="321">
<caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" /> <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -107,29 +97,43 @@ ...@@ -107,29 +97,43 @@
<file leaf-file-name="ADIAccountService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ADIAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="183">
<caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" /> <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76"> <state relative-caret-position="242">
<caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" /> <caret line="279" column="17" lean-forward="false" selection-start-line="279" selection-start-column="17" selection-end-line="279" selection-end-column="17" />
<folding>
<element signature="e#6234#6235#0" expanded="true" />
<element signature="e#6301#6302#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ADISaleMapRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/office/repository/ADISaleMapRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="17" column="20" lean-forward="true" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="68" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ADIUser.java" pinned="false" current-in-tab="true"> <file leaf-file-name="ADIUser.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="242">
<caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" /> <caret line="33" column="30" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="30" />
<folding> <folding>
<element signature="e#1498#1499#0" expanded="true" />
<element signature="e#1526#1527#0" expanded="true" /> <element signature="e#1526#1527#0" expanded="true" />
<element signature="e#1569#1570#0" expanded="true" /> <element signature="e#1569#1570#0" expanded="true" />
<element signature="e#1603#1604#0" expanded="true" /> <element signature="e#1603#1604#0" expanded="true" />
...@@ -154,8 +158,6 @@ ...@@ -154,8 +158,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>reyun</find>
<find>\t</find>
<find>rebat</find> <find>rebat</find>
<find>contractChangeRepository</find> <find>contractChangeRepository</find>
<find>contractMoneyRepository</find> <find>contractMoneyRepository</find>
...@@ -184,6 +186,8 @@ ...@@ -184,6 +186,8 @@
<find>port</find> <find>port</find>
<find>http://localhost:8081</find> <find>http://localhost:8081</find>
<find>&quot;http://localhost:8081</find> <find>&quot;http://localhost:8081</find>
<find>closeFloat</find>
<find>bussinessMan</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -254,8 +258,8 @@ ...@@ -254,8 +258,8 @@
<option value="$PROJECT_DIR$/src/main/java/common/model/BPUContract.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/BPUContract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/BPUContractRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/BPUContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" /> <option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1049,13 +1053,6 @@ ...@@ -1049,13 +1053,6 @@
<workItem from="1526609390549" duration="37000" /> <workItem from="1526609390549" duration="37000" />
<workItem from="1528173363272" duration="91000" /> <workItem from="1528173363272" duration="91000" />
</task> </task>
<task id="LOCAL-00094" summary="客户表&#10;&#10;&#10;">
<created>1522059374814</created>
<option name="number" value="00094" />
<option name="presentableId" value="LOCAL-00094" />
<option name="project" value="LOCAL" />
<updated>1522059374814</updated>
</task>
<task id="LOCAL-00095" summary="客户表&#10;&#10;&#10;"> <task id="LOCAL-00095" summary="客户表&#10;&#10;&#10;">
<created>1522060257128</created> <created>1522060257128</created>
<option name="number" value="00095" /> <option name="number" value="00095" />
...@@ -1392,11 +1389,18 @@ ...@@ -1392,11 +1389,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1528275338074</updated> <updated>1528275338074</updated>
</task> </task>
<option name="localTasksCounter" value="143" /> <task id="LOCAL-00143" summary="adi">
<created>1528276207718</created>
<option name="number" value="00143" />
<option name="presentableId" value="LOCAL-00143" />
<option name="project" value="LOCAL" />
<updated>1528276207718</updated>
</task>
<option name="localTasksCounter" value="144" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="543062000" /> <option name="totallyTimeSpent" value="544879000" />
</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" />
...@@ -1554,13 +1558,6 @@ ...@@ -1554,13 +1558,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="54" column="27" lean-forward="true" selection-start-line="54" selection-start-column="27" selection-end-line="54" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="194">
...@@ -1909,35 +1906,36 @@ ...@@ -1909,35 +1906,36 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/office/repository/ADISaleMapRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="457"> <state relative-caret-position="345">
<caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" /> <caret line="17" column="20" lean-forward="true" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="68" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="321">
<caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" /> <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76"> <state relative-caret-position="183">
<caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" /> <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="242">
<caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" /> <caret line="33" column="30" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="30" />
<folding> <folding>
<element signature="e#1498#1499#0" expanded="true" />
<element signature="e#1526#1527#0" expanded="true" /> <element signature="e#1526#1527#0" expanded="true" />
<element signature="e#1569#1570#0" expanded="true" /> <element signature="e#1569#1570#0" expanded="true" />
<element signature="e#1603#1604#0" expanded="true" /> <element signature="e#1603#1604#0" expanded="true" />
...@@ -1949,6 +1947,17 @@ ...@@ -1949,6 +1947,17 @@
</state> </state>
</provider> </provider>
</entry> </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="242">
<caret line="279" column="17" lean-forward="false" selection-start-line="279" selection-start-column="17" selection-end-line="279" selection-end-column="17" />
<folding>
<element signature="e#6234#6235#0" expanded="true" />
<element signature="e#6301#6302#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
src/main/java/adi/service/impl/ADIAccountServiceImpl.java
...@@ -179,6 +179,7 @@ public class ADIAccountServiceImpl implements ADIAccountService { ...@@ -179,6 +179,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
System.out.println(object); System.out.println(object);
val = new ObjectMapper().readValue(object, ADIUser.class); val = new ObjectMapper().readValue(object, ADIUser.class);
System.out.println(val); System.out.println(val);
val.setPackageType("试用套餐");
if(dicContract.containsKey(val.getEmail())){ if(dicContract.containsKey(val.getEmail())){
Contract contract = dicContract.get(val.getEmail()); Contract contract = dicContract.get(val.getEmail());
String date = DateUtil.format(val.getExpriedTime(), "yyyy-MM-dd"); String date = DateUtil.format(val.getExpriedTime(), "yyyy-MM-dd");
...@@ -275,6 +276,7 @@ public class ADIAccountServiceImpl implements ADIAccountService { ...@@ -275,6 +276,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
} }
if (saleMap.containsKey(aw.getSaleEamil())) { if (saleMap.containsKey(aw.getSaleEamil())) {
aw.setSale(saleMap.get(aw.getSaleEamil())); aw.setSale(saleMap.get(aw.getSaleEamil()));
aw.setBussinessMan(saleMap.get(aw.getSaleEamil()) );
} }
aw.setStatus(statusMap.get(aw.getStatus())); aw.setStatus(statusMap.get(aw.getStatus()));
aw.setPastDate(null == aw.getExpriedTime() ? "" :DateUtil.getFormatDate(aw.getExpriedTime())); aw.setPastDate(null == aw.getExpriedTime() ? "" :DateUtil.getFormatDate(aw.getExpriedTime()));
......
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