Merge pull request TencentBlueKing#5424 from carlyin0801/issue_5358_b…

…uildNumAliasShow

bug:配置构建号格式后，构建历史页面展示的构建号和流水线列表页面展示的不一致 TencentBlueKing#5358

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/Pipeline.kt

@@ -89,5 +89,7 @@ data class Pipeline(
     @ApiModelProperty("流水线分组和标签", required = false)
     var groupLabel: List<PipelineGroupLabels>? = null,
     @ApiModelProperty("最后自定义构建版本号", required = false)
-    val latestBuildNumAlias: String? = null
+    val latestBuildNumAlias: String? = null,
+    @ApiModelProperty("自定义构建号规则", required = false)
+    val buildNumRule: String? = null
 )

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt

@@ -117,17 +117,20 @@ class PipelineBuildSummaryDao {
     fun updateBuildNum(
         dslContext: DSLContext,
         pipelineId: String,
-        buildNum: Int = 0
+        buildNum: Int = 0,
+        buildNumAlias: String? = null
     ): Int {
 
         with(T_PIPELINE_BUILD_SUMMARY) {
             if (buildNum == 0) {
                 dslContext.update(this)
                     .set(BUILD_NUM, BUILD_NUM + 1)
+                    .set(BUILD_NUM_ALIAS, buildNumAlias)
                     .where(PIPELINE_ID.eq(pipelineId)).execute()
             } else {
                 dslContext.update(this)
                     .set(BUILD_NUM, buildNum)
+                    .set(BUILD_NUM_ALIAS, buildNumAlias)
                     .where(PIPELINE_ID.eq(pipelineId)).execute()
             }
         }
@@ -139,18 +142,6 @@ class PipelineBuildSummaryDao {
         }
     }
 
-    fun updateBuildNumAlias(
-        dslContext: DSLContext,
-        pipelineId: String,
-        buildNumAlias: String
-    ) {
-        with(T_PIPELINE_BUILD_SUMMARY) {
-            dslContext.update(this)
-                .set(BUILD_NUM_ALIAS, buildNumAlias)
-                .where(PIPELINE_ID.eq(pipelineId)).execute()
-        }
-    }
-
     fun listPipelineInfoBuildSummaryCount(
         dslContext: DSLContext,
         projectId: String,
@@ -476,6 +467,7 @@ class PipelineBuildSummaryDao {
             T_PIPELINE_INFO.PIPELINE_NAME_PINYIN,
             T_PIPELINE_SETTING.DESC,
             T_PIPELINE_SETTING.RUN_LOCK_TYPE,
+            T_PIPELINE_SETTING.BUILD_NUM_RULE,
             T_PIPELINE_BUILD_SUMMARY.BUILD_NUM,
             T_PIPELINE_BUILD_SUMMARY.BUILD_NUM_ALIAS,
             T_PIPELINE_BUILD_SUMMARY.BUILD_NO,

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt

@@ -1153,18 +1153,6 @@ class PipelineRuntimeService @Autowired constructor(
                         cancelUser = ""
                     )
                 } else { // 创建构建记录
-                    // 构建号递增
-                    val buildNum = pipelineBuildSummaryDao.updateBuildNum(
-                        dslContext = transactionContext,
-                        pipelineId = pipelineId
-                    )
-                    buildVariableService.setVariable(
-                        projectId = pipelineInfo.projectId,
-                        pipelineId = pipelineId,
-                        buildId = buildId,
-                        varName = PIPELINE_BUILD_NUM,
-                        varValue = buildNum
-                    )
                     val buildNumAlias = if (!buildNumRule.isNullOrBlank()) {
                         val parsedValue = pipelineRuleService.parsePipelineRule(
                             pipelineId = pipelineId,
@@ -1176,11 +1164,6 @@ class PipelineRuntimeService @Autowired constructor(
                     } else null
                     // 写自定义构建号信息
                     if (!buildNumAlias.isNullOrBlank()) {
-                        pipelineBuildSummaryDao.updateBuildNumAlias(
-                            dslContext = transactionContext,
-                            pipelineId = pipelineId,
-                            buildNumAlias = buildNumAlias
-                        )
                         buildVariableService.setVariable(
                             projectId = pipelineInfo.projectId,
                             pipelineId = pipelineId,
@@ -1189,6 +1172,19 @@ class PipelineRuntimeService @Autowired constructor(
                             varValue = buildNumAlias
                         )
                     }
+                    // 构建号递增
+                    val buildNum = pipelineBuildSummaryDao.updateBuildNum(
+                        dslContext = transactionContext,
+                        pipelineId = pipelineId,
+                        buildNumAlias = buildNumAlias
+                    )
+                    buildVariableService.setVariable(
+                        projectId = pipelineInfo.projectId,
+                        pipelineId = pipelineId,
+                        buildId = buildId,
+                        varName = PIPELINE_BUILD_NUM,
+                        varValue = buildNum
+                    )
                     pipelineBuildDao.create(
                         dslContext = transactionContext,
                         projectId = pipelineInfo.projectId,

src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineListFacadeService.kt

@@ -1163,7 +1163,8 @@ class PipelineListFacadeService @Autowired constructor(
                     hasCollect = favorPipelines.contains(pipelineId),
                     latestBuildUserId = it["LATEST_START_USER"] as String? ?: "",
                     creator = it["CREATOR"] as String,
-                    latestBuildNumAlias = it["BUILD_NUM_ALIAS"] as String?
+                    latestBuildNumAlias = it["BUILD_NUM_ALIAS"] as String?,
+                    buildNumRule = it["BUILD_NUM_RULE"] as String?
                 )
             )
         }