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

@@ -89,7 +89,7 @@
   private CodeClassifyTemplateButtonServiceImpl codeTempbuttonServiceImpl;
   @Autowired(required = false)
   private ICodeClassifyProcessTempService codeClsflowtempServiceImpl;
//   @Autowired(required = false)
   //   @Autowired(required = false)
//   private CodeClsflowtempMapper codeClsflowtempMapper;
   @Autowired(required = false)
   private CodeTemplatePhaseMapper codeTempphaseMapper;
@@ -493,34 +493,34 @@
//         ClientBusinessObject clientBusinessObject_template_insert = null;
//      try {
//         clientBusinessObject_template_insert = clientBusinessObjectOperation.reviseBusinessObject(clientBusinessObject_template, "");
         codeCls_template_insert.setOid(VciBaseUtil.getPk());
         codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
         codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
         codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
         codeCls_template_insert.setLastR(String.valueOf(1));
         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(AuthUtil.getUser().getUserName());
         codeCls_template_insert.setCreateTime(new Date());
         codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
         codeCls_template_insert.setLastModifyTime(new Date());
         codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
         codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
         Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
         codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
         codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
      codeCls_template_insert.setOid(VciBaseUtil.getPk());
      codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
      codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
      codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
      codeCls_template_insert.setLastR(String.valueOf(1));
      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(AuthUtil.getUser().getUserName());
      codeCls_template_insert.setCreateTime(new Date());
      codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
      codeCls_template_insert.setLastModifyTime(new Date());
      codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
      codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
      Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
      codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
      codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
//         VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
         codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
         codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
         codeCls_template_insert.setLctid(codeCls_template.getLctid());
         codeCls_template_insert.setLcStatus("Editing");
         codeCls_template_insert.setId(codeCls_template.getId());
         codeCls_template_insert.setName(codeCls_template.getName());
         codeCls_template_insert.setDescription(codeCls_template.getDescription());
         codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
      codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
      codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
      codeCls_template_insert.setLctid(codeCls_template.getLctid());
      codeCls_template_insert.setLcStatus("Editing");
      codeCls_template_insert.setId(codeCls_template.getId());
      codeCls_template_insert.setName(codeCls_template.getName());
      codeCls_template_insert.setDescription(codeCls_template.getDescription());
      codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
//         codeCls_template_insert.setCheckinBy(userName);
         codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
      codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
//      }catch (VCIError e){
//         e.printStackTrace();
//         logger.error("===============>分类模板-升版复制出错oid： "+templateOldOid+",mes"+e.error_message);
@@ -919,6 +919,13 @@
   @Override
   public R<CodeClassifyTemplateVO> addSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
      VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"需要添加的数据对象");

      QueryWrapper<CodeClassifyTemplate> wrapper = new QueryWrapper<>();
      wrapper.eq("CODECLASSIFYOID",codeClassifyTemplateDTO.getCodeclassifyoid());
      Long aLong = baseMapper.selectCount(wrapper);
      if(aLong > 0){
         return R.fail("该分类下已有子模版，无法新增，仅能进行升版操作！");
      }
      //将DTO转换为DO
      CodeClassifyTemplate codeClassifyTemplateDO = new CodeClassifyTemplate();
      BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClassifyTemplateDO);
@@ -937,7 +944,7 @@
      codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
      codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
      codeClassifyTemplateDO.setTs(new Date());
      codeClassifyTemplateDO.setOwner(AuthUtil.getUser().getUserName());
      codeClassifyTemplateDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setLctid("codeClsTempLc");
      codeClassifyTemplateDO.setVersionValue("1");
      codeClassifyTemplateDO.setVersionSeq(1);
@@ -946,8 +953,8 @@
      codeClassifyTemplateDO.setVersionRule("0");
      codeClassifyTemplateDO.setRevisionRule("numberversionrule");
      codeClassifyTemplateDO.setLastModifyTime(new Date());
      codeClassifyTemplateDO.setLastModifier(AuthUtil.getUser().getUserName());
      codeClassifyTemplateDO.setCreator(AuthUtil.getUser().getUserName());
      codeClassifyTemplateDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
      codeClassifyTemplateDO.setCreateTime(new Date());
      codeClassifyTemplateDO.setLastV("1");
      codeClassifyTemplateDO.setLastR("1");
@@ -1043,7 +1050,7 @@
//         condition.put("ts",codeClassifyTemplateDOCopyFromDTO.getTs());
         CodeClassifyTemplate detail = baseMapper
            .selectById(codeClassifyTemplateDOCopyFromDTO.getOid());
   //      boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
         //      boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOListemplateDOCopyFromDTO);
         if(detail.getTs().compareTo(codeClassifyTemplateDOCopyFromDTO.getTs()) != 0){//不是最新的不让改
            return R.fail("当前数据不是最新，请刷新后再修改！");
         }