|
|
@@ -123,6 +123,14 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
|
|
|
List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper1);
|
|
|
queryWrapper.eq("a.id",list.get(0).getSyLetterDepositId());
|
|
|
}
|
|
|
+ //款号
|
|
|
+ if(oConvertUtils.isNotEmpty(syLetterDeposit.getItemNumber())){
|
|
|
+
|
|
|
+ QueryWrapper<SyLetterDepositItem> queryWrapper1 = new QueryWrapper<SyLetterDepositItem>();
|
|
|
+ queryWrapper1.eq("Item_Number",syLetterDeposit.getItemNumber().trim()).eq("del_flag",0);;
|
|
|
+ List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper1);
|
|
|
+ queryWrapper.eq("a.id",list.get(0).getSyLetterDepositId());
|
|
|
+ }
|
|
|
//预托书号
|
|
|
if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo())){
|
|
|
queryWrapper.like("a.depositary_receipt_no",syLetterDeposit.getDepositaryReceiptNo().trim());
|