Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_PMS' of code.gitlink.org.cn:otto/microservices into dev_PMS_ZPK_merge_master

This commit is contained in:
OTTO 2024-09-12 15:42:51 +08:00
parent 3418761711 e398a0c50d
commit d77768d8a7
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java
View File

@ -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)

4
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java
View File

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

6
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryComponentSearchVo.java
View File

@ -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
*/

3
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectSprintServiceImpl.java
View File

@ -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(),

3
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml
View File

@ -128,6 +128,9 @@
#{item}
</foreach>
</if>
<if test="startTime != null and endTime != null">
and pplc.create_time between #{startTime} and #{endTime}
</if>
<if test="productRepoName != null and productRepoName != ''">and pplr.`name` = #{productRepoName}</if>
<if test="pmsEnterpriseIdentifier != null ">and pe.enterprise_identifier = #{pmsEnterpriseIdentifier}</if>
and pplr.format='product'