WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

详情

Browse Source
This commit is contained in:
zhn
2023-09-05 15:41:36 +08:00
parent b611d0f61d
commit b12a210df4
3 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java
+4 -3
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.project.vo.ProblemManagementVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -134,15 +135,15 @@ public class ProblemManagementEO implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "相关文件地址链接（前端传参）")
private List<String> fileLinkList;
private List<ProblemManagementVO> fileLinkList;
@TableField(exist = false)
@ApiModelProperty(value = "进度追踪（前端传参）")
private List<String> progressTrackingList;
private List<ProblemManagementVO> progressTrackingList;
@TableField(exist = false)
@ApiModelProperty(value = "审批证据链接（前端传参）")
private List<String> approvalEvidenceLinkList;
private List<ProblemManagementVO> approvalEvidenceLinkList;
@TableField(exist = false)
@ApiModelProperty(value = "相关法规中文名")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
+34 -5
View File
@@ -13,6 +13,7 @@ import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.mapper.ProblemManagementEOMapper;
import com.jero.modules.project.service.IProblemManagementEOService;
import com.jero.modules.project.service.IProjectLibraryBaseService;
import com.jero.modules.project.vo.ProblemManagementVO;
import com.jero.modules.system.enums.DicCodeEnum;
import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.util.StringUtils;
@@ -98,13 +99,19 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
private void setParam(ProblemManagementEO problemManagementEO) {
if(!problemManagementEO.getFileLinkList().isEmpty()){
problemManagementEO.setFileLink(StringUtils.join(problemManagementEO.getFileLinkList(),","));
List<ProblemManagementVO> fileLinkList = problemManagementEO.getFileLinkList();
List<String> collect = fileLinkList.stream().map(ProblemManagementVO::getFileLink).collect(Collectors.toList());
problemManagementEO.setFileLink(StringUtils.join(collect,","));
}
if(!problemManagementEO.getProgressTrackingList().isEmpty()){
problemManagementEO.setProgressTracking(StringUtils.join(problemManagementEO.getProgressTrackingList(),","));
List<ProblemManagementVO> progressTrackingList = problemManagementEO.getProgressTrackingList();
List<String> collect = progressTrackingList.stream().map(ProblemManagementVO::getProgressTracking).collect(Collectors.toList());
problemManagementEO.setProgressTracking(StringUtils.join(collect,","));
}
if(!problemManagementEO.getApprovalEvidenceLinkList().isEmpty()){
problemManagementEO.setApprovalEvidenceLink(StringUtils.join(problemManagementEO.getApprovalEvidenceLinkList(),","));
List<ProblemManagementVO> approvalEvidenceLinkList = problemManagementEO.getApprovalEvidenceLinkList();
List<String> collect = approvalEvidenceLinkList.stream().map(ProblemManagementVO::getApprovalEvidenceLink).collect(Collectors.toList());
problemManagementEO.setApprovalEvidenceLink(StringUtils.join(collect,","));
}
}
@@ -220,12 +227,34 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
//相关文件连接
if(StringUtils.isNotBlank(problemManagementEO.getFileLink())){
problemManagementEO.setFileLinkList(Arrays.asList(problemManagementEO.getFileLink().split(",")));
List<ProblemManagementVO> list = new ArrayList<>();
for (String fileLink : problemManagementEO.getFileLink().split(",")) {
ProblemManagementVO problemManagementVO = new ProblemManagementVO();
problemManagementVO.setFileLink(fileLink);
list.add(problemManagementVO);
}
problemManagementEO.setFileLinkList(list);
}
//审批证据连接
if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidenceLink())){
problemManagementEO.setApprovalEvidenceLinkList(Arrays.asList(problemManagementEO.getApprovalEvidenceLink().split(",")));
List<ProblemManagementVO> list = new ArrayList<>();
for (String approvalEvidenceLink : problemManagementEO.getApprovalEvidenceLink().split(",")) {
ProblemManagementVO problemManagementVO = new ProblemManagementVO();
problemManagementVO.setApprovalEvidenceLink(approvalEvidenceLink);
list.add(problemManagementVO);
}
problemManagementEO.setApprovalEvidenceLinkList(list);
}
//进度追踪
if(StringUtils.isNotBlank(problemManagementEO.getProgressTracking())){
List<ProblemManagementVO> list = new ArrayList<>();
for (String progressTracking : problemManagementEO.getProgressTracking().split(",")) {
ProblemManagementVO problemManagementVO = new ProblemManagementVO();
problemManagementVO.setProgressTracking(progressTracking);
list.add(problemManagementVO);
}
problemManagementEO.setProgressTrackingList(list);
}
return problemManagementEO;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProblemManagementVO.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.project.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.oss.entity.OSSFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 问题管理
* @Author: jero-boot
* @Date: 2023-09-05
* @Version: V1.0
*/
@Data
public class ProblemManagementVO implements Serializable {
private String fileLink;
private String progressTracking;
private String approvalEvidenceLink;
}