FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!61
This commit is contained in:
高嵩
2023-04-23 21:32:44 +08:00
parent 42c6c8a030 75cadd6049
commit a25ef37b71
3 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java
+18 -2
View File
@@ -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()));
}
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+18
View File
@@ -212,7 +212,16 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,3);
instance.add(Calendar.MONTH,-1);
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()));
}
sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
} catch (ParseException e) {
e.printStackTrace();
@@ -225,7 +234,16 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
Calendar instance = Calendar.getInstance();
instance.setTime(parse);
instance.add(Calendar.YEAR,5);
instance.add(Calendar.MONTH,-1);
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()));
}
sarBussStandAttrInfoDao.updateById(sarBussStandAttrInfo);
} catch (ParseException e) {
e.printStackTrace();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+55
View File
@@ -4497,13 +4497,27 @@ 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()));
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<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()));
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 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 +4693,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(instanceInfo.getTime()));
sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString());
}
}
} catch (ParseException e) {
e.printStackTrace();
}
@@ -4676,6 +4717,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 +4725,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(instanceInfo.getTime()));
sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMapInfo.toString());
}
}
} catch (ParseException e) {
e.printStackTrace();
}