Merge branch 'master' of http://111.75.220.136:10030/turborao/jyyy

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/DailyApplyBillEditPlugin.java

@@ -1,13 +1,17 @@
 package nckd.jimin.jyyy.fi.plugin.form;
 
 import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.datamodel.events.BizDataEventArgs;
 import kd.bos.entity.property.BasedataProp;
 import kd.bos.form.field.BasedataEdit;
 import kd.bos.form.field.events.BeforeF7SelectEvent;
 import kd.bos.form.field.events.BeforeF7SelectListener;
 import kd.bos.list.ListFilterParameter;
 import kd.bos.list.ListShowParameter;
+import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 
 import java.util.EventObject;
 import java.util.List;
@@ -19,6 +23,7 @@ import java.util.Map;
  * @date 2025/04/28
  */
 public class DailyApplyBillEditPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener {
+    @Override
     public void registerListener(EventObject e) {
         super.registerListener(e);
 
@@ -49,4 +54,26 @@ public class DailyApplyBillEditPlugin extends AbstractBillPlugIn implements Befo
 
         }
     }
-}
+
+    @Override
+    public void afterCreateNewData(EventObject e) {
+        super.afterCreateNewData(e);
+
+        Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
+        if(customParams.get("viewType") != null){
+            String[] typeStrings = customParams.get("viewType").toString().split(",");
+
+            QFilter qFilter = new QFilter("number", QCP.equals, typeStrings[0]);
+
+            DynamicObject viewTypeInfo = BusinessDataServiceHelper.loadSingle("nckd_payviewtype", qFilter.toArray());
+            if(viewTypeInfo != null){
+                this.getModel().setValue("nckd_payviewtype", viewTypeInfo);
+            }
+        }
+    }
+
+    @Override
+    public void createNewData(BizDataEventArgs e) {
+        super.createNewData(e);
+    }
+}

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/ExpenseItemFilterFormPlugin.java

@@ -1,13 +1,18 @@
 package nckd.jimin.jyyy.fi.plugin.form;
 
 import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.datamodel.events.BizDataEventArgs;
 import kd.bos.entity.property.BasedataProp;
 import kd.bos.form.field.BasedataEdit;
 import kd.bos.form.field.events.BeforeF7SelectEvent;
 import kd.bos.form.field.events.BeforeF7SelectListener;
 import kd.bos.list.ListFilterParameter;
 import kd.bos.list.ListShowParameter;
+import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
+
 import java.util.EventObject;
 import java.util.List;
 import java.util.Map;
@@ -52,4 +57,25 @@ public class ExpenseItemFilterFormPlugin extends AbstractBillPlugIn implements B
 
         }
     }
+
+    public void afterCreateNewData(EventObject e) {
+        super.afterCreateNewData(e);
+
+        Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
+        if(customParams.get("viewType") != null){
+            String[] typeStrings = customParams.get("viewType").toString().split(",");
+
+            QFilter qFilter = new QFilter("number", QCP.equals, typeStrings[0]);
+
+            DynamicObject viewTypeInfo = BusinessDataServiceHelper.loadSingle("nckd_payviewtype", qFilter.toArray());
+            if(viewTypeInfo != null){
+                this.getModel().setValue("nckd_payviewtype", viewTypeInfo);
+            }
+        }
+    }
+
+    @Override
+    public void createNewData(BizDataEventArgs e) {
+        super.createNewData(e);
+    }
 }

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/PayBigCategoryFormPlugin.java

@@ -72,6 +72,9 @@ public class PayBigCategoryFormPlugin extends AbstractFormPlugin {
                 parameter.setStatus(OperationStatus.ADDNEW);
 
                 if(mapFilter != null && mapFilter.containsKey(imageKey)) {
+                    String viewType = mapFilter.get(imageKey);
+                    parameter.setCustomParam("viewType", viewType);
+
                     QFilter viewTypeQFilter = getViewTypeQFilter(imageKey);
 
                     //费用大类过滤

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/PublicReimburseBillFormPlugin.java

@@ -1,13 +1,17 @@
 package nckd.jimin.jyyy.fi.plugin.form;
 
 import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.datamodel.events.BizDataEventArgs;
 import kd.bos.entity.property.BasedataProp;
 import kd.bos.form.field.BasedataEdit;
 import kd.bos.form.field.events.BeforeF7SelectEvent;
 import kd.bos.form.field.events.BeforeF7SelectListener;
 import kd.bos.list.ListFilterParameter;
 import kd.bos.list.ListShowParameter;
+import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 
 import java.util.EventObject;
 import java.util.List;
@@ -50,4 +54,26 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
 
         }
     }
+
+    @Override
+    public void afterCreateNewData(EventObject e) {
+        super.afterCreateNewData(e);
+
+        Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
+        if(customParams.get("viewType") != null){
+            String[] typeStrings = customParams.get("viewType").toString().split(",");
+
+            QFilter qFilter = new QFilter("number", QCP.equals, typeStrings[0]);
+
+            DynamicObject viewTypeInfo = BusinessDataServiceHelper.loadSingle("nckd_payviewtype", qFilter.toArray());
+            if(viewTypeInfo != null){
+                this.getModel().setValue("nckd_payviewtype", viewTypeInfo);
+            }
+        }
+    }
+
+    @Override
+    public void createNewData(BizDataEventArgs e) {
+        super.createNewData(e);
+    }
 }