diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/addDormantSettingEdit.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/addDormantSettingEdit.java index fd2497a..a7232d4 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/addDormantSettingEdit.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/addDormantSettingEdit.java @@ -126,7 +126,8 @@ public class addDormantSettingEdit extends AbstractFormPlugin { if ("null".equals(addcolumnarray[0])){ this.getModel().setValue("shkd_acctstyle_list", null); }else { - this.getModel().setValue("shkd_acctstyle_list", addcolumnarray[0]); + String resultString = "," + addcolumnarray[0].substring(1, addcolumnarray[0].length() - 1).replace(" ", "") + ","; + this.getModel().setValue("shkd_acctstyle_list", resultString); } if ("0".equals(addcolumnarray[1])){ diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/domain/NewDormantSaveService.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/domain/NewDormantSaveService.java index 3c4dff5..ad923bc 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/domain/NewDormantSaveService.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/domain/NewDormantSaveService.java @@ -14,6 +14,7 @@ import kd.tmc.fbp.common.constant.DBRouteConst; import kd.tmc.fbp.common.enums.RptDateRangeEnum; import kd.tmc.fbp.common.helper.TmcDataServiceHelper; +import java.util.Arrays; import java.util.Date; public class NewDormantSaveService extends AbstractTmcBizOppService { @@ -29,10 +30,17 @@ public class NewDormantSaveService extends AbstractTmcBizOppService { String shkd_acctstyle_listString; String shkd_acctstyle_list = dataEntity.getString("shkd_acctstyle_list");//账户类型 - if (shkd_acctstyle_list == null || shkd_acctstyle_list.isEmpty()) { + String[] array = new String[0]; + try { + array = shkd_acctstyle_list.split(","); + } catch (Exception e) { + shkd_acctstyle_listString="null"; + } + array = Arrays.stream(array).filter(s -> !s.isEmpty()).toArray(String[]::new); + if (array.length==0) { shkd_acctstyle_listString="null"; }else { - shkd_acctstyle_listString=shkd_acctstyle_list; + shkd_acctstyle_listString=Arrays.toString(array); } Long shkd_acctproperty_listLong;//账户用途 diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java index b9289bf..fd63ea9 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java @@ -1,37 +1,26 @@ package shkd.sys.sys.plugin.report; -import com.alibaba.fastjson.JSONObject; -import kd.bos.bill.BillShowParameter; -import kd.bos.bill.OperationStatus; import kd.bos.context.RequestContext; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.entity.LocaleString; -import kd.bos.entity.AppMetadataCache; -import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.events.PackageDataEvent; import kd.bos.entity.report.*; -import kd.bos.entity.report.queryds.ReportFilterField; -import kd.bos.entity.report.queryds.ReportFilterFieldConfig; -import kd.bos.filter.FilterColumn; -import kd.bos.form.ClientProperties; -import kd.bos.form.CloseCallBack; -import kd.bos.form.FormShowParameter; import kd.bos.form.ShowType; import kd.bos.form.control.events.BeforeItemClickEvent; import kd.bos.form.control.events.FilterContainerInitEvent; import kd.bos.form.events.HyperLinkClickEvent; import kd.bos.form.events.HyperLinkClickListener; -import kd.bos.form.plugin.AbstractFormPlugin; -import kd.bos.mvc.form.FormView; import kd.bos.mvc.report.ReportListModel; -import kd.bos.mvc.report.ReportView; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.permission.api.HasPermOrgResult; import kd.bos.report.ReportList; import kd.bos.report.ReportShowParameter; -import kd.bos.report.events.*; +import kd.bos.report.events.CellStyleRule; +import kd.bos.report.events.CreateColumnEvent; +import kd.bos.report.events.CreateFilterInfoEvent; +import kd.bos.report.events.SummaryEvent; import kd.bos.report.filter.ReportFilter; import kd.bos.report.plugin.AbstractReportFormPlugin; import kd.bos.servicehelper.BusinessDataServiceHelper; @@ -40,11 +29,11 @@ import kd.bos.servicehelper.org.OrgUnitServiceHelper; import kd.bos.servicehelper.org.OrgViewType; import kd.bos.servicehelper.permission.PermissionServiceHelper; import shkd.sys.sys.plugin.report.domain.FinanceVarietyEnum; -import java.util.stream.Collectors; + import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; public class FinanceReportFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener { @@ -178,7 +167,7 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement Object shkd_seldate = formShowParameter.getCustomParam("shkd_seldate"); Object shkd_selmoney = formShowParameter.getCustomParam("shkd_selmoney"); if (shkd_selorg != null) { - DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle((Long) shkd_selorg, "bos_org"); + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(shkd_selorg, "bos_org"); this.getView().getModel().setValue("shkd_selorg", dynamicObject); this.getView().getModel().setValue("shkd_seldate", shkd_seldate); this.getView().getModel().setValue("shkd_selmoney", shkd_selmoney); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordateFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordateFormPlugin.java index c0af974..0bffaa0 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordateFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordateFormPlugin.java @@ -16,7 +16,6 @@ import kd.bos.permission.api.HasPermOrgResult; import kd.bos.report.ReportList; import kd.bos.report.ReportShowParameter; import kd.bos.report.events.CreateColumnEvent; -import kd.bos.report.events.SummaryEvent; import kd.bos.report.filter.ReportFilter; import kd.bos.report.plugin.AbstractReportFormPlugin; import kd.bos.servicehelper.BusinessDataServiceHelper; @@ -27,11 +26,10 @@ import kd.bos.servicehelper.permission.PermissionServiceHelper; import shkd.sys.sys.plugin.report.domain.FinanceVarietyEnum; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; -public class FinanceReportfordateFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener { +public class FinanceReportfordateFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener { @Override public void hyperLinkClick(HyperLinkClickEvent hyperLinkClickEvent) { if ("shkd_org".equals(hyperLinkClickEvent.getFieldName())) { @@ -115,7 +113,7 @@ public class FinanceReportfordateFormPlugin extends AbstractReportFormPlugin im Object shkd_selenddate = formShowParameter.getCustomParam("shkd_selenddate"); Object shkd_selmoney = formShowParameter.getCustomParam("shkd_selmoney"); if (shkd_selorg != null) { - DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle((Long) shkd_selorg, "bos_org"); + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(shkd_selorg, "bos_org"); this.getView().getModel().setValue("shkd_selorg", dynamicObject); this.getView().getModel().setValue("shkd_selstartdate", shkd_selstartdate); this.getView().getModel().setValue("shkd_selenddate", shkd_selenddate); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/addDormantDataListPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/addDormantDataListPlugin.java index 082242c..4e287fd 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/addDormantDataListPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/addDormantDataListPlugin.java @@ -12,10 +12,7 @@ import kd.tmc.fbp.common.constant.DBRouteConst; import kd.tmc.fbp.common.enums.RptDateRangeEnum; import kd.tmc.fbp.common.util.DateUtils; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import java.util.*; public class addDormantDataListPlugin extends AbstractReportListDataPluginExt { @@ -28,7 +25,19 @@ public class addDormantDataListPlugin extends AbstractReportListDataPluginExt { String key = entry.getKey(); Object value = entry.getValue(); if (key.equals("shkd_acctstyle_list")&&value!=null){ - dataSet = dataSet.filter("acctstyle_list in ('"+value+"')"); + // 输入字符串 + String inputString = (String) value; + + // 去掉方括号，并按逗号分割字符串 + String[] elements = inputString.substring(1, inputString.length() - 1).split(", "); + + // 将分割后的元素加入到集合中 + List list = Arrays.asList(elements); + Map paramMap = new HashMap(); + paramMap.put("list", list); + + + dataSet = dataSet.filter("acctstyle_list in list",paramMap); continue; } if (key.equals("shkd_acctproperty_list")&&value!=null){