From 98191974ddfc1da235939a6ac6c02051dcef6ca4 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Sun, 23 Apr 2023 20:49:53 +0800
Subject: [PATCH] =?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<ActSarItemsEO> {
                                   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<ActSarItemsEO> {
                                   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<SarBussionessSt
                         Calendar instanceInfo = Calendar.getInstance();
                         instanceInfo.setTime(instance.getTime());
                         instanceInfo.add(Calendar.YEAR,3);
-                        sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
+                        sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime()));
                     }
                     sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
                 } catch (ParseException e) {
@@ -242,7 +242,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
                         Calendar instanceInfo = Calendar.getInstance();
                         instanceInfo.setTime(instance.getTime());
                         instanceInfo.add(Calendar.YEAR,5);
-                        sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
+                        sarBussStandAttrInfo.setFsrqBuss(sdf.format(instanceInfo.getTime()));
                     }
                     sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
                 } catch (ParseException e) {