Merge remote-tracking branch 'origin/master'

src/main/java/fi/em/formPlugin/SalaryBankNumEditPlugin.java

@@ -42,7 +42,7 @@ public class SalaryBankNumEditPlugin extends AbstractFormPlugin {
                 qFilter.and("isdefault",QCP.equals,true);
                 //查询收款信息表
                 DynamicObject er_payeer=BusinessDataServiceHelper
-                        .loadSingle("er_payeer","id,payer,payeraccount");
+                        .loadSingle("er_payeer","id,payer,payeraccount",new QFilter[]{qFilter});
                 //存在数据则设值
                 if (er_payeer!=null) {
                     //设置银行账号

src/main/java/fi/em/formPlugin/SalaryDataSelectPlugin.java

@@ -0,0 +1,72 @@
+package fi.em.formPlugin;
+
+import kd.bos.dataentity.utils.StringUtils;
+import kd.bos.entity.operate.result.OperationResult;
+import kd.bos.form.CloseCallBack;
+import kd.bos.form.FormShowParameter;
+import kd.bos.form.ShowFormHelper;
+import kd.bos.form.ShowType;
+import kd.bos.form.control.Control;
+import kd.bos.form.events.AfterDoOperationEventArgs;
+import kd.bos.form.field.TextEdit;
+import kd.bos.form.operate.AbstractOperate;
+import kd.bos.form.plugin.AbstractFormPlugin;
+import kd.bos.list.ListShowParameter;
+
+import java.util.EventObject;
+
+/**
+ * @author cjz
+ * @date 2024/11/11 14:49
+ * @description:薪酬发放单弹窗选择计提单数据
+ */
+public class SalaryDataSelectPlugin extends AbstractFormPlugin {
+
+
+    public static String selectdata="selectdata";
+
+//    //点击按钮弹窗选择数据
+//    public void afterDoOperation(AfterDoOperationEventArgs arg) {
+//        super.afterDoOperation(arg);
+//        AbstractOperate op = (AbstractOperate)arg.getSource();
+//        OperationResult operationResult = arg.getOperationResult();
+//        String key = op.getOperateKey();
+//        if (selectdata.equals(key)) {
+//            ListShowParameter listShowParameter = new ListShowParameter();
+//            listShowParameter.setFormId("bos_list");
+//            listShowParameter.setBillFormId("nckd_salarydis");
+//            listShowParameter.getOpenStyle().setShowType(ShowType.Modal);
+//            this.getView().showForm(listShowParameter);
+//
+//        }
+//    }
+
+    @Override
+    public void registerListener(EventObject e) {
+        super.registerListener(e);
+        // 对选择计提单按钮添加点击监听
+        TextEdit textEdit = getControl("nckd_selectdata");
+        textEdit.addClickListener(this);
+    }
+
+
+
+    @Override
+    public void click(EventObject evt) {
+        Control control = (Control) evt.getSource();
+        String key = control.getKey();
+        //点击计提单数据库选择
+        if (StringUtils.equalsIgnoreCase("nckd_selectdata", key)) {
+            //薪酬计提数据
+            ListShowParameter parameter = ShowFormHelper.createShowListForm("nckd_salarydis", false);
+            getView().showForm(parameter);
+        }
+        super.click(evt);
+
+
+    }
+
+
+
+
+}

src/main/java/fi/em/formPlugin/SalaryFileUploadEditPlugin.java

@@ -433,7 +433,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                     this.getModel().setValue(nckd_pay.get(7),entrycostdept,rowIndex);
                 }
                 //金额类型字段赋值
-                for (int j=9;j<nckd_pay.size();j++) {
+                for (int j=8;j<nckd_pay.size();j++) {
                     Cell cell=rowList.get(i).getCell(j+1);
                     //空值则跳过
                     if (!Objects.equals(getCellValue(cell), "")) {