From 6117c26979b0df82ffa45d9ad43f67a11e2aeaae Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:36:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProblemManagementEO.java | 8 ++++++++ .../impl/ProblemManagementEOServiceImpl.java | 19 ++++++++++++++++++- .../jero/modules/project/vo/NcrTrackVO.java | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index a71279c6a..409882869 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -143,4 +143,12 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "审批证据链接（前端传参）") private List approvalEvidenceLinkList; + @TableField(exist = false) + @ApiModelProperty(value = "相关法规中文名") + private String lawsName; + + @TableField(exist = false) + @ApiModelProperty(value = "相关项目中文名") + private String projectName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index 065e7af6a..dba2367c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.IProblemManagementEOService; +import com.jero.modules.system.util.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -25,12 +26,26 @@ public class ProblemManagementEOServiceImpl extends ServiceImplold,新数据->new） + private String flag; + From 37c4e61c123b4d0ff51bd3cb6c39e296e0305630 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Sep 2023 10:56:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91-=E5=A4=84=E7=90=86=E7=9B=B8=E5=85=B3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=AE=A1=E6=89=B9=E8=AF=81=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProblemManagementEOServiceImpl.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java index dba2367c3..41d4dc12c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.project.service.impl; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.service.IProblemManagementEOService; import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; import java.util.Date; +import java.util.UUID; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -18,6 +25,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ProblemManagementEOServiceImpl extends ServiceImpl implements IProblemManagementEOService { + + @Autowired + private IOSSFileService iOSSFileService; + /** * 保存 * @@ -28,12 +39,45 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); + updateFileInfo(fileIds, oSSFileList,connectId); + problemManagementEO.setFile(connectId); + } + //处理审批证据 + if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ + String connectId = UUID.randomUUID().toString().replace("-", ""); + String fileIds = problemManagementEO.getApprovalEvidence(); + List oSSFileList = new ArrayList<>(); + updateFileInfo(fileIds, oSSFileList,connectId); + problemManagementEO.setApprovalEvidence(connectId); + } + } + + private void updateFileInfo(String fileIds, List oSSFileList,String connectId) { + for (String fileId : fileIds.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + iOSSFileService.updateFileInfo(oSSFileList); + } + private void setParam(ProblemManagementEO problemManagementEO) { if(!problemManagementEO.getFileLinkList().isEmpty()){ problemManagementEO.setFileLink(StringUtils.join(problemManagementEO.getFileLinkList(),",")); @@ -56,6 +100,10 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl