|
|
@@ -181,6 +181,16 @@ public class OwnBillController extends BaseController {
|
|
|
//账款名称
|
|
|
String zbiName = CommonUtil.objToString(map.get("zbiName"));
|
|
|
zcBillInf.setZbiName(zbiName);
|
|
|
+ //查询账款名称是否重复
|
|
|
+ LambdaQueryWrapper<ZcBillInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ //往来账款名称
|
|
|
+ lambdaQueryWrapper.eq(ZcBillInf::getZbiName,zbiName);
|
|
|
+ //企业id
|
|
|
+ lambdaQueryWrapper.and(i->i.eq(ZcBillInf::getZbiPayerId,companyId).or().eq(ZcBillInf::getZbiPayeeId,companyId));
|
|
|
+ List<ZcBillInf> list = iZcBillInfService.findZcBillInfs(lambdaQueryWrapper);
|
|
|
+ if(list.size() != 0){
|
|
|
+ return R.fail(500,"往来账款名称不能重复");
|
|
|
+ }
|
|
|
//应付方
|
|
|
String zbiPayerId = CommonUtil.objToString(map.get("zbiPayerId"));
|
|
|
zcBillInf.setZbiPayerId(zbiPayerId);
|
|
|
@@ -363,6 +373,18 @@ public class OwnBillController extends BaseController {
|
|
|
//账款名称
|
|
|
String zbiName = CommonUtil.objToString(map.get("zbiName"));
|
|
|
zcBillInf.setZbiName(zbiName);
|
|
|
+ //查询账款名称是否重复
|
|
|
+ LambdaQueryWrapper<ZcBillInf> lambdaQueryWrapperBill = new LambdaQueryWrapper<>();
|
|
|
+ //往来账款名称
|
|
|
+ lambdaQueryWrapperBill.eq(ZcBillInf::getZbiName,zbiName);
|
|
|
+ //企业id
|
|
|
+ lambdaQueryWrapperBill.and(i->i.eq(ZcBillInf::getZbiPayerId,companyId).or().eq(ZcBillInf::getZbiPayeeId,companyId));
|
|
|
+ //往来账款id
|
|
|
+ lambdaQueryWrapperBill.ne(ZcBillInf::getZbiId,zbiId);
|
|
|
+ List<ZcBillInf> list = iZcBillInfService.findZcBillInfs(lambdaQueryWrapperBill);
|
|
|
+ if(list.size() != 0){
|
|
|
+ return R.fail(500,"往来账款名称不能重复");
|
|
|
+ }
|
|
|
//应付方
|
|
|
String zbiPayerId = CommonUtil.objToString(map.get("zbiPayerId"));
|
|
|
zcBillInf.setZbiPayerId(zbiPayerId);
|