zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangzhiguo:2b447654ef05baf74d577c0aa5f2df13610c07d6
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:58825bcf40451d7cfd7c9c9890037a18a4106af4
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

No commits in common. "2b447654ef05baf74d577c0aa5f2df13610c07d6" and "58825bcf40451d7cfd7c9c9890037a18a4106af4" have entirely different histories.
2b447654ef ... 58825bcf40

6 changed files with 278 additions and 296 deletions
Show Stats Expand all files Collapse all files

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailInvoiceOverdueRemindersOp.java
View File

@ -49,9 +49,9 @@ public class DailInvoiceOverdueRemindersOp extends AbstractOperationServicePlugI
//当前切换选择的组织 //当前切换选择的组织
Long currentOrgId = RequestContext.get().getOrgId(); Long currentOrgId = RequestContext.get().getOrgId();
//当前所在的组织是属于矿山下的 //当前所在的组织是属于矿山下的
// if(OrgCheckUtils.isKS(currentOrgId)){ if(OrgCheckUtils.isKS(currentOrgId)){
e.getValidators().add(new DailInvoiceOverdueRemindersOp.ValidatorExt()); e.getValidators().add(new DailInvoiceOverdueRemindersOp.ValidatorExt());
// } }
} }
class ValidatorExt extends AbstractValidator { class ValidatorExt extends AbstractValidator {

7
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java
View File

@ -91,16 +91,15 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
String message = String.format("提交人没有往来居家配置。"); String message = String.format("提交人没有往来居家配置。");
this.addFatalErrorMessage(extendedDataEntity, message); this.addFatalErrorMessage(extendedDataEntity, message);
} }
Integer monthTime = null; int monthTime = 0;
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;
@ -168,8 +167,6 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
} }
} }
} }
}else {
this.addFatalErrorMessage(extendedDataEntity, String.format("往来家居配置有误！"));
} }
} }
} }

11
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java
View File

@ -40,7 +40,6 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn {
e.getFieldKeys().add("zcgj_holiday_days"); e.getFieldKeys().add("zcgj_holiday_days");
e.getFieldKeys().add("bizdate"); e.getFieldKeys().add("bizdate");
e.getFieldKeys().add("billstatus"); e.getFieldKeys().add("billstatus");
e.getFieldKeys().add("costcompany");
} }
@Override @Override
@ -52,9 +51,9 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn {
//当前切换选择的组织 //当前切换选择的组织
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 {
@ -70,10 +69,6 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn {
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");
@ -296,8 +291,6 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn {
} }
} }
} }
}
}
/** /**

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TravelInvoiceOverdueRemindersOp.java
View File

@ -44,9 +44,9 @@ public class TravelInvoiceOverdueRemindersOp extends AbstractOperationServicePlu
//当前切换选择的组织 //当前切换选择的组织
Long currentOrgId = RequestContext.get().getOrgId(); Long currentOrgId = RequestContext.get().getOrgId();
//当前所在的组织是属于矿山下的 //当前所在的组织是属于矿山下的
// if(OrgCheckUtils.isKS(currentOrgId)){ if(OrgCheckUtils.isKS(currentOrgId)){
e.getValidators().add(new TravelInvoiceOverdueRemindersOp.ValidatorExt()); e.getValidators().add(new TravelInvoiceOverdueRemindersOp.ValidatorExt());
// } }
} }
class ValidatorExt extends AbstractValidator { class ValidatorExt extends AbstractValidator {

28
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java
View File

@ -35,7 +35,6 @@ 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
@ -47,9 +46,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 {
@ -64,17 +63,13 @@ 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");
//判断是否来往家居地 //判断是否来往家居地
@ -93,19 +88,19 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
this.addFatalErrorMessage(extendedDataEntity, message); this.addFatalErrorMessage(extendedDataEntity, message);
} }
Integer monthTime = null; int monthTime = 0;
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);
@ -170,11 +165,8 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
} }
} }
} }
}else {
this.addFatalErrorMessage(extendedDataEntity, String.format("往来家居配置有误！"));
}
}
} }
} }
} }
} }

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillUpOp.java
View File

@ -43,9 +43,9 @@ public class TripreimbursebillUpOp extends AbstractOperationServicePlugIn {
//当前切换选择的组织 //当前切换选择的组织
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 {