待办事项

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

@@ -927,6 +927,12 @@ public class  FlowableController extends BaseController
             userQueryWrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
             List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQueryWrapper);
             String userId= String.valueOf(userList.get(0).getSucrUserId());
+            //融信id查询融信创建(0:供应商申请, 1:核心企业开立, 2:供应商开立)
+            ZcFinanceInf inf = zcFinanceInfService.getById(id);
+            //融信编号
+            String zfiNumber = inf.getZfiNumber();
+            //融信创建(0:供应商申请, 1:核心企业开立, 2:供应商开立)
+            String zfiCreateType = inf.getZfiCreateType();
             //查询企业名称
             SysCompany sysCompany = sysCompanyService.getById(companyId);
             LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -949,8 +955,16 @@ public class  FlowableController extends BaseController
             notice.setStatus("1");
             sysNoticeService.update(notice,noticeLambdaQueryWrapper);
             //待办标题
-            String tittle = "融资企业签收由"+sysCompany.getScyName() +"发起的：融信编号为:"+ id+"的资料代签收";
-            remoteSystemService.sendNotice(companyId,id,tittle,"00",null,"03","0",userId,null, null, null);
+            if("0".equals(zfiCreateType)) {
+                String tittle = "融资企业签收由" + sysCompany.getScyName() + "发起的：融信编号为:" + zfiNumber + "的资料代签收";
+                remoteSystemService.sendNotice(companyId, id, tittle, "00", null, "03", "0", userId, null, "01", "/credit/applyCreditEdit/"+id);
+            }else if("1".equals(zfiCreateType)) {
+                String tittle = "融资企业签收由" + sysCompany.getScyName() + "发起的：融信编号为:" + zfiNumber + "的资料代签收";
+                remoteSystemService.sendNotice(companyId, id, tittle, "00", null, "03", "0", userId, null, "01", "/credit/creditUpdate/"+id);
+            }else if("2".equals(zfiCreateType)){
+                String tittle = "融资企业签收由" + sysCompany.getScyName() + "发起的：融信编号为:" + zfiNumber + "的资料代签收";
+                remoteSystemService.sendNotice(companyId, id, tittle, "00", null, "03", "0", userId, null, "01", "/credit/financeOpenUpdate/"+id);
+            }
             //TODO 给融资企业经办人签收待办
         }//融资审批
         else if("1000000006".equals(menuId)){

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

@@ -469,7 +469,7 @@ public class OwnCompanyRelController extends BaseController
             wrapper.ne(SysCompanyRel::getScrStatus,DELETE_STATE);
             List<SysCompanyRel> relList = iSysCompanyRelService.findSysCompanyRels(wrapper);
             if(relList.size() > 0){
-                throw new Exception("已经和此企业链属，不得重复链属");
+                throw new Exception("已经与此企业产生链属关系，不得重复新增");
             }
             //查询接收方企业类型
             SysCompany sysCompany = iSysCompanyService.getById(scyId);
@@ -810,7 +810,7 @@ public class OwnCompanyRelController extends BaseController
             SysNotice notice = new SysNotice();
             notice.setNoticeId(sysNotice.getNoticeId());
             notice.setStatus("1");
-            iSysNoticeService.updateById(sysNotice);
+            iSysNoticeService.updateById(notice);
         }
         if("02".equals(state)) {
             String title = launchCompany.getScyName() + "拒绝了您的链属邀请，请知晓";