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

@@ -16,7 +16,6 @@
 */
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.api.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,6 +31,8 @@
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.flow.core.entity.ProcessTemplate;
import com.vci.ubcs.flow.core.feign.IFlowClient;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
@@ -41,6 +42,7 @@
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -106,6 +108,8 @@
   private CodeClassifyTemplateMapper codeClassifyTemplateMapper;
   @Autowired(required = false)
   private CodePhaseAttrServiceImpl codePhaseattrServiceImpl;
   @Autowired(required = false)
   private IFlowClient iFlowClient;

   @Override
   public IPage<CodeClassifyTemplateVO> selectPlCodeClstemplatePage(IPage<CodeClassifyTemplateVO> page, CodeClassifyTemplateVO plCodeClstemplate) {
@@ -545,7 +549,7 @@
      }

      //复制模板流程
      List<CodeClassifyProcessTemp>  codeClassifyProcessTempDOList = copyTemplateProcess(templateOldOid,templateNewOid);
      List<ProcessTemplate>  codeClassifyProcessTempDOList = copyTemplateProcess(templateOldOid,templateNewOid);
      //复制模板阶段，阶段属性
      Map phase_attrMap = copyTemplatePhase_attr(templateOldOid,templateNewOid);

@@ -557,7 +561,7 @@

      //保存模板流程
      if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
         codeClsflowtempServiceImpl.saveBatch(codeClassifyProcessTempDOList);
         iFlowClient.processBatchSave(codeClassifyProcessTempDOList);
      }
      //模板阶段
      if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
@@ -619,7 +623,7 @@
      List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = copyTemplateAttr(oldOid,newOid);

      //复制模板流程
      List<CodeClassifyProcessTemp> codeClassifyProcessTempDOList = copyTemplateProcess(oldOid,newOid);
      List<ProcessTemplate> codeClassifyProcessTempDOList = copyTemplateProcess(oldOid,newOid);

      //复制模板阶段，阶段属性
      Map  phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);
@@ -633,7 +637,7 @@
//      baseMapper.insert(codeClassifyTemplateDOList);
      this.saveBatch(codeClassifyTemplateDOList);
      codeTempbuttonServiceImpl.saveBatch(codeClassifyTemplateButtonDOList);
      codeClsflowtempServiceImpl.saveBatch(codeClassifyProcessTempDOList);
      iFlowClient.processBatchSave(codeClassifyProcessTempDOList);
      codeClstempattrService.saveBatch(codeClassifyTemplateAttrDOList);
      codeTempphaseServiceImpl.saveBatch(codeClassifyPhaseDOList);
      codePhaseattrServiceImpl.saveBatch(codePhaseAttrDOList);
@@ -696,22 +700,17 @@
   /**
    * 复制模板流程
    */
   public List<CodeClassifyProcessTemp> copyTemplateProcess(String templateOldOid,String templateNewOid){
//      VciQueryWrapperForDO processWrapper = new VciQueryWrapperForDO(CodeClassifyProcessTempDO.class);
//      processWrapper.addQueryMap("classifyTemplateOid",templateOldOid);

//      Map<String,Object> condition = new HashMap<>(1);
//      condition.put("classifyTemplateOid",templateOldOid);
      QueryWrapper<CodeClassifyProcessTemp> wrapper = new QueryWrapper<>();
      wrapper.eq("classifyTemplateOid",templateOldOid);
      List<CodeClassifyProcessTemp> codeClsflowtempEntities = codeClsflowtempServiceImpl.list(wrapper);
//      List<CodeClassifyProcessTempDO>  codeClassifyProcessTempDOList = codeClassifyProcessTempDaoI.selectByWrapper(processWrapper);//要保存的新的模板流程
      for (CodeClassifyProcessTemp codeClassifyProcessTempDO:codeClsflowtempEntities){
//         String newOid = VciBaseUtil.getPk();
         codeClassifyProcessTempDO.setOid(null);
         //codeClassifyProcessTempDO.setCodeClassifyOid(templateNewOid);
         codeClassifyProcessTempDO.setClassifyTemplateOid(templateNewOid);
//         codeClsflowtempMapper.insert(codeClassifyProcessTempDO);
   public List<ProcessTemplate> copyTemplateProcess(String templateOldOid,String templateNewOid){
      Map<String,Object> wrapperMap = new HashMap();
      wrapperMap.put("template_id",templateOldOid);
      R<List<ProcessTemplate>> listR = iFlowClient.selectByWrapper(wrapperMap);
      if(!listR.isSuccess()){
         throw new VciBaseException("查询模板流程时出错，请重试！");
      }
      List<ProcessTemplate> codeClsflowtempEntities = listR.getData();
      for (ProcessTemplate codeClassifyProcessTempDO:codeClsflowtempEntities){
         codeClassifyProcessTempDO.setId(null);
         codeClassifyProcessTempDO.setTemplateId(templateNewOid);
         //modify by lihang - @20220406 设置模板主键位置出错，导致升版的模板中的流程是空的。
      }
      return codeClsflowtempEntities;
@@ -898,11 +897,11 @@

      //所有分类都没有业务类型，返回提示
      if(codeClassifyDOList.size()==0){
         return R.fail("添加模板添加失败,分类和上级分类都没有关联业务类型！");
         return R.fail(DATA_OID_NOT_EXIST);
      }

      //设置btmtypeid和name
      CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
      CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get();
      codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
      codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
      codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
@@ -1100,9 +1099,13 @@
//            codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
         if(Func.isEmpty(classifyDO)&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
            //说明已经是顶了，也没找到的话，那就返回了
            return null;
            return new ArrayList<>();
         }
         return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
         if(StringUtils.isNotBlank(classifyDO.getParentCodeClassifyOid())) {
            return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
         }else{
            return new ArrayList<>();
         }
      }else{
         return templateDOS;
      }