From 1940e5739c22209716d40690a64e80f761cbd77c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 22 Dec 2020 14:15:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=B1=95V2--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91/=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/PublicAndInternalFileResultDTO.java | 4 ++-- .../src/main/resources/mapper/ProjectProcessAttachmentDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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 From 27b5fc866b8484bbc39b1ad14cc6fe571d2397aa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 22 Dec 2020 14:29:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.5__create_project_attachment.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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地址', From bddc6c9595ee4072a199d6a4cdc4bf8a3265587c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 23 Dec 2020 09:45:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ProjectProcessServiceImpl.java | 3 ++- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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 0bf154cd54..549b58fdbe 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 @@ -573,7 +573,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 68ed89a39c..683f085a70 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 @@ -1685,7 +1685,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 @@ -1815,7 +1816,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