Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java

@@ -38,6 +38,8 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.pagemodel.Tree;
@@ -918,31 +920,14 @@
      }

      //设置btmtypeid和name
      DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateDO, MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE);
      CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get();
      codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
      codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
      codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
      codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
      codeClassifyTemplateDO.setTs(new Date());
      codeClassifyTemplateDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setLctid("codeClsTempLc");
      codeClassifyTemplateDO.setVersionValue("1");
      codeClassifyTemplateDO.setVersionSeq(1);
      codeClassifyTemplateDO.setRevisionValue("1");
      codeClassifyTemplateDO.setRevisionSeq(1);
      codeClassifyTemplateDO.setVersionRule("0");
      codeClassifyTemplateDO.setRevisionRule("numberversionrule");
      codeClassifyTemplateDO.setLastModifyTime(new Date());
//      codeClassifyTemplateDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
//      codeClassifyTemplateDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
      codeClassifyTemplateDO.setCreateTime(new Date());
      codeClassifyTemplateDO.setLastV("1");
      codeClassifyTemplateDO.setLastR("1");
      codeClassifyTemplateDO.setFirstV("1");
      codeClassifyTemplateDO.setFirstR("1");
      codeClassifyTemplateDO.setBtmname("codeclstemplate");

      baseMapper.insert(codeClassifyTemplateDO);
      //默认添加模板属性
@@ -1069,13 +1054,16 @@
//      Map<String/**模板的主键**/,String/**分类的主键**/> childHasTemplateMap =baseMapper
//         .selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
//            codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
      List<Map<String,String>> childHasTemplateList =baseMapper
      List<Map<String,String>> childHasTemplateList = baseMapper
         .selectChildHasReleaseTemplate(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED,
            codeClassifyOid,CodeClassifyTemplateLC.RELEASED.getValue());
      Map<String/**模板的主键**/,String/**分类的主键**/> childHasTemplateMap = new HashMap<>();
      if(!CollectionUtils.isEmpty(childHasTemplateList)){
         childHasTemplateList.stream().forEach(cbo->{
            childHasTemplateMap.put(cbo.get("OID"),cbo.get("CLSOID"));
            // 有时候查询出来的key是大写，有时候是小写的key
            String oid = Func.isEmpty(cbo.get("OID")) ? cbo.get("oid"):cbo.get("OID");
            String clsoid = Func.isEmpty(cbo.get("CLSOID")) ? cbo.get("clsoid") : cbo.get("CLSOID");
            childHasTemplateMap.put(oid,clsoid);
         });
      }

@@ -1092,7 +1080,6 @@
      }
      return codeClassifyTemplateVOList;
   }


   /**
    * 使用分类主键递归查询