From be33f453c6ac06106555f73a6aefb5a210026623 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 20:38:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B8=85=E6=B4=97?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=B6=E9=97=B4=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E8=B6=85=E8=BF=87=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E5=88=99=20=E5=86=8D=E5=8A=A0=E4=B8=89=E5=B9=B4=E6=88=96?= =?UTF-8?q?=E8=80=85=E4=BA=94=E5=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) 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..12edaaef 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,22 @@ 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())); - sarBussStandAttrInfos.add(sarBussStandAttrInfo); } + 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())); + } + sarBussStandAttrInfos.add(sarBussStandAttrInfo); } catch (ParseException e) { e.printStackTrace(); } @@ -4515,12 +4524,20 @@ 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())); - sarBussStandAttrInfos.add(sarBussStandAttrInfo); + } + 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())); } } catch (ParseException e) { e.printStackTrace(); @@ -4658,6 +4675,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(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); + } + } } catch (ParseException e) { e.printStackTrace(); } @@ -4676,6 +4707,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(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); + } + } } catch (ParseException e) { e.printStackTrace(); } From d06c4513c440ac145e2e04ac239d241ef55c496d Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 20:42:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 12edaaef..fd21a80f 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 @@ -4692,7 +4692,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMapInfo = JSONObject.fromObject(sarStandAttrEOStrInfo); - sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instance.getTime())); + sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); } } @@ -4724,7 +4724,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMapInfo = JSONObject.fromObject(sarStandAttrEOStrInfo); - sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instance.getTime())); + sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instanceInfo.getTime())); sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString()); } } From abde10f1e626f7e52204d44ffa0ea82b35ed82af Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 20:46:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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..3b85a9db 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(instance.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(instance.getTime())); + } sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo); } catch (ParseException e) { e.printStackTrace(); From 98191974ddfc1da235939a6ac6c02051dcef6ca4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 20:49:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActSarItemsBussEOController.java | 20 +++++++++++++++++-- .../SarBussionessStandController.java | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) 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 Date: Sun, 23 Apr 2023 21:31:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 fd21a80f..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 @@ -4503,7 +4503,7 @@ public class SarBussionessStandServiceImpl extends ServiceImplins){ @@ -4512,7 +4512,12 @@ public class SarBussionessStandServiceImpl extends ServiceImplins){ @@ -4539,6 +4544,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl