GYJ
/
JDGZ_2025
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复gender标识不存在BUG、调整标准明细-龚宇杰

This commit is contained in:
ggxl 2025-04-17 16:41:08 +08:00
parent 839381b31a
commit eaf0f35379
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/zf47/jdgz1/fi/em/plugin/form/GetExpenseStandardPlugin.java
View File

@ -158,6 +158,9 @@ public class GetExpenseStandardPlugin extends AbstractBillPlugIn implements Plug
if (object1 == null && object2 == null) { if (object1 == null && object2 == null) {
num++; num++;
continue; continue;
} else if (object1 == null && object2 == "") {
num++;
continue;
} }
if (object1 != null && object1.equals(object2)) num++; if (object1 != null && object1.equals(object2)) num++;

12
src/main/java/zf47/jdgz1/fi/em/plugin/form/TripPersonCohabitPlugin.java
View File

@ -9,6 +9,7 @@ import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.events.PropertyChangedArgs; import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.events.BeforeDoOperationEventArgs; import kd.bos.form.events.BeforeDoOperationEventArgs;
import kd.bos.form.operate.FormOperate; 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.context.StdPreCalContext;
import kd.fi.er.business.tripstd.model.TripStandardDetail; import kd.fi.er.business.tripstd.model.TripStandardDetail;
import kd.fi.er.business.tripstd.service.imp.ErTripStdServiceImp; import kd.fi.er.business.tripstd.service.imp.ErTripStdServiceImp;
@ -25,8 +26,8 @@ import java.util.*;
public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugin { public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugin {
/* /*
* 差旅报销单-相同性别的用户执行同住逻辑，以其中最高报销级别获取住宿标准 * 差旅报销单-相同性别的用户执行同住逻辑，以其中最高报销级别获取住宿标准
* */ * */
@Override @Override
public void propertyChanged(PropertyChangedArgs e) { 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++) { for (int j = i + 1; j < travelers.size(); j++) {
DynamicObject travelerJ = travelers.get(j).getDynamicObject("fbasedataid"); 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 genderI = travelerI.getString("gender");
String genderJ = travelerJ.getString("gender"); String genderJ = travelerJ.getString("gender");
if (!genderI.equals("0") && StringUtils.equals(genderI, genderJ)) { 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); BigDecimal std = tripSTDAmount.setScale(2, RoundingMode.HALF_DOWN);
if (std.equals(new BigDecimal(0).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 { } else {
stdDetail.append("￥").append(std).append("/天，"); stdDetail.append("￥").append(std).append("/天，");
} }
@ -153,7 +157,7 @@ public class TripPersonCohabitPlugin extends AbstractBillPlugIn implements Plugi
BigDecimal highStd = highSeasonTripSTDAmount.setScale(2, RoundingMode.HALF_DOWN); BigDecimal highStd = highSeasonTripSTDAmount.setScale(2, RoundingMode.HALF_DOWN);
if (highStd.equals(new BigDecimal(0).setScale(2, RoundingMode.HALF_DOWN))) { if (highStd.equals(new BigDecimal(0).setScale(2, RoundingMode.HALF_DOWN))) {
stdDetail.append("旺季未设置").append(highStd); stdDetail.append("旺季未设置");
} else { } else {
stdDetail.append("旺季￥").append(highStd).append("/天"); stdDetail.append("旺季￥").append(highStd).append("/天");
} }