Skip to content

M
manager
Commit b5c23375 by manxiaoqiang
Options

app排序

parent 8ec3b6b6
master … 0727_bugfix 1082_bugfix 1151_bugfix 1209_bugfix 1315_bugfix 1439_bugfix 1608_bugfix 1608_from_1619 1619_bugfix 1990_bugfix 20180328_sale 20180411 20180525_adi 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 feature_20180116_new liushaowei manager_new master_mv mobvista_master month_flow
No related merge requests found
Showing with 58 additions and 43 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<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$/src/main/java/tkio/service/impl/AccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -34,11 +34,11 @@
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="283">
<caret line="177" column="40" lean-forward="false" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" />
<state relative-caret-position="345">
<caret line="128" column="163" lean-forward="false" selection-start-line="128" selection-start-column="163" selection-end-line="128" selection-end-column="163" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -46,6 +46,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="OperateObjectTypeEnum.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
......@@ -76,10 +86,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="AccountServiceImpl.java" pinned="false" current-in-tab="true">
<file leaf-file-name="AccountServiceImpl.java" pinned="false" current-in-tab="false">
<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="125">
<state relative-caret-position="-46">
<caret line="31" column="36" lean-forward="false" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
<folding />
</state>
......@@ -189,10 +199,10 @@
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
</list>
</option>
</component>
......@@ -1309,14 +1319,7 @@
<workItem from="1517275427548" duration="11524000" />
<workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="11115000" />
<workItem from="1517533917524" duration="3440000" />
</task>
<task id="LOCAL-00036" summary="location">
<created>1515575778610</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1515575778610</updated>
<workItem from="1517533917524" duration="4619000" />
</task>
<task id="LOCAL-00037" summary="location">
<created>1515581776600</created>
......@@ -1654,14 +1657,21 @@
<option name="project" value="LOCAL" />
<updated>1517542092130</updated>
</task>
<option name="localTasksCounter" value="85" />
<task id="LOCAL-00085" summary="app排序">
<created>1517551485693</created>
<option name="number" value="00085" />
<option name="presentableId" value="LOCAL-00085" />
<option name="project" value="LOCAL" />
<updated>1517551485693</updated>
</task>
<option name="localTasksCounter" value="86" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="331602000" />
<option name="totallyTimeSpent" value="332781000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" 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="8" side_tool="false" content_ui="tabs" />
......@@ -1808,13 +1818,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountFlowRestrictService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="14" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="14" />
</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="366">
......@@ -2212,16 +2215,6 @@
</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="283">
<caret line="177" column="40" lean-forward="false" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="183">
......@@ -2248,12 +2241,30 @@
</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="125">
<state relative-caret-position="-46">
<caret line="31" column="36" lean-forward="false" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="128" column="163" lean-forward="false" selection-start-line="128" selection-start-column="163" selection-end-line="128" selection-end-column="163" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/common/controller/ContractController.java
......@@ -58,7 +58,7 @@ public class ContractController {
@RequestMapping(value = "export", method = RequestMethod.GET,produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@ResponseBody
public ResponseEntity<byte[]> export(@PathVariable String platform, @RequestParam String startDate
public ResponseEntity<byte[]> export(@CurrentAccount User loginAccount, @PathVariable String platform, @RequestParam String startDate
, @RequestParam String endDate, HttpServletRequest request, HttpServletResponse response) {
List<Contract> contractList = service.findAll(startDate, endDate, platform);
Map<String, String> map = new HashMap<>();
......@@ -89,13 +89,15 @@ public class ContractController {
response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM");
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出合同", startDate, endDate, request);
userlog.start();
//返回文件字符串
return new ResponseEntity<byte[]>(content, headers, HttpStatus.CREATED);
}
@RequestMapping(value = "pay/export", method = RequestMethod.GET,produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@ResponseBody
public ResponseEntity<byte[]> exportPay( @RequestParam String startDate, @RequestParam String endDate,
public ResponseEntity<byte[]> exportPay(@CurrentAccount User loginAccount, @RequestParam String startDate, @RequestParam String endDate,
HttpServletRequest request, HttpServletResponse response, @PathVariable String platform) {
List<ContractMoney> moneyList = service.findPayAll(startDate, endDate, platform);
Map<String, String> map = new HashMap<>();
......@@ -124,6 +126,8 @@ public class ContractController {
response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM");
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出收款开票", startDate, endDate, request);
userlog.start();
//返回文件字符串
return new ResponseEntity<byte[]>(content, headers, HttpStatus.CREATED);
}
......@@ -176,7 +180,7 @@ public class ContractController {
@ResponseBody
public ResultModel create(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
Contract contract1 = service.create(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "新建合同","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "新建合同","",contract1.toString(), request);
userlog.start();
ContractSendEmailThread email = new ContractSendEmailThread(contract);
......@@ -188,7 +192,7 @@ public class ContractController {
@ResponseBody
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
Contract contract1 = service.update(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改合同","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改合同","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
......@@ -197,7 +201,7 @@ public class ContractController {
@ResponseBody
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
ContractMoney contract1 = service.pay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "收款开票","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "收款开票","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
......@@ -206,7 +210,7 @@ public class ContractController {
@ResponseBody
public ResultModel change(@CurrentAccount User loginAccount, @RequestBody ContractChange contract, HttpServletRequest request) {
Contract contract1 = service.change(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改套餐","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改套餐","",contract1.toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
......@@ -229,7 +233,7 @@ public class ContractController {
@ResponseBody
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
Contract contract1 = service.updatePay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request);
userlog.start();
return ResultModel.OK(contract1);
}
......
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