diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java index 44f877b..09d31ee 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java @@ -4,6 +4,7 @@ import kd.bos.algo.DataSet; import kd.bos.algo.Row; import kd.bos.context.RequestContext; import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.entity.ExtendedDataEntity; import kd.bos.entity.plugin.AbstractOperationServicePlugIn; import kd.bos.entity.plugin.AddValidatorsEventArgs; @@ -113,6 +114,7 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn { int visitTime = 0; //探亲年限 int visitYear = 0; + //探亲天数 //探父母假天数 int visitDays =dynamicObject.getInt("visitDays"); @@ -148,6 +150,7 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn { if("2".equals(visitType)){ visitTime = marriedSpouseTime; visitYear = marriedSpouseYear; + } }else if (marriedStatus == 2) { // 未婚 if(!"1".equals(visitType)){//报销探亲类型 @@ -207,10 +210,16 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn { //已用剩余次数 int remainderTimes = visitTime-holidayCount; - //已用剩余天数 - int remainderDays =visitDays-allHolidayCount; - //计算提交单据的剩余次数 + //已用剩余天数 + int remainderDays = 0; + if("1".equals(visitType)){ //探望父母 + remainderDays = visitDays-allHolidayCount; + }else {//探望配偶 + remainderDays = marriedSpouseDays-allHolidayCount; + } + + //计算提交单据的剩余次数 int tims = remainderTimes - 1; //计算提交单据的剩余天数 int dayCount = remainderDays - days;