融信往来账款优化

sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -171,6 +171,12 @@ public class OwnBillController extends BaseController {
             map.put("payerName",payer.getScyName());
             //收款方
             map.put("payeeName",payee.getScyName());
+            //付款方
+            map.put("payName",payer.getScyName());
+            //收款方
+            map.put("receiveName",payee.getScyName());
+            //承诺付款日
+            map.put("zbiPayDate",DateUtils.parseDateToStr("yyyy-MM-dd",zcBillInf.getZbiPayDate()));
         }
         return AjaxResult.success(map);
     }

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

@@ -1132,8 +1132,17 @@ public class OwnCreditController extends BaseController {
         stateList.add("06");
         stateList.add("07");
         stateList.add("08");
-        financeInfLambdaQueryWrapper.and(i->i.in(ZcFinanceInf::getZfiStatus,stateList).or().isNull(ZcFinanceInf::getZfiStatus)).and(j->j.ne(ZcFinanceInf::getZfiId,zfiId));
+        financeInfLambdaQueryWrapper.in(ZcFinanceInf::getZfiStatus,stateList).or().isNull(ZcFinanceInf::getZfiStatus);
         List<ZcFinanceInf> financeInfsList = financeInfService.findZcFinanceInfs(financeInfLambdaQueryWrapper);
+        if(CommonUtil.isNotEmpty(zfiId)){
+            LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(ZcFinanceBillRel::getZfbrFinanceId,zfiId);
+            List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
+            if(relList.size() > 0){
+                List<String> idList = CommonUtil.getIdFromList(relList,"zfbrBillId");
+                map.put("idList",CommonUtil.listToStr4InSql(idList));
+            }
+        }
         if(financeInfsList.size() > 0){
             //提取融信编号
             List<String> financeIdList = CommonUtil.getIdFromList(financeInfsList,"zfiId");
@@ -1202,8 +1211,17 @@ public class OwnCreditController extends BaseController {
         stateList.add("06");
         stateList.add("07");
         stateList.add("08");
-        financeInfLambdaQueryWrapper.and(i->i.in(ZcFinanceInf::getZfiStatus,stateList).or().isNull(ZcFinanceInf::getZfiStatus)).and(j->j.ne(ZcFinanceInf::getZfiId,zfiId));
+        financeInfLambdaQueryWrapper.in(ZcFinanceInf::getZfiStatus,stateList).or().isNull(ZcFinanceInf::getZfiStatus);
         List<ZcFinanceInf>   financeInfsList = financeInfService.findZcFinanceInfs(financeInfLambdaQueryWrapper);
+        if(CommonUtil.isNotEmpty(zfiId)){
+            LambdaQueryWrapper<ZcFinanceBillRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(ZcFinanceBillRel::getZfbrFinanceId,zfiId);
+            List<ZcFinanceBillRel>  relList =  financeBillRelService.findZcFinanceBillRels(lambdaQueryWrapper);
+            if(relList.size() > 0){
+                List<String> idList = CommonUtil.getIdFromList(relList,"zfbrBillId");
+                map.put("idList",CommonUtil.listToStr4InSql(idList));
+            }
+        }
         if(financeInfsList.size() > 0){
             //提取融信编号
             List<String> financeIdList = CommonUtil.getIdFromList(financeInfsList,"zfiId");

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -245,8 +245,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramMap.payIdList != null  and paramMap.payIdList != ''">
                 and b.zbi_id  IN (${paramMap.payIdList})
             </if>
-            <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
-                and b.zbi_id  NOT IN (${paramMap.billIdList})
+<!--            <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">-->
+<!--                and b.zbi_id  NOT IN (${paramMap.billIdList})-->
+<!--            </if>-->
+            <if test="paramMap.idList != null  and paramMap.idList != ''">
+                and b.zbi_id  IN (${paramMap.idList}) or  b.zbi_id  NOT IN (${paramMap.billIdList})
+            </if>
+            <if test="paramMap.idList == null  and paramMap.idList == ''">
+                <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
+                    and b.zbi_id  NOT IN (${paramMap.billIdList})
+                </if>
             </if>
             ORDER BY b.create_time DESC
 
@@ -287,8 +295,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramMap.payIdList != null  and paramMap.payIdList != ''">
                 and b.zbi_id  IN (${paramMap.payIdList})
             </if>
-            <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
-                and b.zbi_id  NOT IN (${paramMap.billIdList})
+<!--            <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">-->
+<!--                and b.zbi_id  NOT IN (${paramMap.billIdList})-->
+<!--            </if>-->
+            <if test="paramMap.idList != null  and paramMap.idList != ''">
+                and b.zbi_id  IN (${paramMap.idList}) or  b.zbi_id  NOT IN (${paramMap.billIdList})
+            </if>
+            <if test="paramMap.idList == null  or paramMap.idList == ''">
+                <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
+                    and b.zbi_id  NOT IN (${paramMap.billIdList})
+                </if>
             </if>
             ORDER BY b.create_time DESC