审批摘出，链属修改，费用缴费

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -124,6 +124,8 @@ public class  FlowableController extends BaseController
             }else if("2".equals(type)){
                 //已生效
                 zcFinanceInf.setZfiStatus("02");
+                //签收时间
+                zcFinanceInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(zcFinanceInf);
             }
         }

sc-service/src/main/java/com/huyi/service/common/flowable/service/ApprovalService.java

@@ -3,16 +3,16 @@ package com.huyi.service.common.flowable.service;
 import java.util.Map;
 
 public interface ApprovalService {
+    //核心开立审批
+    public void coreApproval(Map map) throws Exception;
     //平台审批
     public void addPlatformApproval(Map map) throws Exception;
-
+    //核心企业确权
     public void coreConfirmationApproval(Map map) throws Exception;
-
     //融资企业签收审批
     public void addSignApproval(Map map) throws Exception;
     //融资审批
     public void addFinancingApproval(Map map) throws Exception;
-
     //融资企业补充资料审批
     public void addInformationApproval(Map map) throws Exception;
 }

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -41,6 +41,71 @@ public class ApprovalServiceImpl implements ApprovalService {
     private ISysUserService iSysUserService;
     @Autowired
     private ApprovalService approvalService;
+
+
+    /**
+     * 核心企业融信开立审批
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public void coreApproval(@RequestBody Map map) throws Exception {
+        Map<String, Object> flowParam = new HashMap<String, Object>();
+        //核心企业Id
+        String zfiCoreId = 	CommonUtil.objToString(map.get("zfiCoreId"));
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysCompany::getScyId,zfiCoreId);
+        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
+        //根据企业id获取用户id
+        LambdaQueryWrapper<SysUserCompanyRel> userQuery = new LambdaQueryWrapper<>();
+        userQuery.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+        //是否经办人
+        userQuery.eq(SysUserCompanyRel::getSucrHandler,"1");
+        List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQuery);
+        //获取userId
+        String userId = String.valueOf(userList.get(0).getSucrUserId());
+        //获取userName
+        SysUser sysUser = iSysUserService.getById(userId);
+        String userName = sysUser.getNickName();
+        //查询当前操作员
+        flowParam.put("menuId", "1000000000");
+        flowParam.put("companyId", zfiCoreId);
+        //双主键
+        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfiId")));
+        //员工编号
+        flowParam.put("sessionUserId", userId);
+            flowParam.put("name",userName + "在" + DateUtils.getDate() + "发起融信开立审批");
+        JSONObject jsonObj = new JSONObject(map);
+        flowParam.put("paras", jsonObj.toString());
+        Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        if("200".equals(resMap.get("code"))){
+            ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
+            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceInf.setZfiCoreStatus("00");
+            zcFinanceInfService.updateById(zcFinanceInf);
+        }else
+            //未开启流程实例
+            if("300".equals(resMap.get("code")) || "350".equals(resMap.get("code"))){
+                //修改状态为通过
+                ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
+                //融信Id
+                zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+                //核心企业融资状态(审批通过)
+                zcFinanceInf.setZfiCoreStatus("01");
+                //审核通过(待签收)
+                zcFinanceInf.setZfiStatus("01");
+                zcFinanceInf.setUpdateBy(userId);
+                zcFinanceInf.setUpdateTime(DateUtils.getNowDate());
+                zcFinanceInfService.updateById(zcFinanceInf);
+            }else if ("450".equals(resMap.get("code"))) {
+                throw new Exception("未配置审批流程");
+            }else if (!"200".equals(resMap.get("code"))) {
+                throw new Exception(resMap.get("message").toString());
+            }
+    }
+
+
     /**
      * 平台审批
      * @param map
@@ -145,7 +210,10 @@ public class ApprovalServiceImpl implements ApprovalService {
             if("0".equals(type)){
                 approvalService.addSignApproval(map);
             }else if("2".equals(type)){
+                //已生效
                 zcFinanceInf.setZfiStatus("02");
+                //签收时间
+                zcFinanceInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(zcFinanceInf);
             }
             //未配置审批流程

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

@@ -408,6 +408,35 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
         return R.ok();
     }
 
+
+    /**
+     * 缴费
+     * @param zciId
+     * @return
+     */
+    @PreAuthorize(hasPermi = "service:cost:changeZfiStatus")
+    @Log(title = "缴费", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeZfiStatus/{zciId}")
+    public R changezfiStatus(@PathVariable String zciId) throws Exception
+    {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String userId = String.valueOf(user.getSysUser().getUserId());
+        //修改信息
+        ZcChargeInf zcChargeInf = new ZcChargeInf();
+        //主键
+        zcChargeInf.setZciId(zciId);
+        //已缴费
+        zcChargeInf.setZciStatus("02");
+        //修改人
+        zcChargeInf.setUpdateBy(userId);
+        //修改时间
+        zcChargeInf.setUpdateTime(DateUtils.getNowDate());
+        //执行修改
+        iZcChargeInfService.updateById(zcChargeInf);
+        return R.ok();
+    }
+
     /**
      * 导出费用列表
      * @param response
@@ -461,58 +490,58 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
         }
 
         //处理字典数据
-//        List<SysDictData> state = RedisUtils.getDictCache("ser_zci_status");
-//        //状态遍历
-//        Map<String,String> zciStatusMap = new HashMap();
-//        for (Object object : state) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zciStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zciStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//
-//        List<SysDictData> invoiceStatus = RedisUtils.getDictCache("ser_zci_invoice_status");
-//        //遍历方式
-//        Map<String,String> zciInvoiceStatusMap = new HashMap();
-//        for (Object object : invoiceStatus) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zciInvoiceStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zciInvoiceStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//
-//        List<SysDictData> zfr = RedisUtils.getDictCache("ser_zfr_status");
-//        //遍历方式
-//        Map<String,String> zfrStatusMap = new HashMap();
-//        for (Object object : zfr) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zfrStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zfrStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//        System.out.println("zciStatusMap====>"+zciStatusMap);
-//        System.out.println("zciInvoiceStatusMap====>"+zciInvoiceStatusMap);
-//        System.out.println("zfrStatusMap====>"+zfrStatusMap);
-//        for (Map maps : list) {
-//            //费用状态
-//            zciStatus = String.valueOf(maps.get("zciStatus"));
-//            maps.put("zciStatus", zciStatusMap.get(zciStatus));
-//            //费用发票状态
-//            zciInvoiceStatus = String.valueOf(maps.get("zciInvoiceStatus"));
-//            maps.put("zciInvoiceStatus", zciInvoiceStatusMap.get(zciInvoiceStatus));
-//            //融资状态
-//            zfrStatus = String.valueOf(maps.get("zfrStatus"));
-//            maps.put("zfrStatus", zfrStatusMap.get(zfrStatus));
-//        }
+        List<SysDictData> state = RedisUtils.getDictCache("ser_zci_status");
+        //状态遍历
+        Map<String,String> zciStatusMap = new HashMap();
+        for (Object object : state) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zciStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zciStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+
+        List<SysDictData> invoiceStatus = RedisUtils.getDictCache("ser_zci_invoice_status");
+        //遍历方式
+        Map<String,String> zciInvoiceStatusMap = new HashMap();
+        for (Object object : invoiceStatus) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zciInvoiceStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zciInvoiceStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+
+        List<SysDictData> zfr = RedisUtils.getDictCache("ser_zfr_status");
+        //遍历方式
+        Map<String,String> zfrStatusMap = new HashMap();
+        for (Object object : zfr) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zfrStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zfrStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+        System.out.println("zciStatusMap====>"+zciStatusMap);
+        System.out.println("zciInvoiceStatusMap====>"+zciInvoiceStatusMap);
+        System.out.println("zfrStatusMap====>"+zfrStatusMap);
+        for (Map maps : list) {
+            //费用状态
+            zciStatus = String.valueOf(maps.get("zciStatus"));
+            maps.put("zciStatus", zciStatusMap.get(zciStatus));
+            //费用发票状态
+            zciInvoiceStatus = String.valueOf(maps.get("zciInvoiceStatus"));
+            maps.put("zciInvoiceStatus", zciInvoiceStatusMap.get(zciInvoiceStatus));
+            //融资状态
+            zfrStatus = String.valueOf(maps.get("zfrStatus"));
+            maps.put("zfrStatus", zfrStatusMap.get(zfrStatus));
+        }
 
         String fileName = "费用信息";
         //查询表头
@@ -592,58 +621,58 @@ public R list(String zfrNumber, String zciStatus, String zciInvoiceStatus,
         List<Map> list = iOwnCostManageService.selectAdminInvoice(map);
 
         //处理字典数据
-//        List<SysDictData> state = RedisUtils.getDictCache("ser_zci_status");
-//        //状态遍历
-//        Map<String,String> zciStatusMap = new HashMap();
-//        for (Object object : state) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zciStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zciStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//
-//        List<SysDictData> invoiceStatus = RedisUtils.getDictCache("ser_zci_invoice_status");
-//        //遍历方式
-//        Map<String,String> zciInvoiceStatusMap = new HashMap();
-//        for (Object object : invoiceStatus) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zciInvoiceStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zciInvoiceStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//
-//        List<SysDictData> zfr = RedisUtils.getDictCache("ser_zfr_status");
-//        //遍历方式
-//        Map<String,String> zfrStatusMap = new HashMap();
-//        for (Object object : zfr) {
-//            if (object instanceof SysDictData) {
-//                SysDictData dictData = (SysDictData)object;
-//                zfrStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
-//            } else if (object instanceof JSONObject) {
-//                JSONObject dictData = (JSONObject)object;
-//                zfrStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
-//            }
-//        }
-//        System.out.println("zciStatusMap====>"+zciStatusMap);
-//        System.out.println("zciInvoiceStatusMap====>"+zciInvoiceStatusMap);
-//        System.out.println("zfrStatusMap====>"+zfrStatusMap);
-//        for (Map maps : list) {
-//            //费用状态
-//            zciStatus = String.valueOf(maps.get("zciStatus"));
-//            maps.put("zciStatus", zciStatusMap.get(zciStatus));
-//            //费用发票状态
-//            zciInvoiceStatus = String.valueOf(maps.get("zciInvoiceStatus"));
-//            maps.put("zciInvoiceStatus", zciInvoiceStatusMap.get(zciInvoiceStatus));
-//            //融资状态
-//            zfrStatus = String.valueOf(maps.get("zfrStatus"));
-//            maps.put("zfrStatus", zfrStatusMap.get(zfrStatus));
-//        }
+        List<SysDictData> state = RedisUtils.getDictCache("ser_zci_status");
+        //状态遍历
+        Map<String,String> zciStatusMap = new HashMap();
+        for (Object object : state) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zciStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zciStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+
+        List<SysDictData> invoiceStatus = RedisUtils.getDictCache("ser_zci_invoice_status");
+        //遍历方式
+        Map<String,String> zciInvoiceStatusMap = new HashMap();
+        for (Object object : invoiceStatus) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zciInvoiceStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zciInvoiceStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+
+        List<SysDictData> zfr = RedisUtils.getDictCache("ser_zfr_status");
+        //遍历方式
+        Map<String,String> zfrStatusMap = new HashMap();
+        for (Object object : zfr) {
+            if (object instanceof SysDictData) {
+                SysDictData dictData = (SysDictData)object;
+                zfrStatusMap.put(dictData.getDictValue(),dictData.getDictLabel());
+            } else if (object instanceof JSONObject) {
+                JSONObject dictData = (JSONObject)object;
+                zfrStatusMap.put(String.valueOf(dictData.get("dictValue")),String.valueOf(dictData.get("dictLabel")));
+            }
+        }
+        System.out.println("zciStatusMap====>"+zciStatusMap);
+        System.out.println("zciInvoiceStatusMap====>"+zciInvoiceStatusMap);
+        System.out.println("zfrStatusMap====>"+zfrStatusMap);
+        for (Map maps : list) {
+            //费用状态
+            zciStatus = String.valueOf(maps.get("zciStatus"));
+            maps.put("zciStatus", zciStatusMap.get(zciStatus));
+            //费用发票状态
+            zciInvoiceStatus = String.valueOf(maps.get("zciInvoiceStatus"));
+            maps.put("zciInvoiceStatus", zciInvoiceStatusMap.get(zciInvoiceStatus));
+            //融资状态
+            zfrStatus = String.valueOf(maps.get("zfrStatus"));
+            maps.put("zfrStatus", zfrStatusMap.get(zfrStatus));
+        }
 
         String fileName = "费用信息";
         //查询表头

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

@@ -336,7 +336,10 @@ public class CreditApproveController extends BaseController {
                 if("0".equals(type)){
                     approvalService.addSignApproval(map);
                 }else if("2".equals(type)){
+                    //已生效
                     zcFinanceInf.setZfiStatus("02");
+                    //签收时间
+                    zcFinanceInf.setZfiSignDate(DateUtils.getNowDate());
                     zcFinanceInfService.updateById(zcFinanceInf);
                 }
             //未配置审批流程

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

@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.SysCompany;
 import com.huyi.service.base.entity.SysCompanyRel;
 import com.huyi.service.base.entity.SysCompanySpare;
-import com.huyi.service.base.service.ISysCompanyRelService;
-import com.huyi.service.base.service.ISysCompanyService;
-import com.huyi.service.base.service.ISysCompanySpareService;
-import com.huyi.service.base.service.ISysConfigService;
+import com.huyi.service.base.entity.SysUserCompanyRel;
+import com.huyi.service.base.service.*;
 import com.huyi.service.rel.service.IOwnCompanyRelService;
 import com.huyi.service.util.IMessageUtilsService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
@@ -24,6 +22,8 @@ import com.tianhu.common.redis.common.RedisUtils;
 import com.tianhu.common.redis.domain.SysDictData;
 import com.tianhu.common.security.annotation.PreAuthorize;
 import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.RemoteCommonService;
+import com.tianhu.system.api.RemoteSystemService;
 import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,9 +31,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -48,6 +46,9 @@ import java.util.regex.Pattern;
 public class OwnCompanyRelController extends BaseController
 {
     @Autowired
+    private RemoteSystemService remoteSystemService;
+
+    @Autowired
     private IMessageUtilsService iMessageUtilsService;
 
     @Autowired
@@ -66,6 +67,9 @@ public class OwnCompanyRelController extends BaseController
     private ISysCompanySpareService iSysCompanySpareService;
 
     @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+
+    @Autowired
     private TokenService tokenService;
 
     /**
@@ -99,31 +103,51 @@ public class OwnCompanyRelController extends BaseController
      */
     @PreAuthorize(hasPermi = "service:rel:list")
     @GetMapping("/list")
-    public R list(String scyId, String scySocialCode, String companyName, String scrType, String scrStatus,QueryRequest request)
+    public R list(String scyId, String scySocialCode, String companyName,
+                  String scrType, String scrStatus, String scrContarct, QueryRequest request)
     {
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
         String companyId = user.getSysUser().getCompanyId();
         Map map = new HashMap();
         if(!SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }else
             if (CommonUtil.isEmpty(scyId)) {
                 map.put("companyId", companyId);
             }
-        }
-        if (CommonUtil.isNotEmpty(scyId)) {
-            map.put("companyId", scyId);
-        }
-        if(CommonUtil.isNotEmpty(companyName)) {
-            map.put("companyName", companyName);
-        }
-        if(CommonUtil.isNotEmpty(scySocialCode)) {
-            map.put("scySocialCode", scySocialCode);
-        }
-        if(CommonUtil.isNotEmpty(scrType)) {
-            map.put("scrType", scrType);
-        }
-        if(CommonUtil.isNotEmpty(scrStatus)) {
-            map.put("scrStatus", scrStatus);
+            if(CommonUtil.isNotEmpty(companyName)) {
+                map.put("companyName", companyName);
+            }
+            if(CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("scySocialCode", scySocialCode);
+            }
+            if(CommonUtil.isNotEmpty(scrType)) {
+                map.put("scrType", scrType);
+            }
+            if(CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("scrStatus", scrStatus);
+            }
+        }else if(SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }
+            if (CommonUtil.isNotEmpty(companyName)) {
+                map.put("name", companyName);
+            }
+            if (CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("code", scySocialCode);
+            }
+            if (CommonUtil.isNotEmpty(scrType)) {
+                map.put("type", scrType);
+            }
+            if (CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("status", scrStatus);
+            }
+            if(CommonUtil.isNotEmpty(scrContarct)){
+                map.put("scrContarct",scrContarct);
+            }
         }
         IPage<Map> list = iOwnCompanyRelService.selectCompanyRelList(request,map);
         return R.ok(list,companyId);
@@ -409,12 +433,20 @@ public class OwnCompanyRelController extends BaseController
             //创建时间
             sysCompanyRel.setCreateTime(DateUtils.getNowDate());
             iSysCompanyRelService.createSysCompanyRel(sysCompanyRel);
+            //查询链属企业绑定用户
+            LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+            List<SysUserCompanyRel> list = iSysUserCompanyRelService.findSysUserCompanyRels(lambdaQueryWrapper);
+            Long use = list.get(0).getSucrUserId();
+            List<Long> longs = Arrays.asList(use);
             //接收方为核心企业时，发送待办
             if(CONFIRM_STATE.equals(scyType)){
+                remoteSystemService.sendNotice(scyId, scrId,"","00","","01","0",longs);
                 //TODO  核心企业发送待办
             }
             //接收方为供应商时，发送消息
             if(REFUSE_STATE.equals(scyType)){
+                remoteSystemService.sendNotice(scyId, scrId,"","00","","01","0",longs);
                 //TODO  供应商发送消息推送
             }
         } else {
@@ -552,11 +584,49 @@ public class OwnCompanyRelController extends BaseController
     @Log(title = "所有企业列表", businessType = BusinessType.OTHER)
     @Transactional(rollbackFor = Exception.class)
     public R listAllCompany()throws Exception {
+        //结果集
+        List<Map> resultList = new ArrayList<>();
+        //链属企业list
+        List<Map> arrayList = new ArrayList();
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        //查询出已经链属的企业
+        LambdaQueryWrapper<SysCompanyRel> sysCompanyRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysCompanyRelLambdaQueryWrapper.eq(SysCompanyRel::getScrLaunchCompanyId,companyId).or().eq(SysCompanyRel::getScrReceiveCompanyId,companyId);
+        sysCompanyRelLambdaQueryWrapper.eq(SysCompanyRel::getScrStatus,"01");
+        List<SysCompanyRel> sysCompanyRelList = iSysCompanyRelService.findSysCompanyRels(sysCompanyRelLambdaQueryWrapper);
+        for (SysCompanyRel sysCompanyRel : sysCompanyRelList){
+            Map map = new HashMap();
+            String company = "";
+            if(companyId.equals(sysCompanyRel.getScrLaunchCompanyId())){
+                company = sysCompanyRel.getScrReceiveCompanyId();
+            }else if(companyId.equals(sysCompanyRel.getScrReceiveCompanyId())){
+                company = sysCompanyRel.getScrLaunchCompanyId();
+            }
+            map.put("companyId",company);
+            arrayList.add(map);
+        }
+        //查询正常状态下的企业
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
         queryWrapper.eq(SysCompany::getScyType, CONFIRM_STATE).or().eq(SysCompany::getScyType, REFUSE_STATE);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
-        return R.ok(list);
+        for (SysCompany sysCompany : list){
+            Map map = new HashMap();
+            //企业Id
+            map.put("scyId",sysCompany.getScyId());
+            //企业名称
+            map.put("scyName",sysCompany.getScyName());
+            //社会信用代码
+            map.put("scySocialCode",sysCompany.getScySocialCode());
+            for (Map arrayMap : arrayList){
+                if(!arrayMap.get("companyId").equals(sysCompany.getScyId())){
+                    resultList.add(map);
+                }
+            }
+        }
+        return R.ok(resultList);
     }
 
     /**

sc-service/src/main/resources/mapper/rel/OwnCompanyRelMapper.xml

@@ -29,9 +29,11 @@
         LEFT JOIN sys_company s ON r.scr_launch_company_id = s.scy_id
         LEFT JOIN sys_company p ON r.scr_receive_company_id = p.scy_id
         WHERE 1=1
+            AND r.scr_status != '99'
         <if test="paramMap.companyId != null and paramMap.companyId != '' ">
             AND (r.scr_launch_company_id = #{paramMap.companyId} OR r.scr_receive_company_id = #{paramMap.companyId})
         </if>
+--      用户用查询条件
         <if test="paramMap.companyName != null and paramMap.companyName != '' ">
             AND (s.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_receive_company_id = #{paramMap.companyId})
             OR (p.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_launch_company_id = #{paramMap.companyId})
@@ -51,7 +53,17 @@
         <if test="paramMap.scrStatus != null and paramMap.scrStatus != '' ">
             AND r.scr_status = #{paramMap.scrStatus}
         </if>
-        AND r.scr_status != '99'
+--      平台用查询
+        <if test="paramMap.name != null and paramMap.name != '' ">
+            AND (s.scy_name LIKE CONCAT('%', #{paramMap.name}, '%')
+            OR p.scy_name LIKE CONCAT('%', #{paramMap.name}, '%'))
+        </if>
+        <if test="paramMap.scrContarct != null and paramMap.scrContarct != '' ">
+            AND r.scr_contarct LIKE CONCAT('%', #{paramMap.scrContarct}, '%')
+        </if>
+        <if test="paramMap.status != null and paramMap.status != '' ">
+            AND r.scr_status = #{paramMap.status}
+        </if>
         ORDER BY r.create_time DESC
     </select>