往来家居明细数据判断

This commit is contained in:
zhangzhiguo 2025-10-16 16:48:07 +08:00
parent 58825bcf40
commit 77c6f1a246
2 changed files with 106 additions and 95 deletions

View File

@ -91,15 +91,16 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
String message = String.format("提交人没有往来居家配置。"); String message = String.format("提交人没有往来居家配置。");
this.addFatalErrorMessage(extendedDataEntity, message); this.addFatalErrorMessage(extendedDataEntity, message);
} }
int monthTime = 0; Integer monthTime = null;
for (Row row : homeDataSet) { for (Row row : homeDataSet) {
monthTime = row.getInteger("monthTime"); monthTime = row.getInteger("monthTime");
} }
if(monthTime != 0){
DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");// DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");//
if(tripentry==null || tripentry.isEmpty()){ if(tripentry==null || tripentry.isEmpty()){
this.addFatalErrorMessage(extendedDataEntity, String.format("请录入往来居家明细!")); this.addFatalErrorMessage(extendedDataEntity, String.format("请录入往来居家明细!"));
} }
if(monthTime != null){
Map<String,Integer> homeentityCountMap = new HashMap<>(); Map<String,Integer> homeentityCountMap = new HashMap<>();
int i = 1; int i = 1;
boolean isOk=true; boolean isOk=true;
@ -167,6 +168,8 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
} }
} }
} }
}else {
this.addFatalErrorMessage(extendedDataEntity, String.format("往来家居配置有误!"));
} }
} }
} }

View File

@ -35,6 +35,7 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
e.getFieldKeys().add("zcgj_is_include_home"); e.getFieldKeys().add("zcgj_is_include_home");
e.getFieldKeys().add("applier"); e.getFieldKeys().add("applier");
e.getFieldKeys().add("zcgj_homeentity"); e.getFieldKeys().add("zcgj_homeentity");
e.getFieldKeys().add("costcompany");
} }
@Override @Override
@ -46,9 +47,9 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
//当前切换选择的组织 //当前切换选择的组织
Long currentOrgId = RequestContext.get().getOrgId(); Long currentOrgId = RequestContext.get().getOrgId();
//当前所在的组织是属于矿山下的 //当前所在的组织是属于矿山下的
if(OrgCheckUtils.isKS(currentOrgId)){ //if(OrgCheckUtils.isKS(currentOrgId)){
e.getValidators().add(new ValidatorExt()); e.getValidators().add(new ValidatorExt());
} // }
} }
class ValidatorExt extends AbstractValidator { class ValidatorExt extends AbstractValidator {
@ -63,13 +64,17 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
for (ExtendedDataEntity extendedDataEntity : extendedDataEntities) { for (ExtendedDataEntity extendedDataEntity : extendedDataEntities) {
DynamicObject dataEntity = extendedDataEntity.getDataEntity(); DynamicObject dataEntity = extendedDataEntity.getDataEntity();
long aLong = dataEntity.getLong("id"); long aLong = dataEntity.getLong("id");
DynamicObject companyObj = (DynamicObject) dataEntity.get("costcompany");//核算组织(费用承担公司)
if (companyObj != null) {
Long companyId = companyObj.getLong("id");
if (OrgCheckUtils.isKS(companyId)) {
//获取报销人 //获取报销人
DynamicObject applier = dataEntity.getDynamicObject("applier"); DynamicObject applier = dataEntity.getDynamicObject("applier");
long applierId = applier.getLong("id"); long applierId = applier.getLong("id");
//获取申请日期 //获取申请日期
//Date bizdate = dataEntity.getDate( "bizdate"); //Date bizdate = dataEntity.getDate( "bizdate");
//获取是否探亲 //获取是否探亲
//如果是探亲则进行逻辑判断 //如果是往来家居则进行逻辑判断
boolean isHome = dataEntity.getBoolean(prefix + "_is_include_home"); boolean isHome = dataEntity.getBoolean(prefix + "_is_include_home");
//判断是否来往家居地 //判断是否来往家居地
@ -88,19 +93,19 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
this.addFatalErrorMessage(extendedDataEntity, message); this.addFatalErrorMessage(extendedDataEntity, message);
} }
int monthTime = 0; Integer monthTime = null;
for (Row row : homeDataSet) { for (Row row : homeDataSet) {
monthTime = row.getInteger("monthTime"); monthTime = row.getInteger("monthTime");
} }
if(monthTime != 0){
DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");//oa流程分录 DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");//oa流程分录
boolean isOk=true;
Map<String,Integer> homeentityCountMap = new HashMap<>();
int i = 1;
if(tripentry==null || tripentry.isEmpty()){ if(tripentry==null || tripentry.isEmpty()){
this.addFatalErrorMessage(extendedDataEntity, String.format("请录入往来居家明细数据")); this.addFatalErrorMessage(extendedDataEntity, String.format("请录入往来居家明细数据"));
} }
if(monthTime != null){
boolean isOk=true;
Map<String,Integer> homeentityCountMap = new HashMap<>();
int i = 1;
for (DynamicObject dynamicObject : tripentry) { for (DynamicObject dynamicObject : tripentry) {
Date bxmonth = dynamicObject.getDate("zcgj_bxmonth"); Date bxmonth = dynamicObject.getDate("zcgj_bxmonth");
String yearMonth = dateFormat.format(bxmonth); String yearMonth = dateFormat.format(bxmonth);
@ -165,8 +170,11 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
} }
} }
} }
}else {
this.addFatalErrorMessage(extendedDataEntity, String.format("往来家居配置有误!"));
}
}
} }
} }
} }
} }