|
@@ -47,15 +47,9 @@ public class BankUncleardepositController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private BankUncleardepositrfndController bankUncleardepositrfndController;
|
|
private BankUncleardepositrfndController bankUncleardepositrfndController;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private RemotePlanService remotePlanService;
|
|
|
|
-
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
-=======
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private Environment env;
|
|
private Environment env;
|
|
|
|
|
|
->>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
|
|
|
|
/**
|
|
/**
|
|
* 查询查询不明保证金明细列表
|
|
* 查询查询不明保证金明细列表
|
|
*/
|
|
*/
|
|
@@ -64,8 +58,7 @@ public class BankUncleardepositController extends BaseController {
|
|
public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
|
|
public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
|
|
startPage();
|
|
startPage();
|
|
List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
|
|
List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
|
|
-<<<<<<< HEAD
|
|
|
|
-=======
|
|
|
|
|
|
+
|
|
for(BankUncleardeposit item : list){
|
|
for(BankUncleardeposit item : list){
|
|
if(item.getRtnXferprccode() == null){
|
|
if(item.getRtnXferprccode() == null){
|
|
item.setStatus("未申请退款");
|
|
item.setStatus("未申请退款");
|
|
@@ -75,7 +68,6 @@ public class BankUncleardepositController extends BaseController {
|
|
item.setStatus("已申请");
|
|
item.setStatus("已申请");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
->>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
|
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|