Commit 1db9dcb0 by kangxiaoshan

大后台

parent d837b831
...@@ -253,6 +253,14 @@ public class ContractController { ...@@ -253,6 +253,14 @@ public class ContractController {
return ResultModel.OK(service.findChange(startDate, endDate, code)); return ResultModel.OK(service.findChange(startDate, endDate, code));
} }
@RequestMapping(value = "find/flowchange", method = RequestMethod.GET)
@ResponseBody
public ResultModel flowchange(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @RequestParam String code) {
return ResultModel.OK(service.findflowChange(startDate, endDate, code));
}
@RequestMapping(value = "update/pay", method = RequestMethod.PUT) @RequestMapping(value = "update/pay", method = RequestMethod.PUT)
@ResponseBody @ResponseBody
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request, @PathVariable String platform) { public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request, @PathVariable String platform) {
......
...@@ -8,6 +8,6 @@ import java.util.List; ...@@ -8,6 +8,6 @@ import java.util.List;
public interface FlowChangeRepository extends JpaRepository<FlowChange, Long> { public interface FlowChangeRepository extends JpaRepository<FlowChange, Long> {
@Query(value = "",nativeQuery = true) @Query(value = "select * from flow_change where contract_code= 1? and add_date >=2? and add_date <= 3?",nativeQuery = true)
List<FlowChange> findByDs(String startDate, String endDate, String code); List<FlowChange> findByAddDate(String startDate, String endDate, String code);
} }
...@@ -60,4 +60,6 @@ public interface ContractService { ...@@ -60,4 +60,6 @@ public interface ContractService {
Contract contractStatusUpdate(String platform, String contractId, String status); Contract contractStatusUpdate(String platform, String contractId, String status);
Map contractCodeCheck(String platform, String contractCode); Map contractCodeCheck(String platform, String contractCode);
List<FlowChange> findflowChange(String startDate, String endDate, String code);
} }
\ No newline at end of file
...@@ -1142,14 +1142,15 @@ public class ContractServiceImpl implements ContractService { ...@@ -1142,14 +1142,15 @@ public class ContractServiceImpl implements ContractService {
} }
} }
List<FlowChange> flowChanges = flowChangeRepository.findByDs(startDate, endDate, code);
return result; return result;
} }
@Override @Override
public List<FlowChange> findflowChange(String startDate, String endDate, String code) {
return flowChangeRepository.findByAddDate(startDate, endDate, code);
}
@Override
public Contract updatePay(User loginUser, ContractMoney resource) { public Contract updatePay(User loginUser, ContractMoney resource) {
ContractMoney contractMoney = contractMoneyRepository.findOne(resource.getId()); ContractMoney contractMoney = contractMoneyRepository.findOne(resource.getId());
Contract contract = contractRepository.findByCode(resource.getContractCode()); Contract contract = contractRepository.findByCode(resource.getContractCode());
......
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