Преглед изворни кода

预托书增加款号查询条件

yuansh пре 5 дана
родитељ
комит
c2e9228a8f

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -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());

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDeposit.java

@@ -247,6 +247,10 @@ public class SyLetterDeposit {
 	@TableField(exist = false)
 	private java.lang.String smallPo;
 
+	@ApiModelProperty(value = "款号")
+	@TableField(exist = false)
+	private java.lang.String itemNumber;
+
 	//打印使用的日期
 	@TableField(exist = false)
 	private String transDate;