ubcs.git - Gitblit

			@@ -5,23 +5,26 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
			import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
			import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
			import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
			import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
			import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
			import com.vci.ubcs.code.dto.CodeOrderDTO;
			import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
			import com.vci.ubcs.code.entity.*;
			import com.vci.ubcs.code.enumpack.*;
			import com.vci.ubcs.code.mapper.CodeWupinMapper;
			import com.vci.ubcs.code.mapper.CommonsMapper;
			import com.vci.ubcs.code.service.*;
			import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
			import com.vci.ubcs.code.vo.CodeReferConfigVO;
			import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
			import com.vci.ubcs.code.vo.pagemodel.UITablePageVO;
			import com.vci.ubcs.code.vo.pagemodel.*;
			import com.vci.ubcs.code.wrapper.BaseMdodelWrapper;
			import com.vci.ubcs.flow.core.dto.FlowStatusDTO;
			import com.vci.ubcs.flow.core.feign.IMDMIFlowAttrClient;
			import com.vci.ubcs.flow.core.vo.ProcessStageAttrVO;
			import com.vci.ubcs.omd.constant.BtmTypeLcStatusConstant;
			import com.vci.ubcs.omd.cache.EnumCache;
			import com.vci.ubcs.omd.feign.*;
			@@ -35,6 +38,7 @@
			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.MdmBtmTypeConstant;
			import com.vci.ubcs.starter.util.UBCSSqlKeyword;
			import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
			import com.vci.ubcs.starter.web.constant.RegExpConstant;
			@@ -62,9 +66,14 @@
			import org.springblade.core.tool.utils.Func;
			import org.springblade.core.tool.utils.StringPool;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.cache.Cache;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.PlatformTransactionManager;
			import org.springframework.transaction.TransactionStatus;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.support.DefaultTransactionDefinition;
			import org.springframework.transaction.support.TransactionTemplate;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			@@ -77,7 +86,7 @@
			import java.time.ZoneId;
			import java.time.ZonedDateTime;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;
			import java.util.concurrent.*;
			import java.util.stream.Collectors;

			import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
			@@ -91,15 +100,31 @@
			* @date 2022-2-22
			*/
			@Service
			public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements MdmEngineService {
			public class MdmEngineServiceImpl implements MdmEngineService {

			/**
			* 多线程方式批量执行开启线程池的总数
			*/
			@Value("${batchadd.thread_num:10}")
			private Integer THREAD_NUM;

			/**
			* 单次sql的最多导入数量
			*/
			@Value("${batchadd.single_maxnum:200}")
			private Integer MAX_IMPORT_NUM;

			/**
			* 是否开启多线程方式导入历史数据
			*/
			@Value("${batchadd.is_thread_import:false}")
			private boolean IS_THREAD_IMPORT;

			/**
			* 模板的服务
			*/
			@Resource
			private CodeClstemplateServiceImpl templateService;

			private ICodeClstemplateService templateService;

			/**
			* 生成编码的服务
			@@ -132,6 +157,11 @@
			*/
			@Resource
			IEnumClient enumClient;
			/**
			* 版本规则服务
			*/
			@Resource
			private IRevisionRuleClient revisionRuleClient;

			/**
			* 公式的服务
			@@ -139,13 +169,11 @@
			@Autowired
			private FormulaServiceImpl formulaService;


			/**
			* 对omd中提供的feign接口进行调用，以及处理相关逻辑
			*/
			@Autowired
			ICodeReferBtmTypeService codeReferBtmTypeService;


			/**
			* 相似项查询规则
			@@ -169,20 +197,13 @@
			*/
			@Autowired
			private IBtmTypeClient btmTypeClient;
			/**
			* 版本规则的服务
			*/
			@Resource
			private IRevisionRuleClient revisionRuleClient;
			//

			/**
			* 通用查询
			*/
			@Resource
			CommonsMapper commonsMapper;
			private CommonsMapper commonsMapper;

			@Resource
			CodeWupinMapper codeWupinMapper;
			/**
			* 编码规则的服务
			*/
			@@ -278,6 +299,11 @@
			* 替换字符
			*/
			public static final String SPECIAL_CHAR = "VCI";
			/**
			* 主数据流程阶段服务
			*/
			@Autowired
			private IMDMIFlowAttrClient imdmiFlowAttrClient;
			// @Autowired
			// private CodeOsbtmtypeMapper codeOsbtmtypeMapper;----

			@@ -349,37 +375,55 @@
			if (baseModels.size() == 0) {
			throw new VciBaseException("未查询到相关数据。");
			}
			// 待完善
			List<BtmTypeVO> cboList = null; // btmTypeClient.selectList(wrapper);
			//还需要修改allCode的生命周期
			// Map<String, String> conditionMap = new HashMap<>();
			QueryWrapper<CodeAllCode> allCodeWrapper = new QueryWrapper<>();
			allCodeWrapper.eq("createcodebtm", baseModelDTO.getBtmname());
			allCodeWrapper.in("createcodeoid", oids);
			// conditionMap.put("createcodeoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
			// conditionMap.put("createcodebtm", baseModelDTO.getBtmname());
			List<CodeAllCode> codeCbos = codeAllCodeService.selectByWrapper(allCodeWrapper);
			// List<ClientBusinessObject> codeCbos = boService.queryCBO(MdmBtmTypeConstant.CODE_ALL_CODE, conditionMap);
			// 回收需要业务数据删除
			List<CodeAllCode> codeCbos = codeAllCodeService.selectByWrapper(allCodeWrapper);// 回收需要业务数据删除
			if (CodeDefaultLC.TASK_BACK.getValue().equals(baseModelDTO.getLcStatus())) {
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(baseModelDTO.getBtmname()));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
			// 直接删除，不给状态
			commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
			// commonsMapper.updateByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()),CodeDefaultLC.TASK_BACK.getValue());
			} else {
			for (BaseModel baseModel : baseModels) {
			baseModel.setLcStatus(baseModelDTO.getLcStatus());
			}
			updateBatchByBaseModel(baseModelDTO.getBtmname(), baseModels);
			// lifeCycleService.transCboStatus(cboList, baseModelDTO.getLcStatus());
			}
			R r = updateBatchByBaseModel(baseModelDTO.getBtmname(), baseModels);
			if(!r.isSuccess()){
			throw new VciBaseException("更新数据出错，重试！"+r.getMsg());
			}
			}
			for (CodeAllCode codeCbo : codeCbos) {
			codeCbo.setLcStatus(baseModelDTO.getLcStatus());
			}
			codeAllCodeService.updateBatchById(codeCbos);
			// lifeCycleService.transCboStatus(codeCbos, baseModelDTO.getLcStatus());
			}

			/**
			* 申请单一编码
			*
			* @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容
			* @return 返回编码的内容
			*/
			@Override
			public String addSaveCode(CodeOrderDTO orderDTO) throws Exception {
			return addSaveCode(orderDTO,true);
			}

			/***
			* 集成可变码段申请接口
			* @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容
			* @return
			* @throws Exception
			*/
			@Override
			public String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception {
			return addSaveCode(orderDTO,authUser);
			}

			/**
			* 申请单一编码
			@@ -387,8 +431,7 @@
			* @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容
			* @return 返回编码的内容
			*/
			@Override
			public String addSaveCode(CodeOrderDTO orderDTO) throws Exception {
			private String addSaveCode(CodeOrderDTO orderDTO, boolean authUser) throws Exception {
			VciBaseUtil.alertNotNull(orderDTO, "编码申请相关的属性和码段的内容都为空", orderDTO.getCodeClassifyOid(), "主题库分类的主键",
			orderDTO.getTemplateOid(), "模板的主键", orderDTO.getCodeRuleOid(), "编码规则的主键");
			CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
			@@ -410,37 +453,43 @@
			checkEnumOnOrder(templateVO, orderDTO);
			//8.处理时间格式，在数据库里面不论是字符串还是日期格式，都使用相同的格式存储
			switchDateAttrOnOrder(templateVO, orderDTO);
			//9.生成编码的信息
			// ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
			BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			// //默认的属性都不用从前端拷贝
			// //设置编码需要的默认属性的内容
			//9.生成编码的信息，初始化业务类型：缓存先取消，因为版本规则会出现变动的情况所以无法使用缓存
			// BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			BaseModel cbo = createBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId().trim().toLowerCase());
			//默认的属性都不用从前端拷贝
			//设置编码需要的默认属性的内容
			copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
			cbo.setOid(VciBaseUtil.getPk());
			cbo.setRevisionOid(VciBaseUtil.getPk());
			cbo.setNameOid(VciBaseUtil.getPk());
			cbo.setCreateTime(new Date());
			cbo.setLastModifyTime(new Date());
			cbo.setCreator(AuthUtil.getUser().getUserName());
			cbo.setLastModifier(AuthUtil.getUser().getUserName());
			// //TODO:因为默认的属性都不拷贝，目前集团码叫name，并没有从DTO拷贝到cbo里。增加一个单独处理，以后再看要不要调整
			//cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));、
			if(authUser) {
			// 要求显示账号，所以做了更改
			cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
			cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
			}else{
			cbo.setCreator(orderDTO.getCreator());
			cbo.setLastModifier(orderDTO.getLastModifier());
			}
			cbo.setTenantId(AuthUtil.getTenantId());
			if(StringUtils.isNotBlank(orderDTO.getLcStatus())\|\|StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
			cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
			}
			//TODO:因为默认的属性都不拷贝，目前集团码叫name，并没有从DTO拷贝到cbo里。增加一个单独处理，以后再看要不要调整
			cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
			// //end -- modify by lihang @20220407
			//end -- modify by lihang @20220407
			List<BaseModel> cboList = new ArrayList<>();

			//备注
			cbo.setDescription(orderDTO.getDescription());
			cboList.add(cbo);
			//
			// cboList.add(cbo);

			List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);


			// List<String> charList = new ArrayList<>();
			// for (BaseModel baseModel : cboList) {
			// charList.add(baseModel.getId());
			// }
			batchSaveSelectChar(templateVO, cboList);
			return codeList.size() > 0 ? codeList.get(0) : "";
			// return null;
			}

			/**
			@@ -465,7 +514,7 @@
			if (!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyInvokeLevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyInvokeLevel())) {
			//指定了层级的
			//注意，因为查询上级分类出来的层级是倒序的，即顶层节点是最大的值
			List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
			List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
			int level = VciBaseUtil.getInt(attrVO.getClassifyInvokeLevel());
			if (classifyVOS.size() >= level && level > 0) {
			classifyVO = classifyVOS.get(level - 1);
			@@ -486,7 +535,6 @@
			});
			}
			}


			/**
			* 判断编码的码段是否输入或者选择了码值
			@@ -548,10 +596,15 @@
			String value = null;
			if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
			value = WebUtil.getStringValueFromObject(WebUtil.getValueFromField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO));
			} else {
			if(StringUtils.isBlank(value)){
			value = orderDTO.getData().getOrDefault(attrId, "");
			}
			} else {
			//说明是自行配置的
			//前端必须要传递小写的属性
			value = orderDTO.getData().getOrDefault(attrId, "");
			String orDefault = orderDTO.getData().getOrDefault(attrId, "");
			value = Func.isBlank(orDefault) ? orderDTO.getData()
			.getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault;
			}
			return value;
			}
			@@ -647,17 +700,23 @@
			});

			//没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可

			if (!CollectionUtils.isEmpty(conditionMap)) {
			// TODO: 同一个库判重不需要区分分类oid
			// conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
			// final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
			// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
			//final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
			final String[] sql = {"select id from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
			conditionMap.forEach((key, value) -> {
			sql[0] += " and " + key + " = " + value;
			if(StringUtils.isBlank(value)\|\|value.equals(QueryOptionConstant.ISNULL)) {
			sql[0] += " and " + key + " is null";
			}else{
			sql[0] += " and " + key + " = " + value;
			}
			});
			if (StringUtils.isNotBlank(orderDTO.getOid())) {
			//修改的时候，需要排除自己
			@@ -666,16 +725,108 @@
			sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
			}
			sql[0] += " and lastR = '1' and lastV = '1' ";
			String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
			if(Func.isNotEmpty(isParticipateCheckOids)){
			sql[0] += " and codeclsfid not in(" + isParticipateCheckOids + ")";
			}
			// if (boService.queryCountBySql(sql[0], new HashMap<>()) > 0) {
			if (Integer.parseInt(commonsMapper.selectById(sql[0]).get(0)) > 0) {
			List<String> repeatData = commonsMapper.selectList(sql[0]);
			if (!repeatData.isEmpty()) {
			String ruleInfoMsg = keyRuleVO == null ? "" : "查询规则：去除空格--{0},忽略大小写--{1},忽略全半角--{2},忽略全部空格--{3}";
			String[] objs = new String[]{trim ? "是" : "否", ignoreCase ? "是" : "否", ignoreWidth ? "是" : "否", trimAll ? "是" : "否"};
			throw new VciBaseException("根据您填写的关键属性的内容，结合关键属性查询规则，发现这个数据已经在系统中存在了。请修正!。" + ruleInfoMsg, objs);
			throw new VciBaseException("根据您填写的关键属性的内容，结合关键属性查询规则，发现该数据已经与系统中编号为"+repeatData.stream().collect(Collectors.joining(","))+"的数据重复。请修正!。" + ruleInfoMsg, objs);
			}
			}
			}

			/**
			/**
			* 校验关键属性
			*
			* @param orderDTO 编码申请的相关的信息
			*/
			@Override
			public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) {
			List<Map>dataList=new ArrayList<>();
			CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
			CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
			//先获取关键属性的规则，也利用继承的方式
			CodeKeyAttrRepeatVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
			//注意的是keyRuleVO可能为空，表示不使用规则控制
			//获取所有的关键属性
			Map<String, CodeClassifyTemplateAttrVO> ketAttrMap = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getKeyAttrFlag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
			Map<String, String> conditionMap = new HashMap<>();
			boolean trimAll = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
			//全部去空的优先级大于去空
			boolean trim = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
			boolean ignoreCase = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
			boolean ignoreWidth = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
			ketAttrMap.forEach((attrId, attrVO) -> {
			String value = getValueFromOrderDTO(orderDTO, attrId);
			if (value == null) {
			value = "";
			}
			wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
			});

			//没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可
			if (!CollectionUtils.isEmpty(conditionMap)) {
			conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
			// final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
			// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			final String[] sql = {"select * from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
			conditionMap.forEach((key, value) -> {
			if(StringUtils.isBlank(value)\|\|value.equals(QueryOptionConstant.ISNULL)) {
			sql[0] += " and " + key + " is null";
			}else{
			sql[0] += " and " + key + " = " + value;
			}
			});
			if (StringUtils.isNotBlank(orderDTO.getOid())) {
			//修改的时候，需要排除自己
			sql[0] += " and oid != '" + orderDTO.getOid() + "'";
			} else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
			sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
			}
			sql[0] += " and lastR = '1' and lastV = '1' ";
			// if (boService.queryCountBySql(sql[0], new HashMap<>()) > 0) {
			dataList=commonsMapper.selectBySql(sql[0]);
			if (!CollectionUtils.isEmpty(dataList)) {
			// String ruleInfoMsg = keyRuleVO == null ? "" : "查询规则：去除空格--{0},忽略大小写--{1},忽略全半角--{2},忽略全部空格--{3}";
			// String[] objs = new String[]{trim ? "是" : "否", ignoreCase ? "是" : "否", ignoreWidth ? "是" : "否", trimAll ? "是" : "否"};
			// throw new VciBaseException("根据您填写的关键属性的内容，结合关键属性查询规则，发现这个数据已经在系统中存在了。请修正!。" + ruleInfoMsg, objs);
			return dataList;
			}
			}
			return dataList;
			}

			/**
			* 根据当前申请编码的分类，逐层往上校验是否符合属于配置的中的分类子节点的分
			* 类，如果符合，则该分类申请的编码为集团码返回true，反之则为企业编码返回false
			* @param parameter 传入数据,classifyGroupCode:配置的中的分类顶节点，oid：选择节点的oid
			*/
			@Override
			public R checkGroupCode(Map<String, String> parameter) {
			List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParentByOid(parameter.get("oid"));
			Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet());
			// Boolean checkGroupFlag = false;//是否查询到配置的顶层分类中
			for (int i = codeClassifyList.size()-1; i >= 0; i--) {
			if(configGroupCode.contains(codeClassifyList.get(i).getId())){
			// checkGroupFlag = true;
			return R.data("true");
			}
			// if(checkGroupFlag && parameter.get("nowApplyCode").equals(codeClassifyList.get(i).getId())){
			// return R.data(true);
			// }
			}
			return R.data("false");
			}

			/**
			* 封装关键属性的查询语句
			*
			* @param value 当前的值
			@@ -694,7 +845,7 @@
			boolean ignoreSpace = trim \|\| trimAll;
			if (StringUtils.isBlank(value)) {
			//为空的时候，不能用QueryOperation.ISNULL，平台不知道啥时候不处理这种了
			conditionMap.put("t." + attrId, "null");
			conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
			} else {
			if (keyRuleVO != null) {
			String queryKey = "";
			@@ -730,8 +881,12 @@
			queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
			conditionMap.put(queryKey, queryValue);
			} else {
			//为空的时候不代表不校验，只是不去除相关的信息
			conditionMap.put("t." + attrId, value);
			if(StringUtils.isNotBlank(value)) {
			//为空的时候不代表不校验，只是不去除相关的信息
			conditionMap.put("t." + attrId, "'" + value + "'");
			}else{
			conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
			}
			}
			}
			}
			@@ -800,10 +955,6 @@
			} else {
			fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
			}

			// BeanUtils.
			// BeanUtils.copyProperties(orderDTO.getData(),cbo);
			// cbo.setMaterialtype(Short.valueOf("1001"));
			orderDTO.getData().forEach((key, value) -> {
			if (!edit \|\| (!checkUnAttrUnEdit(key) &&
			!VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
			@@ -814,9 +965,6 @@
			}
			}
			});
			// BeanMap beanMap = BeanMap.create(cbo);
			// beanMap.putAll(orderDTO.getData());

			try {
			Map<String, String> data = new HashMap<>();
			data.put(cbo.getData().containsKey(CODE_CLASSIFY_OID_FIELD.toUpperCase())?CODE_CLASSIFY_OID_FIELD.toUpperCase():CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
			@@ -824,7 +972,8 @@
			data.put(cbo.getData().containsKey(CODE_FULL_PATH_FILED.toUpperCase())?CODE_FULL_PATH_FILED.toUpperCase():CODE_FULL_PATH_FILED, fullPath);
			cbo.getData().putAll(data);
			cbo.setLastModifyTime(new Date());
			cbo.setLastModifier(AuthUtil.getUser().getUserName());
			//cbo.setLastModifier(AuthUtil.getUser().getUserName());
			cbo.setLastModifier(AuthUtil.getUser().getAccount());
			cbo.setTs(new Date());
			if (!edit && StringUtils.isBlank(orderDTO.getLcStatus())) {
			//TODO 先写固定，后面生命周期好了在编写
			@@ -834,10 +983,10 @@
			// cbo.setLcStatus("Editing");
			//// cbo.setLcStatus(lifeCycleVO.getStartStatus());
			// } else {
			cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
			cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
			// }
			} else {
			cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
			cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
			}

			}
			@@ -852,7 +1001,6 @@
			logger.error("设置默认的属性的值错误", e);
			}
			}


			/**
			* 初始化业务类型
			@@ -878,7 +1026,7 @@
			return (BaseModel) valueWrapper.get();
			} catch (Exception e) {
			logger.error("创建业务类型对象", e);
			throw new VciBaseException("initBtmError", new String[]{btmName});
			throw new ServiceException("initBtmError:"+"业务类型："+btmName+":"+e.getMessage());
			}
			}

			@@ -897,22 +1045,22 @@
			List<CodeClassifyTemplateAttrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryIdentification())).collect(Collectors.toList());

			if (!CollectionUtils.isEmpty(selectAttrVOs)) {
			// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			selectAttrVOs.parallelStream().forEach(attrVO -> {
			List<String> valuesList = new ArrayList<>();
			cboList.parallelStream().forEach(cbo -> {
			// String value = cbo.get.getAttributeValue(attrVO.getId());
			//String value = cbo.get.getAttributeValue(attrVO.getId());

			//将bean转为map,mybatis统一处理
			Map<String, String> map = null;

			// baseModels.stream().forEach(model-> {
			//baseModels.stream().forEach(model-> {
			try {
			map = VciBaseUtil.convertBean2Map(cbo);
			map = VciBaseUtil.convertBean2Map(cbo,null);
			} catch (Exception e) {
			throw new VciBaseException("类型转换错误：" + e.getMessage());
			}
			// });
			//});

			String value = map.get(attrVO.getId());
			if (StringUtils.isNotBlank(value)) {
			@@ -934,6 +1082,26 @@
			}
			}
			}

			/**
			* 封装开关的内容，常用于导出
			* @param dataMap 数据的内容
			* @param templateVO 模板的显示
			*/
			@Override
			public void wrapperBoolean(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO){
			List<String> booleanAttributes = templateVO.getAttributes().stream().filter(s -> VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(s.getAttributeDataType())).map(s -> s.getId().toLowerCase(Locale.ROOT)).collect(Collectors.toList());
			if(!CollectionUtils.isEmpty(booleanAttributes)){
			dataMap.stream().forEach(data -> {
			booleanAttributes.stream().forEach(attrId->{
			if(data.containsKey(attrId)){
			String value = data.get(attrId);
			data.put(attrId,BooleanEnum.TRUE.getValue().equalsIgnoreCase(value)?"是":"否");
			}
			});
			});
			}
			}

			@Override
			public MdmUIInfoVO getFormDefineByTemplateOid(String templateOid, String codeClassifyOid) {
			@@ -985,7 +1153,11 @@
			lineVO.setField(attrVO.getId() + "_line");
			lineVO.setType("line");
			lineVO.setText(key);
			//找位置
			List<CodeClassifyTemplateAttrVO> collect = value.stream().filter(s -> "true".equals(s.getFormDisplayFlag())).collect(Collectors.toList());
			if(collect.size() == 0){
			continue;
			}
			//找位置
			for (int i = 0; i < itemVOS.size(); i++) {
			UIFormItemVO record = itemVOS.get(i);
			if (record.getField().equalsIgnoreCase(attrVO.getId())) {
			@@ -1087,8 +1259,9 @@
			itemVO.setType("refer");
			itemVO.setShowField(itemVO.getField() + "name");
			if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
			//配置的内容
			itemVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
			// 配置的内容
			// itemVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
			itemVO.setReferConfig(referConfigToUIUiTable(attrVO.getReferConfig()));
			} else {
			UIFormReferVO formReferVO = new UIFormReferVO();
			formReferVO.setType("default");
			@@ -1202,7 +1375,8 @@
			fieldVO.setShowField(fieldVO.getField());
			if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
			//配置的内容
			fieldVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
			// fieldVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
			fieldVO.setReferConfig(referConfigToUIUiTable(attrVO.getReferConfig()));
			} else {
			UIFormReferVO formReferVO = new UIFormReferVO();
			formReferVO.setType("default");
			@@ -1230,11 +1404,61 @@
			}
			fieldVO.setOptionJsMap(eventJsMap);
			fieldVO.setStyle(attrVO.getTableDisplayStyle());
			fieldVO.setTableDisplayFlag(attrVO.getTableDisplayFlag());
			//列表里不允许直接编辑
			fieldVO.setDateFormate(attrVO.getCodeDateFormat());
			return fieldVO;
			}

			/**
			* 将referconfig转换为JSON格式的UIFormReferVO
			* @param codeReferConfigVO
			* @return
			*/
			private UIFormReferVO referConfigToUIUiTable(String codeReferConfigVO){
			CodeReferConfigVO codeReferConfig = JSONObject.parseObject(codeReferConfigVO, CodeReferConfigVO.class);
			// 拷贝为以前的老对象
			UIFormReferVO uiFormReferVO = new UIFormReferVO();
			org.springblade.core.tool.utils.BeanUtil.copy(codeReferConfig,uiFormReferVO);

			// 表格的自定义定义
			UITableCustomDefineVO uiTableConfigVO = new UITableCustomDefineVO();
			uiTableConfigVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1));
			// 列表的列的信息转换
			List<UITableFieldVO> uiTableFieldVOs = new ArrayList<>();
			// 快速查询列
			List<UITableFieldVO> queryColumns = new ArrayList<>();
			if(!CollectionUtils.isEmpty(codeReferConfig.getCodeShowFieldConfigVOS())){
			codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{
			UITableFieldVO tableColVO = new UITableFieldVO();
			org.springblade.core.tool.utils.BeanUtil.copy(showField,tableColVO);
			tableColVO.setSortField(showField.getAttrSortField());
			uiTableFieldVOs.add(tableColVO);
			if(showField.getIsQuery().equals("true")){
			queryColumns.add(tableColVO);
			}
			});
			}
			// 显示的列
			uiTableConfigVO.setCols(uiTableFieldVOs);
			// 快速查询列
			uiTableConfigVO.setQueryColumns(queryColumns);
			//set给表格配置属性
			uiFormReferVO.setTableConfig(uiTableConfigVO);
			//字段名不一致，需要手动set

			uiFormReferVO.setMuti(StringUtils.isBlank(codeReferConfig.getIsMuti())?false:true);
			uiFormReferVO.setInitSort(new UIFieldSortVO(codeReferConfig.getSortField(),codeReferConfig.getSortType()));
			// 筛选条件
			HashMap<String, String> whereMap = new HashMap<>();
			if(!CollectionUtils.isEmpty(codeReferConfig.getCodeSrchCondConfigVOS())){
			codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
			whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue());
			});
			}
			uiFormReferVO.setWhere(whereMap);
			return uiFormReferVO;
			}

			/**
			* 相似项查询
			@@ -1366,7 +1590,6 @@
			}
			}


			/**
			* 查询编码数据的列表
			*
			@@ -1380,7 +1603,16 @@
			public DataGrid<Map<String, String>> queryGrid(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper) {
			CodeTemplateAttrSqlBO sqlBO = getSqlByTemplateVO(btmType, templateVO, conditionMap, pageHelper);
			// List<Map> maps = boService.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
			List<Map<String, String>> maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
			List<Map<String, String>> maps = null;
			try {
			maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
			}catch (Exception e){
			String errorMessage = e.getMessage();
			if (errorMessage.contains("无法解析的成员访问表达式")) {
			throw new ServiceException("缺少"+errorMessage.substring(errorMessage.indexOf("[t.") + 1, errorMessage.indexOf("]"))+"字段");
			}
			throw new ServiceException(e.getMessage());
			}

			DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
			List<Map<String, String>> dataList = new ArrayList<>();
			@@ -1388,7 +1620,7 @@
			maps.stream().forEach(map -> {
			Map<String, String> data = new HashMap<>();
			for (String s : map.keySet()) {
			data.put(s.toLowerCase(Locale.ROOT), String.valueOf(map.get(s)));
			data.put(s.toLowerCase(Locale.ROOT), map.get(s)==null?null:String.valueOf(map.get(s)));
			}
			// map.forEach((key, value) -> {
			// data.put(((String) key).toLowerCase(Locale.ROOT), String.valueOf(value));
			@@ -1568,7 +1800,6 @@
			}
			}


			/**
			* 根据模板属性生成相应的sql信息
			*
			@@ -1734,6 +1965,8 @@
			String sqlHasPage = pageHelper.getLimit() > 0 ? ("select * from (select A.*,rownum RN from (" + sql + whereSubfixForPage) : sql;
			String sqlCount = "select count(1) from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
			+ (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
			String sqlId = "select ID from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
			+ (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
			CodeTemplateAttrSqlBO sqlBO = new CodeTemplateAttrSqlBO();
			sqlBO.setTableName(tableName);
			sqlBO.setJoinTable(joinTableList);
			@@ -1742,9 +1975,9 @@
			sqlBO.setSqlHasPage(sqlHasPage);
			sqlBO.setSqlCount(sqlCount);
			sqlBO.setSqlUnPage(sql);
			sqlBO.setSqlId(sqlId);
			return sqlBO;
			}


			/**
			* 组合查询条件的sql
			@@ -1763,7 +1996,7 @@
			//说明还是参照里面的，我们默认这种情况下都是字符串吧，因为参照的属性不一定用的平台的属性池里的，所以大部分情况下，显示的属性都是字符串吧
			return referFieldMap.get(field) + SPACE + "LIKE" + SPACE + "'%" + value + "%'" + SPACE;
			} else {
			return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "'%" + getStringValueInWhere(field, value, attrVOMap) + "%'" + SPACE;
			return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "'%" + value + "%'" + SPACE;
			}
			} else if (key.endsWith("_notequal")) {
			String field = UBCSSqlKeyword.getColumn(key, "_notequal");
			@@ -1798,7 +2031,7 @@
			if (referFieldMap.containsKey(field)) {
			return referFieldMap.get(field) + SPACE + " >= " + value + SPACE;
			} else {
			return (field.contains(".") ? "" : "t.") + field + SPACE + " >= " + getStringValueInWhere(value, field, attrVOMap) + SPACE;
			return (field.contains(".") ? "" : "t.") + field + SPACE + " >= " + getStringValueInWhere(field, value, attrVOMap) + SPACE;
			}
			} else if (key.endsWith("_le")) {
			//说明是<=的。我们需要先获取一下
			@@ -1883,7 +2116,7 @@
			if (referFieldMap.containsKey(field)) {
			return referFieldMap.get(field) + SPACE + "= '" + value + "'" + SPACE;
			} else {
			return (field.contains(".") ? "" : "t.") + field + SPACE + "= '" + getStringValueInWhere(field, value, attrVOMap) + "'" + SPACE;
			return (field.contains(".") ? "" : "t.") + field + SPACE + "= " + getStringValueInWhere(field, value, attrVOMap) + "" + SPACE;
			}
			} else {
			// if (referFieldMap.containsKey(key)) {
			@@ -1995,7 +2228,7 @@
			}
			R<BtmTypeVO> r = btmTypeClient.getDefaultAttrByBtmId(btmType);
			List<BtmTypeAttributeVO> attributes = r.getData().getAttributes();
			if (r.getCode() != 200 \|\| attributes.isEmpty()) {
			if (!r.isSuccess() \|\| attributes.isEmpty()) {
			return false;
			}
			return attributes.stream().anyMatch(item -> item.getId().equals(selectKey));
			@@ -2016,13 +2249,21 @@
			sql.append("t.");
			}
			if (value.startsWith(QueryOptionConstant.IN)) {
			sql.append(selectKey)
			if(value.startsWith(QueryOptionConstant.IN+"('") && value.endsWith("')")){
			sql.append(selectKey)
			.append(SPACE)
			.append("in")
			.append(SPACE)
			.append(value.replace(QueryOptionConstant.IN, ""));
			}else{
			sql.append(selectKey)
			.append(SPACE)
			.append("in")
			.append(SPACE)
			.append("(")
			.append(value.replace(QueryOptionConstant.IN, ""))
			.append(")");
			}
			} else if (value.startsWith(QueryOptionConstant.NOTIN)) {
			sql.append(selectKey)
			.append(SPACE)
			@@ -2171,9 +2412,12 @@
			}
			// cbo.getData().putAll(orderDTO.getData());
			cbo.setLastModifyTime(new Date());
			cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
			updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId(), Collections.singletonList(cbo));
			batchSaveSelectChar(templateVO, Collections.singletonList(cbo));
			cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
			R r = updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId(), Collections.singletonList(cbo));
			if(!r.isSuccess()){
			throw new ServiceException(r.getMsg());
			}
			batchSaveSelectChar(templateVO, Collections.singletonList(cbo));
			}

			/**
			@@ -2211,7 +2455,7 @@
			}

			//只能删除自己创建的数据
			String userId = String.valueOf(AuthUtil.getUser().getUserId());
			String userId = String.valueOf(AuthUtil.getUser().getAccount());
			for (BaseModel clientBusinessObject : cboList) {
			String creator = clientBusinessObject.getCreator();
			if (!userId.equalsIgnoreCase(creator)) {
			@@ -2223,10 +2467,10 @@
			// batchCBO.getDeleteCbos().addAll(cboList);
			// WebUtil.setPersistence(false);
			// batchCBO.copyFromOther(
			productCodeService.recycleCode(classifyFullInfo.getCurrentClassifyVO().getBtmTypeId(), deleteBatchDTO.getOidList());
			productCodeService.recycleCode(classifyFullInfo.getTopClassifyVO().getBtmTypeId(), deleteBatchDTO.getOidList());
			// baseMapper.deleteBatchIds(cboList);
			//使用传入的业务类型查询表
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getCurrentClassifyVO().getBtmTypeId()));
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			@@ -2250,7 +2494,6 @@
			//找阶段
			return phaseAttrService.listAttrByTemplateOidAndPhaseId(templateVO.getOid(), phase);
			}


			/**
			* 路径上包含当前分类的所有分类信息
			@@ -2303,16 +2546,18 @@
			if (conditionMap == null) {
			conditionMap = new HashMap<>();
			}
			//pageHelper.addDefaultDesc("createTime");
			pageHelper.addDefaultDesc("id");
			pageHelper.addDefaultDesc("createTime");
			// pageHelper.addDefaultDesc("id");
			if (!classifyService.checkHasChild(codeClassifyOid)) {
			conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
			} else {
			// conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)

			List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
			if(Func.isEmpty(classifyData)){
			throw new ServiceException("业务类型中英文名称和查询条件配置不一致，请修改业务类型中分类表英文名称为"+MdmBtmTypeConstant.CODE_CLASSIFY);
			}
			conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
			btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY))
			.getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
			classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
			.FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid +
			"' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
			}
			@@ -2358,27 +2603,22 @@
			List<BaseModel> updateList = new ArrayList<>();
			// 应该都是一个分类下的业务数据，找第一条的就行
			CodeClassifyFullInfoBO topClassifyFullInfo = classifyService.getClassifyFullInfo(orderDTOList.get(0).getCodeClassifyOid());
			// Map<String,String> cboOidMap = new HashMap<>();
			if (CollectionUtils.isEmpty(orderDTOMap.keySet())) {
			throw new VciBaseException(DATA_OID_NOT_EXIST);
			}

			List<BaseModel> cboList = selectByTypeAndOid(topClassifyFullInfo.getTopClassifyVO().getBtmTypeId(), VciBaseUtil.array2String(orderDTOMap.keySet().toArray(new String[0])));
			// cboOidMap.put("oid",QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(orderDTOMap.keySet().toArray(new String[0])) + ")");
			// List<ClientBusinessObject> cboList = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), cboOidMap);
			if (CollectionUtils.isEmpty(cboList)) {
			if (CollectionUtils.isEmpty(cboList)) {
			throw new VciBaseException(DATA_OID_NOT_EXIST);
			}
			// BatchCBO batchCBO = new BatchCBO();
			// CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
			Map<String, BaseModel> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			Map<String, BaseModel> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			orderDTOMap.keySet().stream().forEach(oid -> {
			CodeOrderDTO orderDTO = orderDTOMap.get(oid);
			CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
			CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
			BaseModel cbo = cboMap.get(oid);
			String code = cbo.getId();
			if (!cbo.getTs().toString().contains(orderDTO.getTs().toString())) {
			if (!cbo.getTs().toString().contains(VciDateUtil.date2Str(orderDTO.getTs(), VciDateUtil.DateTimeFormat))) {
			throw new VciBaseException("数据不是最新的，可能他人已经修改，请刷新后再试");
			}
			if (!CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(cbo.getLcStatus()) && !orderDTO.isEditInProcess()) {
			@@ -2404,21 +2644,13 @@
			//企业码和集团码的不修改
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			// try {
			// cbo.setAttributeValue("id",code);
			cbo.setId(code);
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription());
			// cbo.setAttributeValueWithNoCheck("description", StringUtils.isBlank(orderDTO.getDescription())?"":orderDTO.getDescription());
			// cbo.setAttributeValue("name", orderDTO.getName());
			cbo.setName(orderDTO.getName());
			// } catch (VCIError e) {
			// e.printStackTrace();
			// }
			// batchCBO.getUpdateCbos().add(cbo);

			updateList.add(cbo);
			batchSaveSelectChar(firstTemplateVO, cboList);
			});
			// boService.persistenceBatch(batchCBO);
			updateBatchByBaseModel(topClassifyFullInfo.getTopClassifyVO().getBtmTypeId(), updateList);
			return R.success("操作成功！");
			}
			@@ -2524,17 +2756,10 @@
			orderDTO.getCodeClassifyOid(), "主题库分类的主键");

			//需要升版
			// ClientBusinessObjectOperation cboOperation = new ClientBusinessObjectOperation();
			BaseModel cbo = null;
			// try {
			// //cbo = cboOperation.createBusinessObjectVersion(oldCbo,VciBaseUtil.getCurrentUserId());
			cbo = reviseBusinessObject(oldCbo);
			// } catch (VCIError e) {
			// throw new VciBaseException("初始化相关的内容出现了错误", new String[0], e);
			// }
			//1. 判断必输项
			//CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
			checkRequiredAttrOnOrder(templateVO, orderDTO);
			checkRequiredAttrOnOrder(templateVO, orderDTO);
			//2.先注入，再组合，最后校验
			switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
			//3.处理组合规则。组合规则不能使用编码的属性，因为编码的生成可能是需要属性的
			@@ -2552,20 +2777,18 @@
			//企业码和集团码的不修改
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			// try {
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription());
			// cbo.setAttributeValueWithNoCheck("description", StringUtils.isBlank(orderDTO.getDescription())?"":orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			// } catch (VCIError e) {
			// e.printStackTrace();
			// }
			//数据的时候，编码是不变的
			cbo.setCreateTime(cbo.getCreateTime());
			cbo.setCreator(cbo.getCreator());
			cbo.setLastModifyTime(cbo.getLastModifyTime());
			// List<ClientBusinessObject> cboList = new ArrayList<>();
			// cboList.add(cbo);
			cbo.setTenantId(AuthUtil.getTenantId());
			oldCbo.setLastV("0");
			oldCbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
			oldCbo.setLastModifyTime(new Date());
			try {
			// cboOperation.saveRevisionBuinessObject(cbo);
			updateBatchByBaseModel(oldCbo.getBtmname(), Collections.singletonList(oldCbo));
			insertBatchByType(cbo.getBtmname(), Collections.singletonList(cbo));
			} catch (Exception vciError) {
			throw new VciBaseException("数据更改保存出错了", new String[0], vciError);
			@@ -2598,12 +2821,102 @@
			String codeRuleOid = classifyVO.getCodeRuleOid();
			if (StringUtils.isBlank(codeRuleOid)) {
			//往上找
			CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
			return getCodeRuleByClassifyFullInfo(fullInfo);
			CodeRuleVO classifyFullInfoCodeRule = getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
			return toCodeValueApplyStatus(classifyFullInfoCodeRule);
			}
			//我们查询编码规则
			return ruleService.getObjectHasSecByOid(codeRuleOid);
			//查询编码规则
			CodeRuleVO objectHasSecByOid = ruleService.getObjectHasSecByOid(codeRuleOid);
			return toCodeValueApplyStatus(objectHasSecByOid);
			}

			/**
			* 编码申请表单，隐藏、可输、只读转换
			* @param codeRuleVO
			* @return
			*/
			private CodeRuleVO toCodeValueApplyStatus(CodeRuleVO codeRuleVO){
			if(codeRuleVO.getSecVOList().isEmpty()){
			return codeRuleVO;
			}
			// 可输码段类型
			List<String> inputTypes = Arrays.asList(
			CodeSecTypeEnum.CODE_FIXED_SEC.getValue(),
			CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(),
			CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(),
			CodeSecTypeEnum.CODE_REFER_SEC.getValue(),
			CodeSecTypeEnum.CODE_DATE_SEC.getValue()
			);
			// 只读码段类型
			List<String> readOnlyTypes = Arrays.asList(
			CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(),
			CodeSecTypeEnum.CODE_ATTR_SEC.getValue()
			);
			// 隐藏码段类型
			/*List<String> hideType = Arrays.asList(
			CodeSecTypeEnum.CODE_SERIAL_SEC.getValue()
			);*/
			// 当前规则的所有类型码段
			List<String> secTypeList = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.toList());
			// 情况一全部是只读的码段类型
			boolean hasAllReadOnlyType =secTypeList.stream().allMatch(item -> readOnlyTypes.stream().anyMatch(item1-> item.equals(item1)));
			// 全部是只读的码段类型
			if(hasAllReadOnlyType){
			List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
			secVO.setCodeValueApplyStatus(3);
			// 日期码段设置默认值
			if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
			try {
			secVO.setCodeDateValue(Func.format(new Date(),secVO.getCodeDateFormatStr()));
			}catch (Exception e){
			throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
			}
			}
			return secVO;
			}).collect(Collectors.toList());
			codeRuleVO.setSecVOList(basicSecVOS);
			return codeRuleVO;
			}
			// 情况二全部都是可输入类型的
			boolean hasAllInputType = secTypeList.stream().allMatch(item -> inputTypes.stream().anyMatch(item1-> item.equals(item1)));
			if(hasAllInputType){
			List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
			secVO.setCodeValueApplyStatus(1);
			// 日期码段设置默认值
			if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
			try {
			secVO.setCodeDateValue(Func.format(new Date(),secVO.getCodeDateFormatStr()));
			}catch (Exception e){
			throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
			}
			}
			return secVO;
			}).collect(Collectors.toList());
			codeRuleVO.setSecVOList(basicSecVOS);
			return codeRuleVO;
			}
			// 情况三包含人为选择的码段，又有只读类型码段的，所有码段都要显示出来，可输设置为1，只读设置为2，隐藏设置为3
			List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
			if(inputTypes.contains(secVO.getSecType())){
			secVO.setCodeValueApplyStatus(1);
			}else if(readOnlyTypes.contains(secVO.getSecType())){
			secVO.setCodeValueApplyStatus(2);
			}else{
			secVO.setCodeValueApplyStatus(3);
			}
			// 日期码段设置默认值
			if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
			try {
			secVO.setCodeDateValue(Func.format(new Date(),secVO.getCodeDateFormatStr()));
			}catch (Exception e){
			throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
			}
			}
			return secVO;
			}).collect(Collectors.toList());
			codeRuleVO.setSecVOList(basicSecVOS);
			codeRuleVO.setIsShowHideStatus(hasAllReadOnlyType ? "readOnly":(hasAllInputType ? "input":"readAndInput"));
			return codeRuleVO;
			}

			/**
			* 使用分类的全部信息获取编码规则
			@@ -2620,11 +2933,11 @@
			} else {
			if (CollectionUtils.isEmpty(fullInfoBO.getParentClassifyVOs())) {
			//说明已经是最高层级,
			throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
			throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
			}
			List<CodeClassifyVO> parentClassifyVOList = fullInfoBO.getParentClassifyVOs().stream().sorted((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel())).collect(Collectors.toList());
			//从最高的level开始获取
			for (int i = 0; i < parentClassifyVOList.size(); i++) {
			for (int i = parentClassifyVOList.size()-1; i >= 0; i--) {
			CodeClassifyVO record = parentClassifyVOList.get(i);
			if (StringUtils.isNotBlank(record.getCodeRuleOid())) {
			codeRuleOid = record.getCodeRuleOid();
			@@ -2632,7 +2945,7 @@
			}
			}
			if (StringUtils.isBlank(codeRuleOid)) {
			throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
			throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
			}
			}
			return ruleService.getObjectHasSecByOid(codeRuleOid);
			@@ -2661,7 +2974,7 @@
			cbosB.stream().forEach(map -> {
			Map<String, String> data = new HashMap<>();
			for (Object o : map.keySet()) {
			data.put(((String) o).toLowerCase(Locale.ROOT), String.valueOf(map.get(o)));
			data.put(((String) o).toLowerCase(Locale.ROOT), map.get(o)==null?"":String.valueOf(map.get(o)));
			}
			cbos.add(data);
			});
			@@ -2678,7 +2991,7 @@
			wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
			R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
			//我们要看是否不是升版的，升版的话，需要对比不相等的属性
			String copy = cbo.get("copyfromversion");
			/* String copy = cbo.get("copyfromversion");
			// if (StringUtils.isBlank(copy)) {
			// copy = cbo.getAttributeValue("copyfromversion");
			// }
			@@ -2697,11 +3010,12 @@
			Map<String, String> difFieldMap = new HashMap<>();
			Map<String, String> finalOldData = oldData;
			cbo.forEach((key, value) -> {
			String oldValue = finalOldData.getOrDefault(key, "");
			if (value == null) {
			// 这儿oldmap中的全是大写，而cbo中的全是小写所以会拿不到只，这儿直接处理成小写拿不到就用大写拿
			String oldValue = String.valueOf(finalOldData.getOrDefault(key.toUpperCase(Locale.ROOT), finalOldData.getOrDefault(key, "")));
			if (value == null \|\| value == "null") {
			value = "";
			}
			if (oldValue == null) {
			if (oldValue == null \|\| oldValue == "null") {
			oldValue = "";
			}
			if (!value.equalsIgnoreCase(oldValue)) {
			@@ -2712,7 +3026,7 @@
			difFieldList.add(difFieldMap);
			result.setData(difFieldList);
			}
			}
			}*/
			return result;
			}

			@@ -2856,6 +3170,51 @@
			wrapperResemble(templateVO, uiInfoVO);
			return uiInfoVO;
			}

			/**
			* 使用分类的主键获取表格的定义-ubcs后修改获取流程阶段熟悉获取方法
			* @param codeClassifyOid
			* @param templateId
			* @param taskId
			* @param modelKey
			* @return
			*/
			public MdmUIInfoVO getTableDefineByClassifyOid_v2(String codeClassifyOid,String templateId,String taskId,String modelKey) {
			MdmUIInfoVO uiInfoVO = new MdmUIInfoVO();
			CodeClassifyTemplateVO templateVO = getUsedTemplateByClassifyOid(codeClassifyOid);
			uiInfoVO.setTemplateVO(templateVO);
			UITableDefineVO uiTableDefineVO = wrapperTableDefineByTemplate(templateVO, true);
			R<List<ProcessStageAttrVO>> r = imdmiFlowAttrClient.ssslist(templateId,modelKey,taskId);
			List<ProcessStageAttrVO> stageAttrVOS = r.getData();
			List<String> attrList = new ArrayList<>();
			stageAttrVOS.stream().forEach(attr->{
			attrList.add(attr.getAttrId());
			});
			uiTableDefineVO.getCols().stream().forEach(list -> {
			List<UITableFieldVO> visiableTableField = new ArrayList<>();
			visiableTableField = list.stream().filter(col ->
			attrList.stream().anyMatch(s -> StringUtils.equalsIgnoreCase(col.getField(), s) \|\|
			(StringUtils.equalsIgnoreCase(col.getFieldType(), "combox") && StringUtils.equalsIgnoreCase(col.getSortField(), s))
			\|\| (StringUtils.equalsIgnoreCase(col.getFieldType(), "refer") && StringUtils.equalsIgnoreCase(col.getQueryField(), s))
			)).collect(Collectors.toList());

			visiableTableField.stream().forEach(vo -> {
			uiTableDefineVO.setHasEditor(true);
			if ("refer".equalsIgnoreCase(vo.getFieldType())) {
			setReferConfig2EditConfig(vo);
			} else if ("combox".equalsIgnoreCase(vo.getFieldType())) {
			setComboxConfig2EditConfig(vo);
			} else if (StringUtils.isNotBlank(vo.getDateFormate())) {
			vo.setEdit("date");
			} else {
			vo.setEdit(vo.getFieldType());
			}
			});
			});
			uiInfoVO.setTableDefineVO(uiTableDefineVO);
			wrapperResemble(templateVO, uiInfoVO);
			return uiInfoVO;
			}

			/**
			* 模板属性转换为表格定义的信息
			@@ -3025,7 +3384,6 @@
			return getTableDefineByTemplateVO(templateService.getObjectHasAttrByOid(templateOid));
			}


			/**
			* 使用模板显示对象转换为表格的信息（包含扩展的按钮）
			*
			@@ -3123,6 +3481,34 @@
			return uiInfoVO;
			}

			@Override
			public MdmUIInfoVO getFlowUIInfoByClassifyOid(String codeClassifyOid, String functionId,String templateId,String taskId,String modelKey){
			// MdmUIInfoVO uiInfoVO = getTableDefineByClassifyOid_v2(codeClassifyOid,templateId,taskId,modelKey);
			MdmUIInfoVO uiInfoVO = getTableDefineByTemplateVO(getUsedTemplateByClassifyOid(codeClassifyOid));
			R<List<ProcessStageAttrVO>> r = imdmiFlowAttrClient.ssslist(templateId,modelKey,taskId);
			List<ProcessStageAttrVO> stageAttrVOS = r.getData();
			Set<String> attrSet = new HashSet<>();
			stageAttrVOS.stream().forEach(attr->{
			attrSet.add(attr.getAttrId());
			});

			try {

			UITableDefineVO tableDefineVO = uiInfoVO.getTableDefineVO();
			List<List<UITableFieldVO>> tableFieldVOs = tableDefineVO.getCols();
			List<UITableFieldVO> uiTableFieldVOS = tableFieldVOs.get(0);
			uiTableFieldVOS.stream().forEach(ui->{
			// if(!attrSet.contains(ui.getField())){
			// ui.setEdit(null);
			// ui.setEditConfig(null);
			// }
			});
			}catch (Exception e){
			throw new ServiceException("模板没有定义属性，读取表头失败!");
			}
			return uiInfoVO;
			}

			/**
			* 使用分类主键获取工具栏中的按钮信息
			*
			@@ -3172,17 +3558,124 @@
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			//将bean转为map,mybatis统一处理
			//获取当前业务类型所有字段用来做对比
			R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(btmType);
			if (!allAttributeByBtmId.isSuccess() \|\| allAttributeByBtmId.getData().getAttributes().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应字段信息，请检查！");
			}
			Set<String> existFild = allAttributeByBtmId.getData().getAttributes().stream().map(btmTypeAttributeVO -> {
			return btmTypeAttributeVO.getId().toLowerCase();
			}).collect(Collectors.toSet());
			//将bean转为map,mybatis统一处理
			List<Map<String, String>> maps = new ArrayList<>();

			baseModels.stream().forEach(model -> {
			try {
			maps.add(VciBaseUtil.convertBean2Map(model));
			maps.add(VciBaseUtil.convertBean2Map(model,existFild));
			} catch (Exception e) {
			throw new VciBaseException("类型转换错误：" + e.toString());
			}
			});
			return commonsMapper.insertByBaseModel(listR.getData().get(0).getTableName(), maps.get(0), maps);
			// 是否开启多线程执行插入语句
			if(IS_THREAD_IMPORT){
			try {
			threadBactchExecuteInsert(listR.getData().get(0).getTableName(),maps);
			}catch (Exception e){
			throw new ServiceException("分批执行insert语句报错:"+e.getMessage());
			}
			}else {
			bacthExcecuteInsert(listR.getData().get(0).getTableName(),maps);
			}

			return maps.size();
			}

			/**
			* 多线程方式分批执行insert语句
			* @param tableName
			* @param maps
			* @throws ServiceException
			*/
			private void threadBactchExecuteInsert(String tableName, List<Map<String, String>> maps) throws ServiceException{
			ExecutorService executor = Executors.newFixedThreadPool(THREAD_NUM); // 创建一个固定大小的线程池
			List<Map<String, String>> threadSafeMaps = new CopyOnWriteArrayList<>(maps);

			for (int i = 0; i < threadSafeMaps.size(); i += MAX_IMPORT_NUM) {
			final int startIndex = i;
			final int endIndex = Math.min(i + MAX_IMPORT_NUM, threadSafeMaps.size());
			try {
			executor.execute(() -> {
			List<Map<String, String>> subList = threadSafeMaps.subList(startIndex, endIndex);
			// 调用插入数据库的方法
			commonsMapper.insertByBaseModel(tableName, threadSafeMaps.get(0), subList);
			});
			}catch (Throwable e){
			throw new ServiceException(e.getMessage());
			}
			}

			// 关闭线程池
			executor.shutdown();
			try {
			// 等待所有任务执行完成
			executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
			} catch (InterruptedException e) {
			// 处理异常
			throw new ServiceException("多线程方式执行批量插入时产生错误:"+e.getMessage());
			}
			}

			/**
			* 单线程方式分批执行
			* @param tableName
			* @param maps
			*/
			private void bacthExcecuteInsert(String tableName, List<Map<String, String>> maps){
			for (int i = 0; i < maps.size(); i += MAX_IMPORT_NUM) {
			final int startIndex = i;
			final int endIndex = Math.min(i + MAX_IMPORT_NUM, maps.size());
			List<Map<String, String>> subList = maps.subList(startIndex, endIndex);
			// 调用插入数据库的方法
			commonsMapper.insertByBaseModel(tableName, maps.get(0), subList);
			}
			}

			/**
			* 传入业务类型以及ID查询业务表数据是否重复
			*
			* @param btmType 业务类型
			* @param ids 处理数据
			* @return 查询到数据的总数
			*/
			@Override
			public Integer selectIdsCounts(String btmType, List<String> ids) {
			//使用传入的业务类型查询表
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			return commonsMapper.queryCountBySql("select count(*) from " +
			listR.getData().get(0).getTableName() + " where id in ("+ ids.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")) +")");
			}

			/**
			* 传入业务类型以及ID、OID查询业务表数据是否重复
			*
			* @param btmType 业务类型
			* @param id 处理数据id
			* @param oid 处理数据oid
			* @return 查询到数据的总数
			*/
			@Override
			public Integer selectIdAndOidCounts(String btmType, String id, String oid) {
			//使用传入的业务类型查询表
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			return commonsMapper.queryCountBySql("select count(*) from " +
			listR.getData().get(0).getTableName() + " where id ='" + id + "' and oid <> '" + oid + "'");
			}

			/**
			* 传入业务类型以及相oid集合查询数据进行返回
			@@ -3226,14 +3719,18 @@
			&& ("Integer").equals(setter.getParameterTypes()[0].getSimpleName())) {
			setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
			map.remove(property.getName().toUpperCase());
			} else if (map.get(property.getName().toUpperCase()) != null) {
			setter.invoke(obj, map.get(property.getName().toUpperCase()));
			} else if (map.containsKey(property.getName().toUpperCase())) {
			if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
			setter.invoke(obj, map.get(property.getName().toUpperCase()) == null ? null:String.valueOf(map.get(property.getName().toUpperCase())));
			}else{
			setter.invoke(obj, map.get(property.getName().toUpperCase()));
			}
			map.remove(property.getName().toUpperCase());
			}
			}
			}
			for (Object key : map.keySet()) {
			map.put(key, String.valueOf(map.get(key)));
			map.put(key, map.get(key) == null ? null : String.valueOf(map.get(key)));
			}

			((BaseModel) obj).setData(map);
			@@ -3244,7 +3741,6 @@
			}
			return baseModels;
			}


			/**
			* 根据业务类型名称创建业务数据源对象
			@@ -3257,7 +3753,7 @@
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			String userName = String.valueOf(AuthUtil.getUser().getUserId());
			// String userName = String.valueOf(AuthUtil.getUser().getUserId());
			BaseModel bo = new BaseModel();
			// bo.setOid(VciBaseUtil.getPk());
			// bo.setRevisionid(VciBaseUtil.getPk());
			@@ -3267,16 +3763,16 @@
			bo.setFirstR("1");
			bo.setFirstV("1");
			bo.setLastV("1");
			bo.setCreator(userName);
			bo.setCreateTime(new Date());
			bo.setLastModifier(userName);
			bo.setLastModifyTime(new Date());
			bo.setRevisionRule(listR.getData().get(0).getRevisionRuleId());
			bo.setVersionRule(String.valueOf(listR.getData().get(0).getVersionRule()));
			bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"0":listR.getData().get(0).getVersionRule());
			if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
			R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
			.selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId()));
			bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
			.selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
			if(revisionRuleVO.getData().size() != 0 ){
			bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
			}else{
			bo.setRevisionValue("1");
			}
			}
			bo.setRevisionSeq(1);
			bo.setVersionSeq(1);
			@@ -3289,7 +3785,7 @@
			bo.setId("");
			bo.setName("");
			bo.setDescription("");
			bo.setOwner(userName);
			bo.setOwner("1");
			// bo.setCheckinby(userName);
			bo.setCopyFromVersion("");
			// this.initTypeAttributeValue(bo,btmTypeVO);
			@@ -3327,12 +3823,20 @@
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			//获取当前业务类型所有字段用来做对比
			R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(btmType);
			if (!allAttributeByBtmId.isSuccess() \|\| allAttributeByBtmId.getData().getAttributes().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应字段信息，请检查！");
			}
			Set<String> existFild = allAttributeByBtmId.getData().getAttributes().stream().map(btmTypeAttributeVO -> {
			return btmTypeAttributeVO.getId();
			}).collect(Collectors.toSet());
			//将bean转为map,mybatis统一处理
			List<Map<String, String>> maps = new ArrayList<>();

			baseModels.stream().forEach(model -> {
			try {
			maps.add(VciBaseUtil.convertBean2Map(model));
			maps.add(VciBaseUtil.convertBean2Map(model,existFild));
			} catch (Exception e) {
			throw new VciBaseException("类型转换错误：" + e.getMessage());
			}
			@@ -3346,20 +3850,80 @@

			return R.success("更新成功！");
			}
			/**
			* 更新业务数据同时对码值表数据操作接口
			*
			* @param btmType 业务类型
			* @param baseModels 处理数据
			* @return 处理状态
			*/
			@Transactional(rollbackFor = VciBaseException.class)
			@Override
			public R<Integer> updateBatchBtypeDatas(String btmType, List<BaseModel> baseModels) {

			/**
			//使用传入的业务类型查询表
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			//获取当前业务类型所有字段用来做对比
			R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(btmType);
			if (!allAttributeByBtmId.isSuccess() \|\| allAttributeByBtmId.getData().getAttributes().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应字段信息，请检查！");
			}
			Set<String> existFild = allAttributeByBtmId.getData().getAttributes().stream().map(btmTypeAttributeVO -> {
			return btmTypeAttributeVO.getId();
			}).collect(Collectors.toSet());
			if(!CollectionUtils.isEmpty(baseModels)){
			List<String> oidList=baseModels.stream().filter(data-> com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(data.getOid())).map(BaseModel::getOid).distinct().collect(Collectors.toList());
			LambdaQueryWrapper<CodeAllCode> lqw = new LambdaQueryWrapper<>();
			lqw.in(CodeAllCode::getCreateCodeOid,oidList);
			List<CodeAllCode> codeAllCodeList= codeAllCodeService.selectByWrapper(lqw);
			Map<String, CodeAllCode> cboMap = codeAllCodeList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getCreateCodeOid(), t -> t));
			List<CodeAllCode> newCodeAllCodeList=new ArrayList<>();
			//将bean转为map,mybatis统一处理
			List<Map<String, String>> maps = new ArrayList<>();
			try {
			baseModels.stream().forEach(baseModel->{
			String oid=baseModel.getOid();
			try {
			maps.add(VciBaseUtil.convertBean2Map(baseModel,existFild));
			} catch (Exception e) {
			throw new VciBaseException("类型转换错误：" + e.getMessage());
			}
			if(cboMap.containsKey(oid)){
			CodeAllCode codeAllCode= cboMap.get(oid);
			codeAllCode.setId(baseModel.getId());
			// codeAllCode.setLastModifier(AuthUtil.getUser().getUserName());
			codeAllCode.setLastModifier(AuthUtil.getUser().getAccount());
			codeAllCode.setLastModifyTime(new Date());
			codeAllCode.setLcStatus(baseModel.getLcStatus());
			newCodeAllCodeList.add(codeAllCode);
			}
			});
			commonsMapper.updateBatchByBaseModel(listR.getData().get(0).getTableName(), maps);
			codeAllCodeService.saveOrUpdateBatch(newCodeAllCodeList);
			} catch (Exception e) {
			throw new VciBaseException("类型转换错误：" + e.getMessage());
			}

			}
			return R.success("更新成功！");
			}

			/**
			* 获取参照的信息
			*
			* @param referConfigVO 参照的配置
			* @return 列表数据
			*/
			@Override
			public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
			public IPage<BaseModelVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
			//checkReferConfig(referConfigVO);
			//使用业务类型查询
			R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
			if (allAttributeByBtmId.getCode() != 200) {
			throw new ServiceException("业务类型feign接口调用错误！");
			if (!allAttributeByBtmId.isSuccess()) {
			throw new ServiceException("业务类型feign接口调用错误;"+allAttributeByBtmId.getMsg());
			}
			if (Func.isEmpty(allAttributeByBtmId.getData())) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			@@ -3380,12 +3944,13 @@
			}

			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
			if (listR.getCode() != 200) {
			if (!listR.isSuccess()) {
			throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "业务类型feign接口调用错误！");
			}
			if (listR.getData().isEmpty()) {
			throw new VciBaseException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "传入业务类型未查询到相应表单，请检查！");
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			// TODO:参照配置的模糊查询过滤条件暂未处理
			String namesql = "";
			if (StringUtils.isNotBlank(baseQueryObject.getConditionMap().get("name"))) {
			String s = baseQueryObject.getConditionMap().get("name");
			@@ -3416,8 +3981,8 @@
			List<Map> maps = commonsMapper.selectBySql("select * from ( select rownum rn, t.* from (select * from " + listR.getData().get(0).getTableName() + SPACE
			+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
			+ " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 "
			+ lcstatusSql + namesql + codesql + ") t where rownum <=" + num1 + ") where rn >=" + num2
			);
			+ lcstatusSql + namesql + codesql + ") t "+ (baseQueryObject.getLimit()==-1?")": ("where rownum <=" + num1 + ") where rn >=" + num2)
			));
			List<BaseModel> baseModels = new ArrayList<>();
			//将查询到的数据转换为basemodel，使用的反射方式来进行创建的
			try {
			@@ -3435,23 +4000,28 @@
			ZonedDateTime zdt = localDateTime.atZone(zoneId);
			Date date = Date.from(zdt.toInstant());
			setter.invoke(obj, date);
			map.remove(property.getName().toUpperCase());
			//map.remove(property.getName().toUpperCase());
			} //oracle的数字为BigDecimal的，需要进行转换成Integer，否则将报错
			else if (map.get(property.getName().toUpperCase()) instanceof BigDecimal
			&& ("Integer").equals(setter.getParameterTypes()[0].getSimpleName())) {
			setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
			map.remove(property.getName().toUpperCase());
			//map.remove(property.getName().toUpperCase());
			} else if (map.get(property.getName().toUpperCase()) != null) {
			setter.invoke(obj, map.get(property.getName().toUpperCase()));
			map.remove(property.getName().toUpperCase());
			if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
			setter.invoke(obj, map.get(property.getName().toUpperCase()) == null ? null:String.valueOf(map.get(property.getName().toUpperCase())));
			}else{
			setter.invoke(obj, map.get(property.getName().toUpperCase()));
			}
			//map.remove(property.getName().toUpperCase());
			}
			}
			}
			for (Object key : map.keySet()) {
			map.put(key, String.valueOf(map.get(key)));
			}

			((BaseModel) obj).setData(map);
			Map<String, String> newMap = new HashMap<>();
			map.forEach((key, value) -> newMap.put(String.valueOf(key).toLowerCase(), String.valueOf(value)));
			((BaseModel) obj).setData(newMap);
			baseModels.add((BaseModel) obj);
			}
			} catch (Exception e) {
			@@ -3462,10 +4032,10 @@
			+ "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 "
			+ lcstatusSql + namesql + codesql
			);
			IPage<BaseModel> objectDataGrid = new Page<>();
			IPage<BaseModelVO> objectDataGrid = new Page<>();
			objectDataGrid.setPages(baseQueryObject.getPage());
			objectDataGrid.setCurrent(baseQueryObject.getPage());
			objectDataGrid.setRecords(baseModels);
			objectDataGrid.setRecords(BaseMdodelWrapper.build().listVO(baseModels));
			objectDataGrid.setSize(baseQueryObject.getLimit());
			objectDataGrid.setTotal(total);
			return objectDataGrid;
			@@ -3536,7 +4106,48 @@
			} else {
			if (StringUtils.isNotBlank(referConfigVO.getParentFieldName()) && StringUtils.isNotBlank(queryObject.getParentOid())) {
			queryObject.getConditionMap().put(referConfigVO.getParentFieldName(), queryObject.getParentOid());
			}
			//查询全部的信息
			String parentOidSql = "";
			if (StringUtils.isNotBlank(referConfigVO.getParentValue())) {
			String temp = referConfigVO.getParentValue();
			if (temp.startsWith(QueryOptionConstant.IN)) {
			temp = temp.substring((QueryOptionConstant.IN).length()).trim();
			parentOidSql = " in " + "('" + queryObject.getParentOid() + "')";
			} else if (temp.startsWith(QueryOptionConstant.NOTIN)) {
			parentOidSql = " not in " + "('" + queryObject.getParentOid() + "')";
			} else if (temp.startsWith(QueryOptionConstant.NOTEQUAL)) {
			temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
			parentOidSql = QueryOptionConstant.NOTEQUAL + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			} else if (temp.startsWith(QueryOptionConstant.MORETHAN)) {
			temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
			parentOidSql = QueryOptionConstant.MORETHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			} else if (temp.startsWith(QueryOptionConstant.MORE)) {
			temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
			parentOidSql = QueryOptionConstant.MORE + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			} else if (temp.startsWith(QueryOptionConstant.LESSTHAN)) {
			temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
			parentOidSql = QueryOptionConstant.LESSTHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			} else if (temp.startsWith(QueryOptionConstant.LESS)) {
			temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
			parentOidSql = QueryOptionConstant.LESS + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			} else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
			parentOidSql = " is not null";
			} else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
			parentOidSql = " is null";
			} else if (temp.contains("*")) {
			parentOidSql = " like " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'").replace("*", "%");
			} else {
			parentOidSql = " = " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
			}

			}
			//查询全部的信息
			queryObject.getConditionMap().put("oid", QueryOptionConstant.IN + "(select oid from " +
			getTableName(referConfigVO.getReferType()) +
			" START WITH " + referConfigVO.getParentFieldName() + " " +
			parentOidSql +
			" CONNECT BY PRIOR " + oidFieldName + " = " + referConfigVO.getParentFieldName() + ")");
			}
			}
			LambdaQueryWrapper<CodeClassify> lqw = new LambdaQueryWrapper<>();
			String sql = queryObject.getConditionMap().get("oid").substring(3);
			@@ -3549,7 +4160,6 @@
			treeWrapperOptions.setParentOid(queryObject.getParentOid());
			return revisionModelUtil.doList2Trees(codeClassifies, treeWrapperOptions, null);
			}


			@Override
			public boolean checkUnAttrUnEdit(String attrName) {
			@@ -3578,31 +4188,44 @@

			public BaseModel reviseBusinessObject(BaseModel fromBo) {
			BaseModel toBo = new BaseModel();
			// Map<String,String> data = new HashMap<>();
			// toBo.getData().put(data);
			toBo.setOid(VciBaseUtil.getPk());
			toBo.setRevisionOid(VciBaseUtil.getPk());
			toBo.setNameOid(fromBo.getNameOid());
			toBo.setBtmname(fromBo.getBtmname());
			toBo.setLastR(String.valueOf(1));
			// 升版将FirstR修改为0
			toBo.setFirstR(String.valueOf(0));
			toBo.setFirstV(String.valueOf(1));
			toBo.setLastV(String.valueOf(1));
			toBo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
			toBo.setCreateTime(new Date());
			toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
			// 数据升版不需要重新设置创建人，只对最后修改人做更新就可以了
			//toBo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
			toBo.setCreateTime(fromBo.getCreateTime());
			// toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
			toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
			toBo.setLastModifyTime(new Date());
			toBo.setRevisionRule(fromBo.getRevisionRule());
			toBo.setVersionRule(fromBo.getVersionRule());
			// RevisionValueObject rvObj = this.getNextRevision(fromBo.getBtmName(), fromBo.getNameoid(), item.revRuleName, item.revInput, revisionVal);
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
			//查询业务类型信息，可以获取到版本规则信息（revisionRuleId）
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
			if (!listR.isSuccess() \|\| listR.getData().size() == 0) {
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
			toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
			toBo.setRevisionValue(nextRevision.get("REVISIONVAL").toString());
			// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
			//Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
			/*
			TODO:这是一个待后期完善的功能，目前实现方式是，先查询出当前数据的大版本规则，
			然后再查询业务表使用的规则的步长是多少然后计算出该升版为多少
			*/
			Map<String, Object> nextRevision = commonsMapper.getCurrentRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
			R<RevisionRuleVO> revisionRuleVOR = revisionRuleClient.selectById(listR.getData().get(0).getRevisionRuleId());
			String revisionval = nextRevision.get("REVISIONVAL").toString();
			// 未查询到版本规则，默认直接给大版本加一
			if(!revisionRuleVOR.isSuccess() \|\| Func.isEmpty(revisionRuleVOR.getData())){
			revisionval = String.valueOf((Integer.parseInt(revisionval)+1));
			}else {
			revisionval = String.valueOf(Integer.parseInt(revisionval)+revisionRuleVOR.getData().getSerialStep());
			}
			toBo.setRevisionValue(revisionval);
			toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
			toBo.setVersionSeq(Integer.valueOf(nextRevision.get("VERSIONSEQ").toString()));
			toBo.setVersionValue(nextRevision.get("VERSIONVAL").toString());
			toBo.setLctid(fromBo.getLctid());
			@@ -3611,12 +4234,26 @@
			toBo.setName(fromBo.getName());
			toBo.setDescription(fromBo.getDescription());
			toBo.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
			// toBo.setCheckinBy(String.valueOf(AuthUtil.getUser().getUserId()));
			toBo.setCopyFromVersion(fromBo.getOid());
			toBo.getData().putAll(fromBo.getData());
			toBo.getData().put("CHECKINBY", String.valueOf(AuthUtil.getUser().getUserId()));
			// this.initRevisionTypeAttributeValue(fromBo, toBo);
			return toBo;

			}

			/**
			* 流程中变更状态值
			* @param flowDTO
			* @return
			*/
			@Override
			public R processChangeStatus(FlowStatusDTO flowDTO) {
			flowDTO.getOids().forEach(s -> {
			BaseModelDTO baseModel = new BaseModelDTO();
			baseModel.setOid(s);
			baseModel.setBtmname(flowDTO.getBtmType());
			baseModel.setLcStatus(String.valueOf(flowDTO.getVariableMap().getOrDefault("statusValue","Auditing")));
			changeStatus(baseModel);
			});
			return R.success("成功");
			}
			}