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

@@ -31,6 +31,7 @@
import com.vci.ubcs.code.service.ICodeClstemplateService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.common.constant.CommonConstant;
import com.vci.ubcs.flow.core.entity.ProcessTemplate;
import com.vci.ubcs.flow.core.feign.IFlowClient;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -510,10 +511,12 @@
      codeCls_template_insert.setFirstR(String.valueOf(0));
      codeCls_template_insert.setFirstV(String.valueOf(1));
      codeCls_template_insert.setLastV(String.valueOf(1));
      codeCls_template_insert.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
//      codeCls_template_insert.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
      codeCls_template_insert.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
      codeCls_template_insert.setCreateTime(new Date());
      codeCls_template_insert.setTs(new Date());
      codeCls_template_insert.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      // codeCls_template_insert.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      codeCls_template_insert.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
      codeCls_template_insert.setLastModifyTime(new Date());
      codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
      codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
@@ -536,6 +539,7 @@
      int insertCount = baseMapper.insert(codeCls_template_insert);
      codeCls_template.setLastR("0");
      codeCls_template.setLastModifyTime(new Date());
      // codeCls_template.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      codeCls_template.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      baseMapper.updateById(codeCls_template);
      //升版过后的模板oid
@@ -627,6 +631,8 @@
      codeClassifyTemplateDO_old.setTs(new Date());
      codeClassifyTemplateDO_old.setCreateTime(new Date());
      codeClassifyTemplateDO_old.setLastModifyTime(new Date());
      // 复制的模板生命周期改为编辑中
      codeClassifyTemplateDO_old.setLcStatus(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING);
      List<CodeClassifyTemplate> codeClassifyTemplateDOList = new ArrayList<>();
      codeClassifyTemplateDOList.add(codeClassifyTemplateDO_old);

@@ -637,7 +643,7 @@
      List<ProcessTemplate> codeClassifyProcessTempDOList = copyTemplateProcess(oldOid,newOid);

      //复制模板阶段，阶段属性
      Map  phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);
      Map phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);

      List<CodeTemplatePhase> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhase>)phase_attrMap.get("phase");//模板阶段
      List<CodePhaseAttr> codePhaseAttrDOList = (ArrayList<CodePhaseAttr>)phase_attrMap.get("phaseAttr");//阶段属性
@@ -927,8 +933,10 @@
      codeClassifyTemplateDO.setVersionRule("0");
      codeClassifyTemplateDO.setRevisionRule("numberversionrule");
      codeClassifyTemplateDO.setLastModifyTime(new Date());
      codeClassifyTemplateDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
//      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");
@@ -1043,7 +1051,7 @@
         codeClassifyTemplateDO.setLcStatus(lcstatus);
         codeClassifyTemplateDO.setVersionValue(versionvalue);
         codeClassifyTemplateDO.setTs(new Date());
         codeClassifyTemplateDO.setLastModifier(AuthUtil.getUser().getUserName());
         codeClassifyTemplateDO.setLastModifier(AuthUtil.getUser().getAccount());
         codeClassifyTemplateDO.setLastModifyTime(new Date());
         baseMapper.updateById(codeClassifyTemplateDO);
      }
@@ -1061,13 +1069,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);
         });
      }

@@ -1084,7 +1095,6 @@
      }
      return codeClassifyTemplateVOList;
   }


   /**
    * 使用分类主键递归查询
@@ -1108,7 +1118,7 @@
         //递归找上级的模板
         CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
//            codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
         if(Func.isEmpty(classifyDO)&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
         if(Func.isEmpty(classifyDO)){
            //说明已经是顶了，也没找到的话，那就返回了
            return new ArrayList<>();
         }