|
|
@ -120,6 +120,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
private BusSalesOrderFeign busSalesOrderFeign; |
|
|
|
@Autowired |
|
|
|
private LoanRepaymentScheduleService loanRepaymentScheduleService; |
|
|
|
|
|
|
|
public ResultBean<String> saveHistory(LoanRepaymentHistoryDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
LoanRepaymentHistory entity = new LoanRepaymentHistory(); |
|
|
@ -1735,7 +1736,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return new ArrayList<>(); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
//=======================
|
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { |
|
|
@ -1748,7 +1749,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen |
|
|
|
qw.like("a.dept", pagerQuery.getDept()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getReturnState())) { |
|
|
|
qw.eq("a.returnState", pagerQuery.getReturnState()); |
|
|
|
if (pagerQuery.getReturnState().equals("01")) { |
|
|
|
qw.eq("a.returnState", "未还"); |
|
|
|
} else if (pagerQuery.getReturnState().equals("02")) { |
|
|
|
qw.eq("a.returnState", "部分还款"); |
|
|
|
} else if (pagerQuery.getReturnState().equals("03")) { |
|
|
|
qw.eq("a.returnState", "已还款"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getStaffName())) { |
|
|
|
qw.like("a.staffName", pagerQuery.getStaffName()); |
|
|
|