diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index a2dfe0e1..40dfc60f 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -64,8 +64,16 @@ public class ActSarItemsBussEOController extends BaseController { Calendar instance = Calendar.getInstance(); instance.setTime(parse); instance.add(Calendar.YEAR,3); + instance.add(Calendar.MONTH,-1); jsonObject.put("FSRQBUSS",sdf.format(instance.getTime())); - + long time = new Date().getTime(); + long ins = instance.getTime().getTime(); + if(time>ins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,3); + jsonObject.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); + } }else { //技术标准五年复审 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -73,8 +81,16 @@ public class ActSarItemsBussEOController extends BaseController { Calendar instance = Calendar.getInstance(); instance.setTime(parse); instance.add(Calendar.YEAR,5); + instance.add(Calendar.MONTH,-1); jsonObject.put("FSRQBUSS",sdf.format(instance.getTime())); - + long time = new Date().getTime(); + long ins = instance.getTime().getTime(); + if(time>ins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,5); + jsonObject.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); + } } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3b85a9db..f65131f4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -220,7 +220,7 @@ public class SarBussionessStandController extends BaseController