From ce943ff68e08f75b77c79d9ccdab55c1cd483ffe Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Wed, 4 Sep 2024 11:37:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E5=9F=BA=E4=BA=8ECMDB=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=AE=9A=E5=88=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增时间范围参数，根据创建时间进行筛选 --- .../domain/vo/PmsProductLibraryComponentSearchVo.java | 6 ++++++ .../mapper/pms/PmsProductLibraryComponentMapper.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryComponentSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryComponentSearchVo.java index ee0897ba7..c34af9020 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryComponentSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryComponentSearchVo.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * 制品库数据对象 * @@ -17,6 +19,10 @@ public class PmsProductLibraryComponentSearchVo { private String excludeIds; @ApiModelProperty(value = "产品库标识") private String productRepoName; + @ApiModelProperty(value = "开始时间") + private Date startTime; + @ApiModelProperty(value = "结束时间") + private Date endTime; /** * 关联企业ID */ diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml index d07858b2d..7871a3cca 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml @@ -128,6 +128,9 @@ #{item} + + and pplc.create_time between #{startTime} and #{endTime} + and pplr.`name` = #{productRepoName} and pe.enterprise_identifier = #{pmsEnterpriseIdentifier} and pplr.format='product' From 0ef339c488b7c31f8b90c8d7f3c88189c6f0e3c1 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 5 Sep 2024 15:50:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84):=20=E5=BF=AB=E7=85=A7=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E9=9C=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=BA=93=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsProductLibrarySnapshotController.java | 2 +- .../service/IPmsProductLibrarySnapshotRepoService.java | 3 +-- .../impl/PmsProductLibrarySnapshotRepoServiceImpl.java | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java index a7805784d..b4e82a782 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java @@ -40,7 +40,7 @@ public class PmsProductLibrarySnapshotController extends BaseController { // @RequiresPermissions("pms:pmsProductLibraryRepositories:list") @GetMapping("/byRepoName/{repoName}/{snapshotName}") @ApiOperation(value = "获取快照库详情") - public GenericsAjaxResult getSnapshotByRepoName(@PathVariable String enterpriseIdentifier, + public GenericsAjaxResult getSnapshotByRepoName(@PathVariable String enterpriseIdentifier, @ApiParam(value = "制品库标识", required = true) @PathVariable String repoName, @ApiParam(value = "快照库标识", required = true) @PathVariable String snapshotName) { return GenericsAjaxResult.success(pmsProductLibrarySnapshotRepoService.selectPmsProductLibrarySnapshotDataByName(enterpriseIdentifier, repoName, snapshotName)); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibrarySnapshotRepoService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibrarySnapshotRepoService.java index 6da714635..7ba983330 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibrarySnapshotRepoService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibrarySnapshotRepoService.java @@ -2,7 +2,6 @@ package com.microservices.pms.productLibrary.service; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.pms.productLibrary.domain.PmsProductLibraryRepositories; -import com.microservices.pms.productLibrary.domain.vo.PmsProductLibraryRepositoriesDataVo; import com.microservices.pms.productLibrary.domain.vo.PmsProductLibrarySnapshotSimpleVo; import com.microservices.pms.productLibrary.domain.vo.ProductRepositoriesSnapshotInputVo; @@ -21,7 +20,7 @@ public interface IPmsProductLibrarySnapshotRepoService { */ Long insertPmsProductLibrarySnapshot(ProductRepositoriesSnapshotInputVo productRepositoriesSnapshotInputVo); - PmsProductLibraryRepositoriesDataVo selectPmsProductLibrarySnapshotDataByName(String enterpriseIdentifier, String repoName, String snapshotName); + PmsProductLibrarySnapshotSimpleVo selectPmsProductLibrarySnapshotDataByName(String enterpriseIdentifier, String repoName, String snapshotName); PmsProductLibraryRepositories selectPmsProductLibrarySnapshotByName(String enterpriseIdentifier, String repoName, String snapshotName); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java index de68ca285..f0124bf58 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java @@ -9,7 +9,6 @@ import com.microservices.common.security.utils.SecurityUtils; import com.microservices.pms.productLibrary.domain.PmsProductLibraryRepositories; import com.microservices.pms.productLibrary.domain.ProductLibraryRepositoriesFormatEnum; import com.microservices.pms.productLibrary.domain.vo.NexusHostedRepoInputVo; -import com.microservices.pms.productLibrary.domain.vo.PmsProductLibraryRepositoriesDataVo; import com.microservices.pms.productLibrary.domain.vo.PmsProductLibrarySnapshotSimpleVo; import com.microservices.pms.productLibrary.domain.vo.ProductRepositoriesSnapshotInputVo; import com.microservices.pms.productLibrary.mapper.PmsProductLibraryRepositoriesMapper; @@ -70,10 +69,10 @@ public class PmsProductLibrarySnapshotRepoServiceImpl implements IPmsProductLibr } @Override - public PmsProductLibraryRepositoriesDataVo selectPmsProductLibrarySnapshotDataByName(String enterpriseIdentifier, String repoName, String snapshotName) { + public PmsProductLibrarySnapshotSimpleVo selectPmsProductLibrarySnapshotDataByName(String enterpriseIdentifier, String repoName, String snapshotName) { PmsProductLibraryRepositories pmsProductLibraryRepositories = selectPmsProductLibrarySnapshotByName(enterpriseIdentifier, repoName, snapshotName); - return pmsProductLibraryRepositories.toPmsProductLibraryRepositoriesDataVo(); + return pmsProductLibraryRepositories.toPmsProductLibrarySnapshotSimpleVo(); } From 041092562e1d0c312dc76fe0f171c919b9269c89 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Wed, 11 Sep 2024 11:15:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE):=20#10356=20?= =?UTF-8?q?=E5=BD=93=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E9=80=97=E5=8F=B7=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BC=9A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/domain/vo/PmsFileTypeDocumentInputVo.java | 8 ++++---- .../pms/document/service/impl/PmsDocumentServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java index c1bedfb71..f7bbf2f27 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java @@ -18,9 +18,9 @@ public class PmsFileTypeDocumentInputVo { /** 文档名称 */ - @ApiModelProperty(value = "文档名称 多个用逗号隔开", required = true) + @ApiModelProperty(value = "文档名称", required = true) @NotNull - private String names; + private String[] names; /**3-附件 */ @ApiModelProperty(value = "3-附件", hidden = true) @@ -40,9 +40,9 @@ public class PmsFileTypeDocumentInputVo private Long pmsEnterpriseId; /** 附件标识 */ - @ApiModelProperty(value = "附件标识 多个用逗号隔开", required = true) + @ApiModelProperty(value = "附件标识", required = true) @NotNull - private String attachmentIdentifiers; + private String[] attachmentIdentifiers; /** 权限 1-私有 2-全员读 3-全员读写 */ @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", required = true) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java index 493122104..150162ee4 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java @@ -297,8 +297,8 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService } private int batchInsertPmsDocumentByInputVo(PmsFileTypeDocumentInputVo pmsFileTypeDocumentInputVo, String currentUserName) { - String[] names = pmsFileTypeDocumentInputVo.getNames().split(","); - String[] attachmentIdentifiers = pmsFileTypeDocumentInputVo.getAttachmentIdentifiers().split(","); + String[] names = pmsFileTypeDocumentInputVo.getNames(); + String[] attachmentIdentifiers = pmsFileTypeDocumentInputVo.getAttachmentIdentifiers(); if (names.length != attachmentIdentifiers.length) { throw new ServiceException("文件类型的文档名称个数与文件标识个数不匹配"); } From 42d003d455191836f18f98313a906f61ee361d70 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 12 Sep 2024 15:37:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=BF=AD=E4=BB=A3):=20#11202=20=E8=BF=AD=E4=BB=A3=E7=87=83?= =?UTF-8?q?=E5=B0=BD=E5=9B=BE=E5=85=BC=E5=AE=B9=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/project/service/impl/PmsProjectSprintServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectSprintServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectSprintServiceImpl.java index 1792a2fdb..c2de2df38 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectSprintServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectSprintServiceImpl.java @@ -235,6 +235,9 @@ public class PmsProjectSprintServiceImpl implements IPmsProjectSprintService if (pmsProjectSprint == null) { throw new ServiceException("该迭代不存在(迭代ID[%s])", pmSprintId); } + if (pmsProjectSprint.getStartTime() == null || pmsProjectSprint.getEndTime() == null) { + return null; + } JSONObject result = gitLinkRequestHelper.doGet( PmsGitLinkRequestUrl.GET_SPRINT_BURN_DOWN_CHART(pmSprintId, pmsProjectSprint.getStartTime(),