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 c6025537f..ddd08b60e 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("文件类型的文档名称个数与文件标识个数不匹配"); } 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/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(), 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'