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 47582d53..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 @@ -212,7 +212,16 @@ public class SarBussionessStandController extends BaseControllerins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,3); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo); } catch (ParseException e) { e.printStackTrace(); @@ -225,7 +234,16 @@ public class SarBussionessStandController extends BaseControllerins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,5); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo); } catch (ParseException e) { e.printStackTrace(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 9877e2ef..258403bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4497,13 +4497,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); if(sarBussStandAttrInfo!=null) { sarBussStandAttrInfo.setFsrqBuss(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); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } + if(StringUtils.isBlank(sarBussStandAttrInfo.getCreationUser())){ + sarBussStandAttrInfo.setCreationUser("zhanglanying"); + } sarBussStandAttrInfos.add(sarBussStandAttrInfo); } + } catch (ParseException e) { e.printStackTrace(); } @@ -4515,11 +4529,24 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandAttrInfoQueryWrapper = new QueryWrapper<>(); sarBussStandAttrInfoQueryWrapper.eq("STAND_ID",data.getId()); SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.getOne(sarBussStandAttrInfoQueryWrapper); if(sarBussStandAttrInfo!=null) { sarBussStandAttrInfo.setFsrqBuss(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); + sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime())); + } + if(StringUtils.isBlank(sarBussStandAttrInfo.getCreationUser())){ + sarBussStandAttrInfo.setCreationUser("zhanglanying"); + } sarBussStandAttrInfos.add(sarBussStandAttrInfo); } } catch (ParseException e) { @@ -4658,6 +4685,7 @@ public class SarBussionessStandServiceImpl extends ServiceImplins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,3); + String sarStandAttrEOStrInfo = sarBussionessStandEO.getSarStandAttrEOStr(); + if(StringUtils.isNotBlank(sarStandAttrEOStrInfo)){ + Map sarStandAttrMapInfo = JSONObject.fromObject(sarStandAttrEOStrInfo); + sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); + } + } } catch (ParseException e) { e.printStackTrace(); } @@ -4676,6 +4717,7 @@ public class SarBussionessStandServiceImpl extends ServiceImplins){ + Calendar instanceInfo = Calendar.getInstance(); + instanceInfo.setTime(instance.getTime()); + instanceInfo.add(Calendar.YEAR,5); + String sarStandAttrEOStrInfo = sarBussionessStandEO.getSarStandAttrEOStr(); + if(StringUtils.isNotBlank(sarStandAttrEOStrInfo)){ + Map sarStandAttrMapInfo = JSONObject.fromObject(sarStandAttrEOStrInfo); + sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); + } + } } catch (ParseException e) { e.printStackTrace(); }