调整预埋件

邱宇豪

2023-09-26 9538bdb6ee3714e030d41807e6ab46cd6258d590

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java

@@ -21,11 +21,9 @@
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @Author QiuYuHao
@@ -56,7 +54,8 @@
      sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
      String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
      String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
      String id =  sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
      String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
      String id =  sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
      if(!StringUtil.isEmpty(id)){
         return BasicResult.faild("11111","error","名称和规格型号不可重复");
      }
@@ -76,8 +75,9 @@
      sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
      String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
      String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
      String id =  sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
      if(!StringUtil.isEmpty(id)){
      String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
      String id =  sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
      if(!StringUtil.isEmpty(id) && !sysEmbedmentGoodsEntity.getId().equals(id)){
         return BasicResult.faild("11111","error","名称和规格型号不可重复");
      }
      sysEmbedmentGoodsMapper.update(sysEmbedmentGoodsEntity);
@@ -102,10 +102,8 @@


   @Override
   public BasicResult findAllDetails() {
      List<String> modelList = sysEmbedmentGoodsMapper.findAll(null)
            .stream().map(s -> s.getEmbedmentModel()).collect(Collectors.toList());
      return BasicResult.success(modelList);
   public BasicResult findAllDetails(String id) {
      return BasicResult.success(sysEmbedmentGoodsMapper.findEntity(id).getEmbedmentModel());
   }
   //=======================种类到此结束=======================