diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java index b51747cc3b..1011a51487 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java @@ -42,7 +42,7 @@ public class PublicAndInternalFileResultDTO implements Serializable { /** * 语音或视频文件时长,单位秒 */ - private Long duration; + private Integer duration; @JsonIgnore private String processId; @@ -56,6 +56,6 @@ public class PublicAndInternalFileResultDTO implements Serializable { this.type = ""; this.format = ""; this.size = 0; - this.duration = 0L; + this.duration = 0; } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 9c61c2f2e5..aca75e38f7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -575,7 +575,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl NumConstant.ZERO || formDTO.getInternalFile().size() > NumConstant.ZERO) { + if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO) + || (null != formDTO.getInternalFile() && formDTO.getInternalFile().size() > NumConstant.ZERO)) { projectService.saveFile(formDTO.getPublicFile(), formDTO.getInternalFile(), staffEntity.getCustomerId(), formDTO.getProjectId(), processEntity.getId()); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 1ee942218a..033b84e703 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -1718,7 +1718,8 @@ public class ProjectServiceImpl extends BaseServiceImpl NumConstant.ZERO || fromDTO.getInternalFile().size() > NumConstant.ZERO) { + if ((null != fromDTO.getPublicFile() && fromDTO.getPublicFile().size() > NumConstant.ZERO) + || (null != fromDTO.getInternalFile() && fromDTO.getInternalFile().size() > NumConstant.ZERO)) { saveFile(fromDTO.getPublicFile(), fromDTO.getInternalFile(), sourceProjectStaff.getCustomerId(), fromDTO.getProjectId(), projectProcessEntity.getId()); }//end @@ -1848,7 +1849,8 @@ public class ProjectServiceImpl extends BaseServiceImpl NumConstant.ZERO || formDTO.getInternalFile().size() > NumConstant.ZERO) { + if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO) + || (null != formDTO.getInternalFile() && formDTO.getInternalFile().size() > NumConstant.ZERO)) { saveFile(formDTO.getPublicFile(), formDTO.getInternalFile(), projectStaff.getCustomerId(), formDTO.getProjectId(), projectProcessEntity.getId()); }//end diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__create_project_attachment.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__create_project_attachment.sql index 6dd706bf39..9e5d387472 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__create_project_attachment.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__create_project_attachment.sql @@ -7,7 +7,7 @@ CREATE TABLE `project_process_attachment` ( `FILE_PLACE` varchar(64) NOT NULL COMMENT '文件所属位置(内部备注: internal 公开答复:public)', `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名', `ATTACHMENT_NAME` varchar(255) DEFAULT NULL COMMENT '附件名(uuid随机生成)', - `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小', + `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小,单位b', `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式(JPG、PNG、JPEG、BMP、GIF、PDF、PPT、PPTX、DOC、DOCX、XLS、XLSX、MP3、WMA、M4A、MP4、AVI、MOV、RMVB、RM、WMV)', `ATTACHMENT_TYPE` varchar(64) DEFAULT NULL COMMENT '文件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc))', `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT 'url地址', diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml index 6effe659a1..93fc899263 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml @@ -10,8 +10,8 @@ ATTACHMENT_URL AS url, ATTACHMENT_TYPE AS type, ATTACHMENT_FORMAT AS format, - ATTACHMENT_SIZE AS size, - DURATION, + IFNULL(ATTACHMENT_SIZE,0) AS size, + IFNULL(DURATION,0) AS duration, PROCESS_ID, FILE_PLACE FROM project_process_attachment