已发布选项不能删除提示

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomConfigRMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 public interface OptionalEbomConfigRMapper extends BaseMapper<OptionalEbomConfigREntity> {
 
 
- public   List<OptionalEbomConfigRVO> countPublishList(@Param("optionRowIds")String   optionRowIds);
+ public   List<Long> countPublishList(@Param("optionRowIds")String   optionRowIds);
 
 }
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigRService.java

@@ -44,7 +44,7 @@ public class OptionalEbomConfigRService extends ServiceImpl<OptionalEbomConfigRM
     }
 
 
-    public List<OptionalEbomConfigRVO> countPublish(String   optionRowIds){
+    public List<Long> countPublish(String   optionRowIds){
             return this.baseMapper.countPublishList(optionRowIds);
     }
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java

@@ -78,7 +78,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
         }
 
 
-
         String nos = dto.getDrawingNo();
 
         List<OptionalEbomImportChildEntity> optionList = null;
@@ -99,8 +98,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
             strMaterial = strMaterial.replace("\n", "");
 
 
-
-
             List<String> listNo = StrUtil.splitTrim(strMaterial, ";");
             listNo = listNo.stream().filter(str -> !str.trim().replace(" ", "").isEmpty()).collect(Collectors.toList());
 
@@ -113,9 +110,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
         }
 
 
-
-
-
         if (Objects.equals(dto.getPartType(), OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue())) {
             SpringUtil.getBean(OptionalEbomMainHistoryService.class).convertToHistory(dto.getRootRowId());
         }
@@ -176,14 +170,9 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
     }
 
 
-
-
-
-
     public Boolean openCloseStatus(OptionalEbomImportChildVO vo) {
 
 
-
         OptionalEbomImportChildEntity childEntity = getById(vo.getRowId());
         if (childEntity != null) {
             if (Objects.equals(childEntity.getPartType(), OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue())) {
@@ -198,6 +187,7 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
         return this.updateById(entity);
 
     }
+
     public void updateRemark(OptionalEbomSubmitEditDTO.OptionalEbomImportChildSubmitDTO dto) {
 
         OptionalEbomImportChildEntity entity = new OptionalEbomImportChildEntity();
@@ -209,7 +199,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
     }
 
 
-
 //    public    Boolean  updateBatchChoose(List<OptionalEbomImportChildVO> list){
 //        List<OptionalEbomImportChildEntity> entityLists= Convert.toList(OptionalEbomImportChildEntity.class,list);
 //
@@ -236,30 +225,42 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
     /**
      * 相同部分更改isDel标记
      * 不同部分没有发布数据则删除
+     *
      * @param longIds
      * @return
      */
     public Boolean deleteBiz(List<Long> longIds)    {
-        List<Long> intersectionList=new ArrayList<>(); //交， 更新
+        List<Long> intersectionList = null; //交， 更新
-        List<Long> subList=new ArrayList<>(); //差， 删除
+        List<Long> subList = null; //差， 删除
         if (CollectionUtil.isNotEmpty(longIds)) {
 
             String rowIds = longIds.stream().map(Object::toString)
                     .collect(Collectors.joining(","));
-                List<OptionalEbomConfigRVO>   list= SpringUtil.getBean(OptionalEbomConfigRService.class).countPublish(rowIds);
+            List<Long> optionIdList = SpringUtil.getBean(OptionalEbomConfigRService.class).countPublish(rowIds);
-                List<Long> optionIdList=list.stream().map(OptionalEbomConfigRVO::getOptionRowId).collect(Collectors.toList());
+            if (optionIdList == null) {
-
+                optionIdList = new ArrayList<>();
-                //交集 相同
-             //   List<Long> intersectionList2=  CollectionUtil.intersection(longIds, optionIdList).stream().collect(Collectors.toList());
-                //差 第一个list 不同部分
-                List<Long> subList2=  CollectionUtil.subtract(longIds, optionIdList).stream().collect(Collectors.toList());
-//                 if(CollectionUtil.isNotEmpty(intersectionList2)){
-//                     intersectionList.addAll(intersectionList2);
-//                 }
-                    if(CollectionUtil.isNotEmpty(subList2)){
-                        subList.addAll(subList2);
             }
 
+            //交集 相同 已发布
+            intersectionList = CollectionUtil.intersection(longIds, optionIdList).stream().collect(Collectors.toList());
+            //差 第一个list 不同部分 未发布
+            subList = CollectionUtil.subtract(longIds, optionIdList).stream().collect(Collectors.toList());
+
+        }
+
+        //已发布提示
+        if (CollectionUtil.isNotEmpty(intersectionList)) {
+            QueryWrapper<OptionalEbomImportChildEntity> queryWrapper = new QueryWrapper();
+            queryWrapper.lambda().in(OptionalEbomImportChildEntity::getRowId, intersectionList);
+
+            List<OptionalEbomImportChildEntity> entityList = getBaseMapper().selectList(queryWrapper);
+            StringBuffer stringBuffer = new StringBuffer();
+            for (OptionalEbomImportChildEntity item :
+                    entityList) {
+                stringBuffer.append(StrUtil.format("{}({}) , ", item.getMaterialName(), item.getMaterialNo()));
+            }
+            stringBuffer.append("以上数据已发布不能删除");
+            throw    new NflgBusinessException(STATE.Error, stringBuffer.toString());
         }
 
 
@@ -270,7 +271,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
             QueryWrapper<OptionalEbomConfigREntity> delOptionWrapper = new QueryWrapper();
             delOptionWrapper.lambda().in(OptionalEbomConfigREntity::getOptionRowId, subList);
             SpringUtil.getBean(OptionalEbomConfigRService.class).remove(delOptionWrapper);
-
         }
 
 
@@ -278,9 +278,6 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
     }
 
 
-
-
-
     public Boolean updateDelStatusByRowId(List<Long> rowIds) {
         QueryWrapper<OptionalEbomImportChildEntity> queryWrapper = new QueryWrapper();
         queryWrapper.lambda().in(OptionalEbomImportChildEntity::getRowId, rowIds);

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigRMapper.xml

@@ -16,9 +16,9 @@ row_id,parent_row_id,option_row_id,choose_status,created_time
 
 
 <!--是否存在已发布数据-->
-    <select id="countPublishList"    resultType="com.nflg.product.bomnew.pojo.vo.OptionalEbomConfigRVO" >
+    <select id="countPublishList"    resultType="java.lang.Long" >
-        SELECT t1.* from t_optional_ebom_config_r as t1 LEFT JOIN t_optional_ebom_config as t2 on t1.parent_row_id=t2.row_id
+        SELECT t1.option_row_id from t_optional_ebom_config_r as t1 LEFT JOIN t_optional_ebom_config as t2 on t1.parent_row_id=t2.row_id
-        WHERE t1.option_row_id in  (${optionRowIds}) and t2.edit_status=1
+        WHERE t1.option_row_id in  (${optionRowIds}) and t2.edit_status=1  GROUP BY t1.option_row_id
 
         </select>