链属查询优化

sc-service/src/main/java/com/huyi/service/rel/controller/OwnCompanyRelController.java

@@ -92,8 +92,6 @@ public class OwnCompanyRelController extends BaseController
 
     /**
      * 查询链属列表
-     * @param scySocialCode 社会统一信用代码
-     * @param companyName   企业名称
      * @param scrType       企业类型
      * @param scrStatus     链属状态
      * @param request
@@ -101,8 +99,8 @@ public class OwnCompanyRelController extends BaseController
      */
     @PreAuthorize(hasPermi = "service:rel:list")
     @GetMapping("/list")
-    public R list(String scyId, String scySocialCode, String companyName, String scpStatus,
-                      String scrType, String scrStatus, String scpContarct, QueryRequest request)
+    public R list(String scyId, String scpStatus, String scrType, String scrStatus,
+                  String scpContarct, String scrQuery, String scrValue, QueryRequest request)
     {
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
@@ -115,39 +113,62 @@ public class OwnCompanyRelController extends BaseController
             if (CommonUtil.isEmpty(scyId)) {
                 map.put("companyId", companyId);
             }
-            if(CommonUtil.isNotEmpty(companyName)) {
-                map.put("companyName", companyName);
-            }
-            if(CommonUtil.isNotEmpty(scySocialCode)) {
-                map.put("scySocialCode", scySocialCode);
+            if ("00".equals(scrQuery)) {
+                if(CommonUtil.isNotEmpty(scrValue)) {
+                    map.put("companyName", scrValue);
+                }
+            }else if("01".equals(scrQuery)){
+                if(CommonUtil.isNotEmpty(scrValue)) {
+                    map.put("scySocialCode", scrValue);
+                }
             }
             if (CommonUtil.isNotEmpty(scpStatus)) {
-                map.put("scpStatus", scpStatus);
+                if(!"02".equals(scpStatus)){
+                    map.put("scpStatus", scpStatus);
+                }
             }
             if(CommonUtil.isNotEmpty(scrType)) {
-                map.put("scrType", scrType);
+                if(!"02".equals(scrType)) {
+                    map.put("scrType", scrType);
+                }
             }
             if(CommonUtil.isNotEmpty(scrStatus)) {
-                map.put("scrStatus", scrStatus);
+                if(!"03".equals(scrStatus)) {
+                    map.put("scrStatus", scrStatus);
+                }
             }
         }else if(SalaryConstants.OPEX.equals(companyId)) {
             if (CommonUtil.isNotEmpty(scyId)) {
                 map.put("companyId", scyId);
+            }else {
+                map.put("companyId", companyId);
             }
-            if (CommonUtil.isNotEmpty(companyName)) {
-                map.put("name", companyName);
+            if ("00".equals(scrQuery)) {
+                if(CommonUtil.isNotEmpty(scrValue)) {
+                    map.put("companyName", scrValue);
+                }
+            }else if("01".equals(scrQuery)){
+                if(CommonUtil.isNotEmpty(scrValue)) {
+                    map.put("scySocialCode", scrValue);
+                }
             }
-            if (CommonUtil.isNotEmpty(scrStatus)) {
-                map.put("scrStatus", scrStatus);
+            if(CommonUtil.isNotEmpty(scrStatus)) {
+                if(!"03".equals(scrStatus)) {
+                    map.put("scrStatus", scrStatus);
+                }
             }
             if (CommonUtil.isNotEmpty(scpStatus)) {
-                map.put("scpStatus", scpStatus);
+                if(!"02".equals(scpStatus)){
+                    map.put("scpStatus", scpStatus);
+                }
             }
             if(CommonUtil.isNotEmpty(scpContarct)){
                 map.put("scpContarct",scpContarct);
             }
-            if(CommonUtil.isNotEmpty(scrType)){
-                map.put("scrType",scrType);
+            if(CommonUtil.isNotEmpty(scrType)) {
+                if(!"02".equals(scrType)) {
+                    map.put("scrType", scrType);
+                }
             }
         }
         IPage<Map> list = iOwnCompanyRelService.selectCompanyRelList(request,map);
@@ -155,7 +176,7 @@ public class OwnCompanyRelController extends BaseController
     }
 
     /**
-     * 平台查询我的链属列表
+     * 平台查询链属列表
      * @param companyName   企业名称
      * @param scrType       企业类型
      * @param scrStatus     链属状态
@@ -171,7 +192,6 @@ public class OwnCompanyRelController extends BaseController
         LoginUser user = tokenService.getLoginUser();
         String companyId = user.getSysUser().getCompanyId();
         Map map = new HashMap();
-                map.put("companyId", companyId);
             if (CommonUtil.isNotEmpty(companyName)) {
                 map.put("name", companyName);
             }
@@ -203,20 +223,23 @@ public class OwnCompanyRelController extends BaseController
     @Log(title = "查询链属未认证列表", businessType = BusinessType.OTHER)
     @Transactional(rollbackFor = Exception.class)
     @GetMapping("/notCertifiedList")
-    public R notCertifiedList(String scySocialCode, String companyName, String scrType, QueryRequest request)
+    public R notCertifiedList(String scrType, String scpQuery, String scpValue, QueryRequest request)
     {
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
         String companyId = user.getSysUser().getCompanyId();
         LambdaQueryWrapper<SysCompanySpare> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompanySpare::getScpCompanyId,companyId);
-        //社会统一信用代码
-        if(CommonUtil.isNotEmpty(scySocialCode)){
-            queryWrapper.like(SysCompanySpare::getScpSocialCode,scySocialCode);
-        }
         //企业名称
-        if(CommonUtil.isNotEmpty(companyName)){
-            queryWrapper.like(SysCompanySpare::getScpName,companyName);
+        if ("00".equals(scpQuery)) {
+            if(CommonUtil.isNotEmpty(scpValue)){
+                queryWrapper.like(SysCompanySpare::getScpName,scpValue);
+            }
+        }else if("01".equals(scpQuery)){
+            //社会统一信用代码
+            if(CommonUtil.isNotEmpty(scpValue)){
+                queryWrapper.like(SysCompanySpare::getScpSocialCode,scpValue);
+            }
         }
         //企业类型
         if(CommonUtil.isNotEmpty(scrType)){