From eaf0f3537945362dfb8e0d9cc751a7185cdad385 Mon Sep 17 00:00:00 2001 From: ggxl <194689125@qq.com> Date: Thu, 17 Apr 2025 16:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgender=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8BUG=E3=80=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=98=8E=E7=BB=86-=E9=BE=9A=E5=AE=87?= =?UTF-8?q?=E6=9D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fi/em/plugin/form/GetExpenseStandardPlugin.java | 3 +++ .../fi/em/plugin/form/TripPersonCohabitPlugin.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/zf47/jdgz1/fi/em/plugin/form/GetExpenseStandardPlugin.java b/src/main/java/zf47/jdgz1/fi/em/plugin/form/GetExpenseStandardPlugin.java index 86bf7ca..a6b32a8 100644 --- a/src/main/java/zf47/jdgz1/fi/em/plugin/form/GetExpenseStandardPlugin.java +++ b/src/main/java/zf47/jdgz1/fi/em/plugin/form/GetExpenseStandardPlugin.java @@ -158,6 +158,9 @@ public class GetExpenseStandardPlugin extends AbstractBillPlugIn implements Plug if (object1 == null && object2 == null) { num++; continue; + } else if (object1 == null && object2 == "") { + num++; + continue; } if (object1 != null && object1.equals(object2)) num++; diff --git a/src/main/java/zf47/jdgz1/fi/em/plugin/form/TripPersonCohabitPlugin.java b/src/main/java/zf47/jdgz1/fi/em/plugin/form/TripPersonCohabitPlugin.java index 6276c65..11e9212 100644 --- a/src/main/java/zf47/jdgz1/fi/em/plugin/form/TripPersonCohabitPlugin.java +++ b/src/main/java/zf47/jdgz1/fi/em/plugin/form/TripPersonCohabitPlugin.java @@ -9,6 +9,7 @@ import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.events.PropertyChangedArgs; import kd.bos.form.events.BeforeDoOperationEventArgs; import kd.bos.form.operate.FormOperate; +import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.fi.er.business.tripstd.context.StdPreCalContext; import kd.fi.er.business.tripstd.model.TripStandardDetail; import kd.fi.er.business.tripstd.service.imp.ErTripStdServiceImp; @@ -25,8 +26,8 @@ import java.util.*; public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugin { /* - * 差旅报销单-相同性别的用户执行同住逻辑，以其中最高报销级别获取住宿标准 - * */ + * 差旅报销单-相同性别的用户执行同住逻辑，以其中最高报销级别获取住宿标准 + * */ @Override public void propertyChanged(PropertyChangedArgs e) { @@ -113,6 +114,9 @@ public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugi for (int j = i + 1; j < travelers.size(); j++) { DynamicObject travelerJ = travelers.get(j).getDynamicObject("fbasedataid"); + travelerI = BusinessDataServiceHelper.loadSingle(travelerI.getPkValue(), "bos_user"); + travelerJ = BusinessDataServiceHelper.loadSingle(travelerJ.getPkValue(), "bos_user"); + String genderI = travelerI.getString("gender"); String genderJ = travelerJ.getString("gender"); if (!genderI.equals("0") && StringUtils.equals(genderI, genderJ)) { @@ -145,7 +149,7 @@ public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugi BigDecimal std = tripSTDAmount.setScale(2, RoundingMode.HALF_DOWN); if (std.equals(new BigDecimal(0).setScale(2, RoundingMode.HALF_DOWN))) { - stdDetail.append("未设置").append(std).append("，"); + stdDetail.append("未设置").append("，"); } else { stdDetail.append("￥").append(std).append("/天，"); } @@ -153,7 +157,7 @@ public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugi BigDecimal highStd = highSeasonTripSTDAmount.setScale(2, RoundingMode.HALF_DOWN); if (highStd.equals(new BigDecimal(0).setScale(2, RoundingMode.HALF_DOWN))) { - stdDetail.append("旺季未设置").append(highStd); + stdDetail.append("旺季未设置"); } else { stdDetail.append("旺季￥").append(highStd).append("/天"); }