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

fix: 企业标准导入添加标准体系

Browse Source
This commit is contained in:
wxyclub
2023-11-29 16:24:08 +08:00
parent 447a95d629
commit da22df97c7
2 changed files with 20 additions and 9 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
+15 -8
View File
@@ -2628,7 +2628,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
wrapper.eq(SarMenuStandard::getMenuName, txlbbuss);
List<SarMenuStandard> list = sarMenuStandardService.list(wrapper);
if (list.size() > 0) {
sarBussStandAttrInfo.setTxlbbuss(list.get(0).getId());
sarBussStandAttrInfo.setTxlbbuss(list.get(0).getMenuName());
}else {
return Result.error("第"+ count +"行请输入正确的标准体系");
}
@@ -4930,13 +4930,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String sarStandAttrEOStr1 = sarBussionessStandEO.getSarStandAttrEOStr();
if (sarStandAttrEOStr1 != null) {
Map<String, String> attrInfoMap = JSON.parseObject(sarStandAttrEOStr1, Map.class);
if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) {
SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu();
sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
sarBussStandMenuEO.setMenuId(attrInfoMap.get("TXLBBUSS"));
sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarBussStandMenuEO.setId(UUIDUtils.randomUUID20());
sarBussStandMenuEODao.insert(sarBussStandMenuEO);
LambdaQueryWrapper<SarMenuStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SarMenuStandard::getMenuName, attrInfoMap.get("TXLBBUSS"));
queryWrapper.eq(SarMenuStandard::getValidFlag, "0");
queryWrapper.eq(SarMenuStandard::getDicId, "9m4qqqaansxmox5e82zm");
List<SarMenuStandard> list = sarMenuStandardService.list(queryWrapper);
if (list.size() > 0) {
if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) {
SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu();
sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
sarBussStandMenuEO.setMenuId(list.get(0).getId());
sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarBussStandMenuEO.setId(UUIDUtils.randomUUID20());
sarBussStandMenuEODao.insert(sarBussStandMenuEO);
}
}
}
if (insertresult >= 1) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
+5 -1
View File
@@ -131,7 +131,11 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
}else if (null!=list.get(a).getFileIds()){
AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
FindFileNameDto fileNameDto = list1.get(a);
fileNameDto.setFileName(attFileEO.getOldFileName());
if (attFileEO==null){
fileNameDto.setFileName("");
} else {
fileNameDto.setFileName(attFileEO.getOldFileName());
}
list1.set(a,fileNameDto);
}
}