Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into state-region

 Conflicts:

	pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/util/StateMachineUtils.java

@@ -91,6 +91,7 @@ public class StateMachineUtils {
         projectStatusChange.setAfterStatus(project.getStatus());
         projectStatusChange.setEvent(event.name());
         projectStatusChange.setCreateOn(LocalDateTime.now());
+        projectStatusChange.setProjectCode(project.getProjectCode());
         // 插入项目状态变更表中
         projectStatusChangeService.save(projectStatusChange);
         log.info("调用状态机后的项目状态为>>>>>>>>>>{}" + project.getStatus());

pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java

@@ -292,8 +292,11 @@ public class ProjectFileManage {
             // 创建ZipOutputStream
             ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
             if (CollUtil.isNotEmpty(fileIdList)) {
+                // 对文件ID进行去重
+                HashSet<Long> hashSet = new HashSet<>();
+                List<Long> fidList = fileIdList.stream().filter(hashSet::add).collect(Collectors.toList());
                 // 获取文件输入流
-                for (Long fileId : fileIdList) {
+                for (Long fileId : fidList) {
                     File file = fileService.getById(fileId);
                     // 文件不存在，跳过
                     if (Objects.isNull(file)) {

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectStatusChange.java

@@ -48,4 +48,9 @@ public class ProjectStatusChange implements Serializable {
 
     @ApiModelProperty("状态变更发生的时间")
     private LocalDateTime createOn;
+
+    @ApiModelProperty("项目code")
+    private String projectCode;
+
+
 }