Skip to content

M
manager
Commit a2922dc7 by manxiaoqiang
Options

合同

parent 880a5618
Showing with 88 additions and 81 deletions
.idea/workspace.xml
......@@ -2,23 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/DateUtil.java" afterPath="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -51,7 +36,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="ReminderLevel.java" pinned="false" current-in-tab="true">
<file leaf-file-name="ReminderLevel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-115">
......@@ -176,17 +161,19 @@
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="41" column="14" lean-forward="false" selection-start-line="41" selection-start-column="14" selection-end-line="41" selection-end-column="14" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
</folding>
<state relative-caret-position="198">
<caret line="197" column="60" lean-forward="false" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
......@@ -207,20 +194,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="ReportCallable.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3289">
<caret line="160" column="21" lean-forward="false" selection-start-line="160" selection-start-column="21" selection-end-line="160" selection-end-column="21" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1490#1491#0" expanded="false" />
<element signature="e#1510#1511#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -307,7 +280,6 @@
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
......@@ -325,6 +297,7 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
</list>
</option>
</component>
......@@ -1062,14 +1035,7 @@
<workItem from="1516670938448" duration="14117000" />
<workItem from="1516763565872" duration="4970000" />
<workItem from="1516843795236" duration="8291000" />
<workItem from="1516932422302" duration="3635000" />
</task>
<task id="LOCAL-00007" summary="test pom">
<created>1514873706283</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1514873706284</updated>
<workItem from="1516932422302" duration="4504000" />
</task>
<task id="LOCAL-00008" summary="test pom">
<created>1514874005111</created>
......@@ -1407,11 +1373,18 @@
<option name="project" value="LOCAL" />
<updated>1516676016551</updated>
</task>
<option name="localTasksCounter" value="56" />
<task id="LOCAL-00056" summary="合同">
<created>1516955508508</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1516955508509</updated>
</task>
<option name="localTasksCounter" value="57" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="275722000" />
<option name="totallyTimeSpent" value="276591000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1435,7 +1408,7 @@
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4304419" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4304419" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2980333" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
......@@ -1653,6 +1626,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="154" column="13" lean-forward="false" selection-start-line="154" selection-start-column="13" selection-end-line="154" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1660,6 +1636,15 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389">
<caret line="161" column="34" lean-forward="false" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
<folding>
<element signature="e#2970#2971#0" expanded="false" />
<element signature="e#3001#3002#0" expanded="false" />
<element signature="e#3049#3050#0" expanded="false" />
<element signature="e#3089#3090#0" expanded="false" />
<element signature="e#3157#3158#0" expanded="false" />
<element signature="e#3207#3208#0" expanded="false" />
<element signature="e#3249#3250#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1674,6 +1659,11 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="134" column="33" lean-forward="false" selection-start-line="134" selection-start-column="33" selection-end-line="134" selection-end-column="33" />
<folding>
<element signature="e#2638#2639#0" expanded="false" />
<element signature="e#2686#2687#0" expanded="false" />
<element signature="e#2726#2727#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1681,6 +1671,15 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="186" column="39" lean-forward="false" selection-start-line="186" selection-start-column="39" selection-end-line="186" selection-end-column="39" />
<folding>
<element signature="e#3758#3759#0" expanded="false" />
<element signature="e#3818#3819#0" expanded="false" />
<element signature="e#3870#3871#0" expanded="false" />
<element signature="e#3910#3911#0" expanded="false" />
<element signature="e#3945#3946#0" expanded="false" />
<element signature="e#4002#4003#0" expanded="false" />
<element signature="e#4050#4051#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1688,6 +1687,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="31" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
......@@ -1730,6 +1730,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552">
<caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1744,6 +1745,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="107" column="0" lean-forward="false" selection-start-line="107" selection-start-column="0" selection-end-line="139" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
......@@ -1759,6 +1761,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2034">
<caret line="1101" column="24" lean-forward="true" selection-start-line="1101" selection-start-column="24" selection-end-line="1101" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
......@@ -1797,20 +1800,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="15" column="39" lean-forward="false" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1380">
<caret line="124" column="5" lean-forward="true" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<folding>
<element signature="e#2163#2164#0" expanded="true" />
<element signature="e#2195#2196#0" expanded="true" />
<element signature="e#2245#2246#0" expanded="true" />
<element signature="e#2282#2283#0" expanded="true" />
<element signature="e#2318#2319#0" expanded="true" />
<element signature="e#2350#2351#0" expanded="true" />
<element signature="e#2400#2401#0" expanded="true" />
<element signature="e#2442#2443#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1818,6 +1821,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="55" column="12" lean-forward="false" selection-start-line="55" selection-start-column="12" selection-end-line="55" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1825,6 +1829,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="42" column="202" lean-forward="false" selection-start-line="42" selection-start-column="202" selection-end-line="42" selection-end-column="202" />
<folding />
</state>
</provider>
</entry>
......@@ -1846,6 +1851,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="62" column="49" lean-forward="true" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
......@@ -1865,6 +1871,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
......@@ -1882,22 +1889,6 @@
</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="621">
<caret line="41" column="14" lean-forward="false" selection-start-line="41" selection-start-column="14" selection-end-line="41" selection-end-column="14" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1822#1823#0" expanded="false" />
<element signature="e#1877#1878#0" expanded="false" />
<element signature="e#2381#2382#0" expanded="false" />
<element signature="e#2435#2436#0" expanded="false" />
<element signature="e#2718#2719#0" expanded="false" />
<element signature="e#2767#2768#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
......@@ -2025,6 +2016,22 @@
</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="198">
<caret line="197" column="60" lean-forward="false" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
<folding />
</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="152">
<caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/repository/ContractRepository.java
......@@ -18,7 +18,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select count(*) from contract where email = ?1",nativeQuery=true)
BigInteger countNumByEmail(String email);
@Query(value="select * from contract where ds >= ?1 and ds <= ?2 and platfrom = ?3 order by ds desc",nativeQuery=true)
@Query(value="select * from contract where ds >= ?1 and ds <= ?2 and platform = ?3 order by ds desc",nativeQuery=true)
List<Contract> findByDs(String startDate, String endDate, String platfrom);
@Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
......
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