diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0e714994..608b3ed3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -53,6 +53,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; @@ -539,16 +542,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { - //存在的分解单文本名称列表 - LinkedList itemExistList = new LinkedList<>(); + //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单 + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setStandId(row.getId()); + List sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage); + List itemExistList = sarFileSplitInfoEOS.stream() + .map(item -> item.getFileType()) + .collect(Collectors.toList()); getAttrMap.put("itemExistList",itemExistList); + for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -557,15 +567,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); - //以标准id和文本类型查询分解单表 有数据设标记为为 1 - FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); - sarItemCount.setStandId(row.getId()); - sarItemCount.setFileType(name); - Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); - if (sarItemsCount>0){ - //存在分解单的文本名称存入列表 - itemExistList.add(name); - } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 46462a44..b0f15bbd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -375,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEODao.insertForeach(itemValList); - //用来往标准分解单插入数据 - messageList.forEach(item -> { - //new一个对象 - SarStandItems standItems1 = new SarStandItems(); - //standItems1里的这个值为messageList里的ItermsConditions - standItems1.setId(UUIDUtils.randomUUID20()) - .setFileType(sarFileSplitInfoEO.getFileType()) - .setStandId(sarFileSplitInfoEO.getStandId()) - .setItemsNum(item.getItemsNum()) - .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()) - .setEditFlag(item.getEditFlag()); - - standList.add(standItems1); - }); - sarFileSplitItemsEODao.insertStandSplitForeach(standList); +// 2021/11/23改用标准详情手动插入 +// //用来往标准分解单插入数据 +// messageList.forEach(item -> { +// //new一个对象 +// SarStandItems standItems1 = new SarStandItems(); +// //standItems1里的这个值为messageList里的ItermsConditions +// standItems1.setId(UUIDUtils.randomUUID20()) +// .setFileType(sarFileSplitInfoEO.getFileType()) +// .setStandId(sarFileSplitInfoEO.getStandId()) +// .setItemsNum(item.getItemsNum()) +// .setItemsName(item.getItemsName()) +// .setTermsConditions(item.getItermsConditions()) +// .setEditFlag(item.getEditFlag()); +// +// standList.add(standItems1); +// }); +// sarFileSplitItemsEODao.insertStandSplitForeach(standList); } else {