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

国内外标准入库 关联体系目录新增与带入

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2022-01-24 18:25:58 +08:00
parent 8cb6b11d9f
commit f721b08970
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+3
View File
@@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity {
private String sarStandAttrEOStr; //新增修改时属性表信息
@TableField(exist = false)
private String menuId; //目录ID
@TableField(exist = false)
private String menuIds; //目录ID
@TableField(exist = false)
private int upReplaceNumFlag; //记录是否修改了替代文件号
@TableField(exist = false)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+35 -7
View File
@@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandardsInfoEO.setCreationTime(new Date());
sarStandardsInfoEO.setModifyTime(new Date());
//根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
SarStandMenu sarStandMenuEO = new SarStandMenu();
sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarStandMenuEODao.insert(sarStandMenuEO);
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
SarStandMenu sarStandMenuEO = new SarStandMenu();
sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
sarStandMenuEO.setMenuId(menuId);
sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarStandMenuEODao.insert(sarStandMenuEO);
}
}
// 根据其他字段，生成标准状态
updateStandState(sarStandardsInfoEO, null);
@@ -1408,6 +1411,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandardsInfoEO.setStandState(resultState);
}
@Autowired
private ISarStandardsInfoService sarStandardsInfoEOService;
/***
* @Description: 修改标准
* @Author: yangxuenan
@@ -1458,6 +1465,27 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// 修改属性表数据
sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);
createStandAttrInfo(sarStandardsInfoEO);
/**
* 编辑体系目录
*/
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
standardsInfoEO.setMenuId(menuId);
standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
try {
sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
}catch (NullPointerException e){
sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
}
}
}
//编写预警信息
// writeWarnings(sarStandardsInfoEO);
//修改标准过程中，重新修改代替标准号对应的标准的被代替标准号