From be33f453c6ac06106555f73a6aefb5a210026623 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Sun, 23 Apr 2023 20:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B8=85=E6=B4=97=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=97=B6=E9=97=B4=E6=95=B0=E6=8D=AE=20=E8=B6=85?=
 =?UTF-8?q?=E8=BF=87=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=20=E5=88=99=20?=
 =?UTF-8?q?=E5=86=8D=E5=8A=A0=E4=B8=89=E5=B9=B4=E6=88=96=E8=80=85=E4=BA=94?=
 =?UTF-8?q?=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<SarBussionessStan
                          Calendar instance = Calendar.getInstance();
                          instance.setTime(parse);
                          instance.add(Calendar.YEAR,3);
+                         instance.add(Calendar.MONTH,-1);
                          QueryWrapper<SarBussStandAttrInfo> 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<SarBussionessStan
                          Calendar instance = Calendar.getInstance();
                          instance.setTime(parse);
                          instance.add(Calendar.YEAR,5);
+                         instance.add(Calendar.MONTH,-1);
                          QueryWrapper<SarBussStandAttrInfo> 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 ServiceImpl<SarBussionessStan
                             Calendar instance = Calendar.getInstance();
                             instance.setTime(parse);
                             instance.add(Calendar.YEAR,3);
+                            instance.add(Calendar.MONTH,-1);
                             //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
                             String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
                             if(StringUtils.isNotBlank(sarStandAttrEOStr)){
@@ -4665,6 +4683,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                 sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
                                 sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
                             }
+                             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);
+                                String sarStandAttrEOStrInfo = sarBussionessStandEO.getSarStandAttrEOStr();
+                                if(StringUtils.isNotBlank(sarStandAttrEOStrInfo)){
+                                    Map<String,String> 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 ServiceImpl<SarBussionessStan
                             Calendar instance = Calendar.getInstance();
                             instance.setTime(parse);
                             instance.add(Calendar.YEAR,5);
+                            instance.add(Calendar.MONTH,-1);
                             //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime()));
                             String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
                             if(StringUtils.isNotBlank(sarStandAttrEOStr)){
@@ -4683,6 +4715,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                 sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime()));
                                 sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString());
                             }
+                            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);
+                                String sarStandAttrEOStrInfo = sarBussionessStandEO.getSarStandAttrEOStr();
+                                if(StringUtils.isNotBlank(sarStandAttrEOStrInfo)){
+                                    Map<String,String> sarStandAttrMapInfo = JSONObject.fromObject(sarStandAttrEOStrInfo);
+                                    sarStandAttrMapInfo.put("FSRQBUSS",sdf.format(instance.getTime()));
+                                    sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString());
+                                }
+                            }
                         } catch (ParseException e) {
                             e.printStackTrace();
                         }