yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本号格式刷多版本处理方式由跳过调整为处理当前使用中的版本流程

Browse Source
This commit is contained in:
446052889@qq.com 2023-02-21 16:29:38 +08:00
parent 0522307389
commit bab1fa784c
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar
View File

Binary file not shown.

35
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/versionNo/web/VersionNoExcelImportRun.java
View File

@ -132,19 +132,30 @@ public class VersionNoExcelImportRun {
// 判断是否有多只模型
List<PALRepositoryModel> versionList = PALRepositoryCache.getByVersionId(model.getVersionId());
if (versionList.size() > 1) {
LogUtil.appendLog(Constant.LOG_WARNING + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]存在多版本，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
LogUtil.appendLog("[存在多版本]Excel第[" + importingCount + "]行" + processType + "[" + processName + "]存在多版本，忽略导入", matchErrImportFile);
LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);// 借用ArisBlankCount
continue;
}
// 判断单只流程版本号是否为1.0
double VerNo = model.getVersion();
if (!"V1.0".equals(VersionUtil.getVersionStrV(model.getVersion()))) {
LogUtil.appendLog(Constant.LOG_WARNING + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]版本号不是[V1.0]，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
LogUtil.appendLog("[存在多版本]Excel第[" + importingCount + "]行" + processType + "[" + processName + "]版本号不是[V1.0]，忽略导入", matchErrImportFile);
LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);// 借用ArisBlankCount
continue;
LogUtil.appendLog(Constant.LOG_DESC + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]存在多版本", simpleLogFile, fullLogFile);
for (PALRepositoryModel verModel : versionList) {
if (verModel.isUse()) {
model = verModel;
LogUtil.appendLog(Constant.LOG_DESC + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]切换为使用中版本进行版本号变更", simpleLogFile, fullLogFile);
continue;
}
}
}
// if (versionList.size() > 1) {
// LogUtil.appendLog(Constant.LOG_WARNING + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]存在多版本，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
// LogUtil.appendLog("[存在多版本]Excel第[" + importingCount + "]行" + processType + "[" + processName + "]存在多版本，忽略导入", matchErrImportFile);
// LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);// 借用ArisBlankCount
// continue;
// }
// // 判断单只流程版本号是否为1.0
// double VerNo = model.getVersion();
// if (!"V1.0".equals(VersionUtil.getVersionStrV(model.getVersion()))) {
// LogUtil.appendLog(Constant.LOG_WARNING + "Excel第["+ importingCount + "]行" + processType + "[" + processName + "]版本号不是[V1.0]，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
// LogUtil.appendLog("[存在多版本]Excel第[" + importingCount + "]行" + processType + "[" + processName + "]版本号不是[V1.0]，忽略导入", matchErrImportFile);
// LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);// 借用ArisBlankCount
// continue;
// }
// 修改版本号
double verNo = 1.000;
String tmp = versionNo.replace("V", "").replace("v", "");