Changes11

Fixiaobai

2023-11-10 af389156a78401b1e51807efe90b7310fc4c20f6

 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java

@@ -81,7 +81,7 @@
         Param second=new Param();
         SysDictItem sysDictItem = second_param.stream().filter(p -> p.getId().equals(Integer.valueOf(String.valueOf(s)))).collect(Collectors.toList()).get(0);
         second.setParameterItem(sysDictItem.getLabel());
         second.setCode(""+s);
         second.setCode(father.getCode()+"-"+s);
         second.setParentId(father.getId());
         baseMapper.insert(second);
         //三级
@@ -89,7 +89,7 @@
            Param third=new Param();
            SysDictItem sysThirdDictItem = third_param.stream().filter(p -> p.getId().equals(Integer.valueOf(String.valueOf(t)))).collect(Collectors.toList()).get(0);
            third.setParameterItem(sysThirdDictItem.getLabel());
            third.setCode(""+t);
            third.setCode(second.getCode()+"-"+t);
            third.setParentId(second.getId());
            baseMapper.insert(third);
         });
@@ -231,6 +231,7 @@
      List<List<Param>>paramList=new ArrayList<>();
      AtomicInteger nums = new AtomicInteger();
      List<Long>secondIds=new ArrayList();
      List<String>secondCode=new ArrayList();
      for (int i = 0; i < listParamTemplates.size(); i++) {
         List<ParamTemplate> l = listParamTemplates.get(i);
         List<Param>paramList1=new ArrayList<>();
@@ -257,7 +258,8 @@
                  Param second=new Param();
                  second.setId(IdWorker.getId());
                  secondIds.add(second.getId());
                  second.setCode(dictTwo.stream().filter(d -> Objects.equals(c.getParamItemTwo(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
                  second.setCode(paramFirst.getCode()+"-"+dictTwo.stream().filter(d -> Objects.equals(c.getParamItemTwo(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
                  secondCode.add(second.getCode());
                  second.setParameterItem(c.getParamItemTwo());
                  if(c.getParamItemThree()==null){
                     second.setType(type.stream().filter(d -> Objects.equals(c.getParamType(), d.getLabel())).collect(Collectors.toList()).get(0).getValue());
@@ -271,10 +273,11 @@
                  Param third=new Param();
                  third.setId(IdWorker.getId());
                  long paramItemTwo = secondIds.get(secondIds.size()-1);
                  String paramItemCode=secondCode.get(secondCode.size()-1);
                  //System.out.println(nums.get()+"所属二级======》"+secondIds.get(secondIds.size()-1));
                  third.setParentId(paramItemTwo);
                  third.setParameterItem(c.getParamItemThree());
                  third.setCode(dictThree.stream().filter(d -> Objects.equals(c.getParamItemThree(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
                  third.setCode(paramItemCode+"-"+dictThree.stream().filter(d -> Objects.equals(c.getParamItemThree(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
                  third.setType(type.stream().filter(d -> Objects.equals(c.getParamType(), d.getLabel())).collect(Collectors.toList()).get(0).getValue());
                  third.setParameterFormat(c.getParamFormat());
                  third.setUnit(c.getUnit());