费用管理查询修改

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

@@ -98,7 +98,8 @@ public class OwnCostManageController extends BaseController
 @PreAuthorize(hasPermi = "service:cost:list")
 @GetMapping("/list")
 public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
-              @RequestParam(required = false) Map dateRange,String zfrStatus,
+              String coreScyName, String supScyName, String zfrStatus,
+              @RequestParam(required = false) Map dateRange,
               QueryRequest request)
 {
     String beginTime = CommonUtil.objToString(dateRange.get("params[beginTime]"));
@@ -113,6 +114,14 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
     if(CommonUtil.isNotEmpty(zfrNumber)){
         map.put("zfrNumber", zfrNumber);
     }
+    //开立企业
+    if(CommonUtil.isNotEmpty(coreScyName)){
+        map.put("coreScyName", coreScyName);
+    }
+    //融资企业
+    if(CommonUtil.isNotEmpty(supScyName)){
+        map.put("supScyName", supScyName);
+    }
     //费用状态
     if(CommonUtil.isNotEmpty(zciStatus)) {
         map.put("zciStatus", zciStatus);
@@ -149,8 +158,9 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
     @PreAuthorize(hasPermi = "service:cost:list")
     @GetMapping("/listInvoice")
     public R listInvoice(String zfrNumber, String zciStatus, String zciInvoiceStatus,
-                  @RequestParam(required = false) Map dateInvoiceRange, String zfrStatus,
-                  QueryRequest request)
+                         String coreScyName, String supScyName, String zfrStatus,
+                         @RequestParam(required = false) Map dateInvoiceRange,
+                         QueryRequest request)
     {
         String beginInvoiceTime = CommonUtil.objToString(dateInvoiceRange.get("params[beginTime]"));
         String endInvoiceTime = CommonUtil.objToString(dateInvoiceRange.get("params[endTime]"));
@@ -161,6 +171,14 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
         if(CommonUtil.isNotEmpty(zfrNumber)){
             map.put("zfrNumber", zfrNumber);
         }
+        //开立企业
+        if(CommonUtil.isNotEmpty(coreScyName)){
+            map.put("coreScyName", coreScyName);
+        }
+        //融资企业
+        if(CommonUtil.isNotEmpty(supScyName)){
+            map.put("supScyName", supScyName);
+        }
         //费用状态
         if(CommonUtil.isNotEmpty(zciStatus)) {
             map.put("zciStatus", zciStatus);

sc-service/src/main/resources/mapper/cost/OwnCostManageMapper.xml

@@ -34,6 +34,12 @@
         <if test="paramMap.zfrNumber != null and paramMap.zfrNumber != '' ">
             AND zfr_number LIKE CONCAT('%', #{paramMap.zfrNumber}, '%')
         </if>
+        <if test="paramMap.supScyName != null and paramMap.supScyName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.supScyName}, '%')
+        </if>
+        <if test="paramMap.coreScyName != null and paramMap.coreScyName != '' ">
+            AND c.scy_name LIKE CONCAT('%', #{paramMap.coreScyName}, '%')
+        </if>
         <if test="paramMap.zciInvoiceStatus != null and paramMap.zciInvoiceStatus != '' ">
             AND z.zci_invoice_status = #{paramMap.zciInvoiceStatus}
         </if>
@@ -86,6 +92,14 @@
         LEFT JOIN sys_company s  ON s.scy_id = zfi_supplier_id
         WHERE 1=1
             AND z.zci_invoice_status != '1'
+            AND z.zci_status != '02'
+            AND zfr_status != '01'
+        <if test="paramMap.supScyName != null and paramMap.supScyName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.supScyName}, '%')
+        </if>
+        <if test="paramMap.coreScyName != null and paramMap.coreScyName != '' ">
+            AND c.scy_name LIKE CONCAT('%', #{paramMap.coreScyName}, '%')
+        </if>
         <if test="paramMap.zfrNumber != null and paramMap.zfrNumber != '' ">
             AND zfr_number LIKE CONCAT('%', #{paramMap.zfrNumber}, '%')
         </if>
@@ -140,6 +154,14 @@
         LEFT JOIN sys_company s  ON s.scy_id = zfi_supplier_id
         WHERE 1=1
             AND z.zci_invoice_status = '1'
+            AND z.zci_status = '02'
+            AND zfr_status = '01'
+        <if test="paramMap.supScyName != null and paramMap.supScyName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.supScyName}, '%')
+        </if>
+        <if test="paramMap.coreScyName != null and paramMap.coreScyName != '' ">
+            AND c.scy_name LIKE CONCAT('%', #{paramMap.coreScyName}, '%')
+        </if>
         <if test="paramMap.zfrNumber != null and paramMap.zfrNumber != '' ">
             AND zfr_number LIKE CONCAT('%', #{paramMap.zfrNumber}, '%')
         </if>