Merge remote-tracking branch 'origin/dev' into dev

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java

@@ -25,17 +25,11 @@ public class AssistbalanceAutoData {
         QFilter filteraccountTable = new QFilter("number", QCP.equals, "0003");
         DynamicObject accountTableLoad = BusinessDataServiceHelper.loadSingle("bd_accounttable", "id", new QFilter[]{filteraccountTable});
 
+        //查询核算组织
         QFilter number = new QFilter("fisaccounting", "=", "1");
         QFilter structure = new QFilter("structure.longnumber", QCP.like, "10000000!10006431%");
         QFilter isleaf = new QFilter("structure.isleaf", QCP.equals, true);
         DynamicObject[] load = BusinessDataServiceHelper.load("bos_org", "id,structure.longnumber,structure.view", new QFilter[]{number, structure,isleaf});
-
-        DynamicObject[] accountConf = BusinessDataServiceHelper.load("zcgj_conf_balanceaccount", "zcgj_account", new QFilter[]{});
-        Set<String> accountNumber = new HashSet<>();
-        for (DynamicObject dynamicObject : accountConf) {
-            accountNumber.add(dynamicObject.getDynamicObject("zcgj_account").getString("number"));
-        }
-
         List<Long> orgIds = new ArrayList<>();
         Map<String,DynamicObject> orgNumberMap = new HashMap<>();
         for (int i = 0; i < load.length; i++) {
@@ -45,20 +39,40 @@ public class AssistbalanceAutoData {
         }
 
 
+        //查询科目余额配置表
+        DynamicObject[] accountConf = BusinessDataServiceHelper.load("zcgj_conf_balanceaccount", "zcgj_account", new QFilter[]{});
+        Set<String> accountNumber = new HashSet<>();
+        for (DynamicObject dynamicObject : accountConf) {
+            accountNumber.add(dynamicObject.getDynamicObject("zcgj_account").getString("number"));
+        }
+
         //查询组织下对应的当前期间数据
         DynamicObject[] orgByCurperiod = BusinessDataServiceHelper.load("gl_accountbook",
                 "org,curperiod",
                 new QFilter[]{new QFilter("enable", QCP.equals, Boolean.TRUE).
                         and("status", QCP.equals, "C").and("org.id", QCP.in, orgIds)});
-            /*Map<Long, DynamicObject> orgByCurperiodMap =
-                    Arrays.stream(orgByCurperiod).collect(Collectors.toMap(
-                            i -> i.getLong("org.id"),
-                    i -> i));*/
         Map<Long, DynamicObject> orgByCurperiodMap = new HashMap<>();
         for (DynamicObject dynamicObject : orgByCurperiod) {
             orgByCurperiodMap.put(dynamicObject.getLong("org.id"), dynamicObject);
         }
 
+        //获取核算组织的项目
+
+        Map<String,DynamicObject> projectMap = new HashMap<>();
+        //ec_project
+        DynamicObject[] projects = BusinessDataServiceHelper.load("ec_project",
+                "fiaccountorg,zcgj_pm",
+                new QFilter[]{new QFilter("billstatus", QCP.equals, "C").
+                        and("fiaccountorg", QCP.in, orgIds)});
+        for (DynamicObject project : projects) {
+            DynamicObject fiaccountorg = project.getDynamicObject("fiaccountorg");
+            DynamicObject pm = project.getDynamicObject("zcgj_pm");
+            if(fiaccountorg!=null){
+                projectMap.put(fiaccountorg.getString("number"), pm);
+            }
+        }
+
+
         //清除数据
         //DeleteServiceHelper.delete("zcgj_rpt_assistbalance",new QFilter[]{});
         List<Object[]> sqlparams = new ArrayList<>();
@@ -128,6 +142,7 @@ public class AssistbalanceAutoData {
                     assistbalance.set("zcgj_account", record.getAccount());
                     assistbalance.set("zcgj_period",curperiod);
                     assistbalance.set("zcgj_isnew",true);
+                    assistbalance.set("zcgj_pm",projectMap.get(orgNumber));
                     Map<String, AccountRecord.AssGrpItem> assgrp = record.getAssgrp();
                     if (assgrp.containsKey("0001")) {
                         assistbalance.set("zcgj_customernumber",assgrp.get("0001").getNumber());

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java

@@ -7,12 +7,16 @@ import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.datamodel.events.BizDataEventArgs;
+import kd.bos.entity.datamodel.events.ChangeData;
+import kd.bos.entity.datamodel.events.PropertyChangedArgs;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.sdk.plugin.Plugin;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.EventObject;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * 资金计划申请插件
@@ -32,6 +36,51 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin
                 item.set("zcgj_setttype",type);
             }
             getView().updateView("zcgj_fin_approved_amount");
+
+            //设置期间
+            DynamicObject org = (DynamicObject) this.getModel().getValue("zcgj_org");
+            if(org!=null){
+                //查询组织下对应的当前期间数据
+                DynamicObject[] orgByCurperiod = BusinessDataServiceHelper.load("gl_accountbook",
+                        "org,curperiod",
+                        new QFilter[]{new QFilter("enable", QCP.equals, Boolean.TRUE).
+                                and("status", QCP.equals, "C").and("org.id", QCP.equals, org.getLong("id"))});
+                if(orgByCurperiod!=null && orgByCurperiod.length>0){
+                    this.getModel().setValue("zcgj_period",orgByCurperiod[0].getDynamicObject("curperiod"));
+                }
+
+            }
+
+
+
+        }
+    }
+
+    @Override
+    public void propertyChanged(PropertyChangedArgs e) {
+        super.propertyChanged(e);
+        String name = e.getProperty().getName();
+        ChangeData changeData = e.getChangeSet()[0];
+        if(name.equals("zcgj_setttype")){
+            String setttype = (String) changeData.getNewValue();
+            int rowIndex = changeData.getRowIndex();
+            DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_fin_approved_amount");
+            if(zcgjFinApprovedAmount!=null){
+                boolean isOk = true;
+                for (int i = 0; i < zcgjFinApprovedAmount.size(); i++) {
+                    if(rowIndex != i){
+                        String zcgjSetttype = zcgjFinApprovedAmount.get(i).getString("zcgj_setttype");
+                        if(zcgjSetttype!=null && zcgjSetttype.equals(setttype)){
+                            isOk = false;
+                        }
+                    }
+                }
+                if(!isOk){
+                    this.getView().showErrorNotification("财务部核定金额的结算方式不允许重复，请重新选择");
+                    zcgjFinApprovedAmount.get(rowIndex).set("zcgj_setttype",null);
+                    this.getView().updateView("zcgj_setttype",rowIndex);
+                }
+            }
         }
     }
 }