Merge remote-tracking branch 'origin/main'

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSeletRatingPlugin.java

@@ -50,9 +50,20 @@ public class BondSeletRatingPlugin extends AbstractBasePlugIn {
     }
 
     private void showRatingSelectForm(String actionId) {
-        DynamicObject ratingAgency = (DynamicObject)this.getModel().getValue("ratingagency");
+        DynamicObject ratingAgency;
+        //shkd_ratingscale：主体评级 shkd_debtratingscale：债券评级
+        if("shkd_ratingscale".equals(actionId)){
+            ratingAgency = (DynamicObject)this.getModel().getValue("ratingagency");
+        }else{
+            ratingAgency = (DynamicObject)this.getModel().getValue("shkd_bondratingagency");
+        }
+
         if (EmptyUtil.isEmpty(ratingAgency)) {
-            this.getView().showTipNotification(ResManager.loadKDString("请先选择评级机构。", "BondCreditRatingEdit_0", "tmc-cfm-formplugin", new Object[0]));
+            if("shkd_ratingscale".equals(actionId)){
+                this.getView().showTipNotification(ResManager.loadKDString("请先选择主体评级机构。", "BondCreditRatingEdit_0", "tmc-cfm-formplugin", new Object[0]));
+            }else{
+                this.getView().showTipNotification(ResManager.loadKDString("请先选择债项评级机构。", "BondCreditRatingEdit_0", "tmc-cfm-formplugin", new Object[0]));
+            }
         } else {
             ListShowParameter showParameter = ShowFormHelper.createShowListForm("tbd_ratingscale", Boolean.FALSE);
             showParameter.setCustomParam("ismergerows", Boolean.FALSE);

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/LoancontractF7Plugin.java

@@ -45,6 +45,9 @@ public class LoancontractF7Plugin extends AbstractBillPlugIn implements Plugin,
         //监听评级机构F7数据选择
         BasedataEdit ratingagency = view.getControl("ratingagency");
         ratingagency.addBeforeF7SelectListener(this);
+        //监听债券评级机构F7数据选择
+        BasedataEdit bondratingagency = view.getControl("shkd_bondratingagency");
+        bondratingagency.addBeforeF7SelectListener(this);
 
     }
 
@@ -158,6 +161,36 @@ public class LoancontractF7Plugin extends AbstractBillPlugIn implements Plugin,
             DynamicObjectCollection winningbidderentry = intermediaryselect.getDynamicObjectCollection("winningbidderentry");
             ArrayList<String> dataFilterArr = new ArrayList<>();
             winningbidderentry.forEach((temp)->{
+                if("主体评级".equals( temp.getString("shkd_pglx1") ))
+                dataFilterArr.add(temp.getString("e_midorgname.number"));
+            });
+            //将set转换成数组
+            QFilter accountQFilter = new QFilter("number", QCP.in, dataFilterArr);
+            dataFilter.add(accountQFilter);
+        }
+        if("shkd_bondratingagency".equals(name)){
+            //注册额度
+            //债券发行：occupybondlimit   债券发行计划：shkd_occupybondlimit
+            try {
+                shkd_bondlimit= (DynamicObject)this.getModel().getValue("occupybondlimit");
+            }catch(Exception e){
+                shkd_bondlimit= (DynamicObject)this.getModel().getValue("shkd_occupybondlimit");
+            }
+            if(shkd_bondlimit == null){
+                evt.setCancel(true);
+                this.getView().showTipNotification("请先选择占用注册额度。");
+                return;
+            }
+            Long occupybondlimitId = (Long) shkd_bondlimit.getPkValue();
+            //找到注册额度中的招标遴选ID
+            DynamicObject intermediaryselectID = BusinessDataServiceHelper.loadSingle(occupybondlimitId,"bdim_bond_limit", "shkd_intermediaryselect");
+            QFilter qFilter = new QFilter("billno", QCP.equals, intermediaryselectID.getString("shkd_intermediaryselect"));
+            DynamicObject intermediaryselect = BusinessDataServiceHelper.loadSingle("bdim_intermediaryselect",qFilter.toArray());
+            //招标遴选 中标单位分录
+            DynamicObjectCollection winningbidderentry = intermediaryselect.getDynamicObjectCollection("winningbidderentry");
+            ArrayList<String> dataFilterArr = new ArrayList<>();
+            winningbidderentry.forEach((temp)->{
+                if("债项评级".equals( temp.getString("shkd_pglx1") ))
                 dataFilterArr.add(temp.getString("e_midorgname.number"));
             });
             //将set转换成数组