融资管理 授信管理 费用管理查询条件

sc-service/src/main/java/com/huyi/service/cost/controller/OwnCostManageController.java

@@ -103,6 +103,7 @@ public class OwnCostManageController extends BaseController
 @GetMapping("/list")
 public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
               String coreScyName, String supScyName, String zfrStatus,
+              String zciQuery,String zciValue,
               @RequestParam(required = false) Map dateRange,
               QueryRequest request)
 {
@@ -114,6 +115,14 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
     String userId = String.valueOf(user.getSysUser().getUserId());
     IPage<Map> list = null;
     Map map = new HashMap();
+    if ("00".equals(zciQuery)){
+        //融资编号
+        map.put("zfrNumber", zciValue);
+    }else if ("01".equals(zciQuery)){
+        map.put("coreScyName", zciValue);
+    }else if ("02".equals(zciQuery)){
+        map.put("supScyName", zciValue);
+    }
     //融资编号
     if(CommonUtil.isNotEmpty(zfrNumber)){
         map.put("zfrNumber", zfrNumber);

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -86,7 +86,11 @@ public class CreditLineController extends BaseController {
                   //授信类型(融资产品类型)
                   @RequestParam (required = false) String zfpType,
                   //融资产品
-                  @RequestParam (required = false) String zfpName,QueryRequest request) {
+                  @RequestParam (required = false) String zfpName,
+                  //类型
+                  @RequestParam (required = false) String zfpcrQuery,
+                  @RequestParam (required = false) String zfpcrValue,
+                  QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser user = userInfo.getSysUser();
@@ -100,17 +104,29 @@ public class CreditLineController extends BaseController {
         }
         //企业类型
         map.put("companyType",companyType);
-        //企业名称
-        map.put("rzScyName",rzScyName);
+
         //授信额度范围
-        if (CommonUtil.isNotEmpty(AmountA)) {
-            map.put("AmountA", CommonUtil.objToBigDecimal(AmountA));
-        }
-        if (CommonUtil.isNotEmpty(AmountB)) {
-            map.put("AmountB", CommonUtil.objToBigDecimal(AmountB));
+//        if (CommonUtil.isNotEmpty(AmountA)) {
+//            map.put("AmountA", CommonUtil.objToBigDecimal(AmountA));
+//        }
+//        if (CommonUtil.isNotEmpty(AmountB)) {
+//            map.put("AmountB", CommonUtil.objToBigDecimal(AmountB));
+//        }
+        //类型
+        if ("00".equals(zfpcrQuery)){
+            //资金方
+            map.put("rzScyName",zfpcrValue);
+        }else if ("01".equals(zfpcrQuery)){
+            //融资产品名称
+            map.put("zfpName",zfpcrValue);
+        }else if ("02".equals(zfpcrQuery)){
+            //企业名称
+            map.put("scyName",zfpcrValue);
         }
         //状态状态(00:有效 01:失效)
-        map.put("zfpcrStatus",zfpcrStatus);
+        if (!"02".equals(zfpcrStatus)) {
+            map.put("zfpcrStatus", zfpcrStatus);
+        }
         //开始日期区间
         map.put("startTimeA",startTime.get("startTime[0]"));
         map.put("startTimeB",startTime.get("startTime[1]"));
@@ -118,9 +134,10 @@ public class CreditLineController extends BaseController {
         map.put("endTimeA",endTime.get("endTime[0]"));
         map.put("endTimeB",endTime.get("endTime[1]"));
         //授信类型(融资产品类型)
-        map.put("zfpType",zfpType);
-        //融资产品类型
-        map.put("zfpName",zfpName);
+        if (!"2".equals(zfpType)) {
+            map.put("zfpType", zfpType);
+        }
+
         //供应商
         if ("02".equals(companyType)){
             IPage<Map> list = creditLineService.selectSupplierCreditList(map, request);

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -113,7 +113,7 @@ public class FinanceRecordController extends BaseController {
     public R list(@RequestParam (required = false) String zfrTypes,
                   @RequestParam (required = false) String zfrQuery,
                   @RequestParam (required = false) String zfrValue,
-                  @RequestParam (required = false) String zfrStatus,
+                  @RequestParam (required = false) String zfrQueryStatus,
                   @RequestParam (required = false) Map dataTime,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
@@ -128,7 +128,10 @@ public class FinanceRecordController extends BaseController {
         }
         //企业类型
         map.put("companyType",companyType);
-        map.put("zfrStatus",zfrStatus);
+        //融资状态
+        if (!"05".equals(zfrQueryStatus)) {
+            map.put("zfrStatus", zfrQueryStatus);
+        }
         //01:我签收的   02:我开立的
         if ("01".equals(zfrTypes)){
             map.put("zfiSupplierId",companyId);
@@ -142,18 +145,6 @@ public class FinanceRecordController extends BaseController {
             map.put("zfiNumner", zfrValue);
         }else if ("02".equals(zfrQuery)){
             map.put("zfrNumber", zfrValue);
-        }else if ("03".equals(zfrQuery)){
-            if ("融资中".equals(zfrValue)) {
-                map.put("zfrStatus", "00");
-            }else if ("已放款".equals(zfrValue)){
-                map.put("zfrStatus", "01");
-            }else if ("融资失败".equals(zfrValue)){
-                map.put("zfrStatus", "02");
-            }else if ("已结算".equals(zfrValue)){
-                map.put("zfrStatus", "03");
-            }else if ("合同待签署".equals(zfrValue)){
-                map.put("zfrStatus", "04");
-            }
         }else if("04".equals(zfrQuery)){
             map.put("supplierScyName", zfrValue);
         }

sc-service/src/main/resources/mapper/creditLine/CreditLineMapper.xml

@@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="paramMap.rzScyName != null  and paramMap.rzScyName != ''">
             and s.scy_name like concat('%', #{paramMap.rzScyName}, '%')
         </if>
+        <if test="paramMap.scyName != null  and paramMap.scyName != ''">
+            and c.scy_name like concat('%', #{paramMap.scyName}, '%')
+        </if>
         <if test="paramMap.AmountA != null  and paramMap.AmountA != '' or paramMap.AmountA ==0 ">
             and r.zfpcr_amount &gt;= #{paramMap.AmountA}
         </if>