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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-24 16:54:42 +08:00
parent 4aed4ea0d9 31795874db
commit 6b7ab0cca6
1 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+68 -1
View File
@@ -4479,7 +4479,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//取出所有数据 //取出所有数据
QueryWrapper<SarBussionessStand> objectQueryWrapper = new QueryWrapper<>(); QueryWrapper<SarBussionessStand> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.isNotNull("ISSUE_TIME"); objectQueryWrapper.isNotNull("ISSUE_TIME");
objectQueryWrapper.isNotNull("STAND_SORT");
List<SarBussionessStand> sarBussionessStands = baseMapper.selectList(objectQueryWrapper); List<SarBussionessStand> sarBussionessStands = baseMapper.selectList(objectQueryWrapper);
if(sarBussionessStands.isEmpty()){ if(sarBussionessStands.isEmpty()){
return Result.error("无合法数据更正，发布日期或者标准编号不可为null"); return Result.error("无合法数据更正，发布日期或者标准编号不可为null");
@@ -4553,6 +4552,74 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
e.printStackTrace(); e.printStackTrace();
} }
} }
}else {
if(data!=null && StringUtils.isNotBlank(data.getIssueTime()) && StringUtils.isNotBlank(data.getStandCode())){
// 异常数据 则判断standCode
if(data.getStandCode().contains("Q/QCBFC") || data.getStandCode().contains("Q/FT X") || data.getStandCode().contains("Q/FTX")){
//产品标准三年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parse = sdf.parse(data.getIssueTime());
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();
}
}else {
//技术标准五年复审
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parse = sdf.parse(data.getIssueTime());
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) {
e.printStackTrace();
}
}
}
} }
} }
if(!sarBussStandAttrInfos.isEmpty()){ if(!sarBussStandAttrInfos.isEmpty()){