Skip to content

M
manager
Commit 6dcdfbdc by manxiaoqiang
Options

合同

parent 700e54a9
Showing with 59 additions and 40 deletions
.idea/workspace.xml
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<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/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -54,11 +57,11 @@ ...@@ -54,11 +57,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421"> <state relative-caret-position="329">
<caret line="33" column="91" lean-forward="true" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="91" /> <caret line="29" column="77" lean-forward="true" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -67,18 +70,18 @@ ...@@ -67,18 +70,18 @@
<file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="137">
<caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> <caret line="29" column="78" lean-forward="true" selection-start-line="29" selection-start-column="78" selection-end-line="29" selection-end-column="78" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> <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">
<state relative-caret-position="343"> <state relative-caret-position="-392">
<caret line="218" column="119" lean-forward="false" selection-start-line="218" selection-start-column="119" selection-end-line="218" selection-end-column="119" /> <caret line="169" column="83" lean-forward="true" selection-start-line="169" selection-start-column="66" selection-end-line="169" selection-end-column="83" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -87,8 +90,8 @@ ...@@ -87,8 +90,8 @@
<file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322"> <state relative-caret-position="183">
<caret line="24" column="23" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="23" /> <caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -178,7 +181,6 @@ ...@@ -178,7 +181,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" />
...@@ -193,9 +195,10 @@ ...@@ -193,9 +195,10 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.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/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -960,14 +963,7 @@ ...@@ -960,14 +963,7 @@
<workItem from="1516155511499" duration="43292000" /> <workItem from="1516155511499" duration="43292000" />
<workItem from="1516327450910" duration="12490000" /> <workItem from="1516327450910" duration="12490000" />
<workItem from="1516586760731" duration="18149000" /> <workItem from="1516586760731" duration="18149000" />
<workItem from="1516670938448" duration="3341000" /> <workItem from="1516670938448" duration="3930000" />
</task>
<task id="LOCAL-00005" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<created>1514871353137</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1514871353137</updated>
</task> </task>
<task id="LOCAL-00006" summary="test pom"> <task id="LOCAL-00006" summary="test pom">
<created>1514873570341</created> <created>1514873570341</created>
...@@ -1305,11 +1301,18 @@ ...@@ -1305,11 +1301,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1516674172587</updated> <updated>1516674172587</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="合同">
<created>1516675424478</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1516675424479</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="248050000" /> <option name="totallyTimeSpent" value="248639000" />
</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" />
...@@ -1703,6 +1706,15 @@ ...@@ -1703,6 +1706,15 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389"> <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" /> <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="true" />
<element signature="e#3001#3002#0" expanded="true" />
<element signature="e#3049#3050#0" expanded="true" />
<element signature="e#3089#3090#0" expanded="true" />
<element signature="e#3157#3158#0" expanded="true" />
<element signature="e#3207#3208#0" expanded="true" />
<element signature="e#3249#3250#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1710,6 +1722,7 @@ ...@@ -1710,6 +1722,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="253">
<caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" /> <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1717,6 +1730,11 @@ ...@@ -1717,6 +1730,11 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412"> <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" /> <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="true" />
<element signature="e#2686#2687#0" expanded="true" />
<element signature="e#2726#2727#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1868,32 +1886,32 @@ ...@@ -1868,32 +1886,32 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322"> <state relative-caret-position="183">
<caret line="24" column="23" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="23" /> <caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.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">
<state relative-caret-position="183"> <state relative-caret-position="-392">
<caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> <caret line="169" column="83" lean-forward="true" selection-start-line="169" selection-start-column="66" selection-end-line="169" selection-end-column="83" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421"> <state relative-caret-position="137">
<caret line="33" column="91" lean-forward="true" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="91" /> <caret line="29" column="78" lean-forward="true" selection-start-line="29" selection-start-column="78" selection-end-line="29" selection-end-column="78" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343"> <state relative-caret-position="329">
<caret line="218" column="119" lean-forward="false" selection-start-line="218" selection-start-column="119" selection-end-line="218" selection-end-column="119" /> <caret line="29" column="77" lean-forward="true" selection-start-line="29" selection-start-column="77" selection-end-line="29" selection-end-column="77" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/controller/ContractController.java
...@@ -25,8 +25,9 @@ public class ContractController { ...@@ -25,8 +25,9 @@ public class ContractController {
@RequestMapping(value = "find", method = RequestMethod.GET) @RequestMapping(value = "find", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResultModel findAll(@CurrentAccount User loginAccount, @RequestParam String startDate, @RequestParam String endDate) { public ResultModel findAll(@CurrentAccount User loginAccount, @PathVariable String platform,
return ResultModel.OK(service.findAll(startDate, endDate)); @RequestParam String startDate, @RequestParam String endDate) {
return ResultModel.OK(service.findAll(startDate, endDate, platform));
} }
@RequestMapping(value = "findone", method = RequestMethod.GET) @RequestMapping(value = "findone", method = RequestMethod.GET)
......
src/main/java/common/repository/ContractRepository.java
...@@ -18,8 +18,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -18,8 +18,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select count(*) from contract where email = ?1",nativeQuery=true) @Query(value="select count(*) from contract where email = ?1",nativeQuery=true)
BigInteger countNumByEmail(String email); BigInteger countNumByEmail(String email);
@Query(value="select * from contract where ds >= ?1 and ds <= ?2 order by ds desc",nativeQuery=true) @Query(value="select * from contract where ds >= ?1 and ds <= ?2 and platfrom = ?3 order by ds desc",nativeQuery=true)
List<Contract> findByDs(String startDate, String endDate); List<Contract> findByDs(String startDate, String endDate, String platfrom);
@Query(value="select * from contract where contract_code = ?1",nativeQuery=true) @Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
Contract findByCode(String contract_code); Contract findByCode(String contract_code);
......
src/main/java/common/service/ContractService.java
...@@ -27,7 +27,7 @@ public interface ContractService { ...@@ -27,7 +27,7 @@ public interface ContractService {
Contract update(User loginUser, Contract resource); Contract update(User loginUser, Contract resource);
List<Contract> findAll(String startDate, String endDate); List<Contract> findAll(String startDate, String endDate, String platfrom);
Contract findOne(String code); Contract findOne(String code);
......
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -167,7 +167,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -167,7 +167,7 @@ public class ContractServiceImpl implements ContractService{
} }
@Override @Override
public List<Contract> findAll(String startDate, String endDate) { public List<Contract> findAll(String startDate, String endDate, String platfrom) {
List<Contract> result = new ArrayList<>(); List<Contract> result = new ArrayList<>();
List<User> sales = userRepository.findAll(); List<User> sales = userRepository.findAll();
Map<Long, String> saleMap = new HashMap<>(); Map<Long, String> saleMap = new HashMap<>();
...@@ -183,7 +183,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -183,7 +183,7 @@ public class ContractServiceImpl implements ContractService{
typeMap.put(s.getId(), s.getPackageName()); typeMap.put(s.getId(), s.getPackageName());
} }
} }
List<Contract> contractList = contractRepository.findByDs(startDate, endDate); List<Contract> contractList = contractRepository.findByDs(startDate, endDate, platfrom);
if(ValidateUtil.isValid(contractList)){ if(ValidateUtil.isValid(contractList)){
for(Contract c : contractList){ for(Contract c : contractList){
c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : ""); c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : "");
......
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