فهرست منبع

选择应收付账款时,融信失效的可以重新再选择

xuefy 3 سال پیش
والد
کامیت
5ab46c9c75
1فایلهای تغییر یافته به همراه32 افزوده شده و 14 حذف شده
  1. 32 14
      sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

+ 32 - 14
sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -867,15 +867,25 @@ public class OwnCreditController extends BaseController {
         //获取当前企业的编号
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
-        //查询融信已关联应付账款
-        LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
         Map<String,String> map = new HashMap<>();
-        if(relList.size() > 0){
-            //提取所有的
-            List<String>  billIdList = CommonUtil.getIdFromList(relList,"zfbrBillId");
-            map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
+        //查询非失效的融信
+        LambdaQueryWrapper<ZcFinanceInf> financeInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        financeInfLambdaQueryWrapper.ne(ZcFinanceInf::getZfiStatus,"03");
+        List<ZcFinanceInf>   financeInfsList = financeInfService.findZcFinanceInfs(financeInfLambdaQueryWrapper);
+        if(financeInfsList.size() > 0){
+            //提取融信编号
+            List<String> financeIdList = CommonUtil.getIdFromList(financeInfsList,"zfiId");
+            //查询融信已关联应付账款
+            LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(ZcFinanceBillRel::getZfbrFinanceId,financeIdList);
+            List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
+            if(relList.size() > 0){
+                List<String> billIdList = CommonUtil.getIdFromList(relList,"zfbrBillId");
+                map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
+            }
         }
+
+
         //获取公司编号
         String companyId = use.getCompanyId();
         map.put("zbiPayerId",companyId);
@@ -908,13 +918,21 @@ public class OwnCreditController extends BaseController {
         //获取公司编号
         String companyId = use.getCompanyId();
         Map<String,String> map = new HashMap<>();
-        //查询融信已关联应付账款
-        LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
-        if(relList.size() > 0){
-            //提取所有的
-            List<String>  billIdList = CommonUtil.getIdFromList(relList,"zfbrBillId");
-            map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
+        //查询非失效的融信
+        LambdaQueryWrapper<ZcFinanceInf> financeInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        financeInfLambdaQueryWrapper.ne(ZcFinanceInf::getZfiStatus,"03");
+        List<ZcFinanceInf>   financeInfsList = financeInfService.findZcFinanceInfs(financeInfLambdaQueryWrapper);
+        if(financeInfsList.size() > 0){
+            //提取融信编号
+            List<String> financeIdList = CommonUtil.getIdFromList(financeInfsList,"zfiId");
+            //查询融信已关联应付账款
+            LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(ZcFinanceBillRel::getZfbrFinanceId,financeIdList);
+            List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
+            if(relList.size() > 0){
+                List<String> billIdList = CommonUtil.getIdFromList(relList,"zfbrBillId");
+                map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
+            }
         }
         //接收方
         if(!CommonUtil.isEmpty(zfiSupplierId)){