From bcd3d389a7b95319541afb24959c79b211c83b15 Mon Sep 17 00:00:00 2001 From: mash Date: Tue, 7 Feb 2023 15:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=99=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staff/controller/PersonnelController.java | 7 + .../com/ydool/staff/dto/AttachmentDto.java | 21 +++ .../ydool/staff/dto/PersonnelUpdateDto.java | 135 ++++++++++++++++ .../com/ydool/staff/entity/Alteration.java | 42 +++++ .../ydool/staff/mapper/AlterationMapper.java | 18 +++ .../ydool/staff/request/ChangeRequest.java | 73 +++++++++ .../staff/service/IAlterationService.java | 14 ++ .../staff/service/IAttachmentService.java | 2 +- .../staff/service/IPersonnelService.java | 8 +- .../service/impl/AlterationServiceImpl.java | 21 +++ .../service/impl/AttachmentServiceImpl.java | 7 +- .../service/impl/PersonnelServiceImpl.java | 152 ++++++++++++++++-- 12 files changed, 482 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/ydool/staff/dto/AttachmentDto.java create mode 100644 src/main/java/com/ydool/staff/dto/PersonnelUpdateDto.java create mode 100644 src/main/java/com/ydool/staff/entity/Alteration.java create mode 100644 src/main/java/com/ydool/staff/mapper/AlterationMapper.java create mode 100644 src/main/java/com/ydool/staff/request/ChangeRequest.java create mode 100644 src/main/java/com/ydool/staff/service/IAlterationService.java create mode 100644 src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java diff --git a/src/main/java/com/ydool/staff/controller/PersonnelController.java b/src/main/java/com/ydool/staff/controller/PersonnelController.java index 8a9b780..8fe8ec5 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelController.java @@ -8,6 +8,7 @@ import com.ydool.common.data.dto.AjaxResult; import com.ydool.common.utils.UploadUtils; import com.ydool.staff.dto.PersonnelDto; import com.ydool.staff.entity.Attachment; +import com.ydool.staff.request.ChangeRequest; import com.ydool.staff.request.PersonnelDeleteRequest; import com.ydool.staff.request.PersonnelRequest; import com.ydool.staff.request.PersonnelUpdateRequest; @@ -65,6 +66,12 @@ public class PersonnelController extends BaseController { return personnelService.updatePersonnel(personnelDeleteRequest); } + @PostMapping(value = "updateChange") + @ApiOperation(value = "人员变更") + public AjaxResult updateChange(@RequestBody ChangeRequest request){ + return personnelService.updateChange(request); + } + @GetMapping("/download") @ApiOperation(value = "下载文件") @ApiImplicitParams({@ApiImplicitParam(name = "path", value = "文件路径"), @ApiImplicitParam(name = "fileName", value = "文件名")}) diff --git a/src/main/java/com/ydool/staff/dto/AttachmentDto.java b/src/main/java/com/ydool/staff/dto/AttachmentDto.java new file mode 100644 index 0000000..1ea055b --- /dev/null +++ b/src/main/java/com/ydool/staff/dto/AttachmentDto.java @@ -0,0 +1,21 @@ +package com.ydool.staff.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/7 13:13 + */ +@Data +public class AttachmentDto { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "路径") + private String path; + + @ApiModelProperty(value = "大小") + private String size; +} diff --git a/src/main/java/com/ydool/staff/dto/PersonnelUpdateDto.java b/src/main/java/com/ydool/staff/dto/PersonnelUpdateDto.java new file mode 100644 index 0000000..2dc1db7 --- /dev/null +++ b/src/main/java/com/ydool/staff/dto/PersonnelUpdateDto.java @@ -0,0 +1,135 @@ +package com.ydool.staff.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/7 13:29 + */ +@Data +public class PersonnelUpdateDto { + + @ApiModelProperty(value = "id") + private String id; + + @ApiModelProperty(value = "统一社会信用代码") + private String socialCreditCode; + + @ApiModelProperty(value = "姓名") + private String userName; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "性别") + private Integer gender; + + @ApiModelProperty(value = "出生日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date birthday; + + @ApiModelProperty(value = "身份证号") + private String numberId; + + @ApiModelProperty(value = "民族") + private String nation; + + @ApiModelProperty(value = "政治面貌") + private String politicsStatus; + + @ApiModelProperty(value = "学历") + private String education; + + @ApiModelProperty(value = "是否应届毕业生") + private Integer freshGraduate; + + @ApiModelProperty(value = "毕业院校") + private String academy; + + @ApiModelProperty(value = "专业") + private String specialty; + + @ApiModelProperty(value = "录用方式") + private String hireType; + + @ApiModelProperty(value = "执业资格证书") + private String qualification; + + @ApiModelProperty(value = "专业技术职称") + private String jobTitle; + + @ApiModelProperty(value = "所在部门") + private String presentDept; + + @ApiModelProperty(value = "岗位职务") + private String position; + + @ApiModelProperty(value = "合同形式") + private String contractModality; + + @ApiModelProperty(value = "人员类型") + private String personnelType; + + @ApiModelProperty(value = "工作状态") + private String workState; + + @ApiModelProperty(value = "人员性质") + private String personnelCharacter; + + @ApiModelProperty(value = "年薪") + private BigDecimal annualSalary; + + @ApiModelProperty(value = "入职时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date hireDate; + + @ApiModelProperty(value = "退休时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date retirementTime; + + @ApiModelProperty(value = "离职时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date resignationTime; + + @ApiModelProperty(value = "退休返聘开始时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date txfpStartTime; + + @ApiModelProperty(value = "退休返聘结束时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date txfpEndTime; + + @ApiModelProperty(value = "人员招聘单号") + private String recruitNumber; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "初审意见") + private String firstTrialRemark; + + @ApiModelProperty(value = "终审意见") + private String finalTrialRemark; + + @ApiModelProperty(value = "身份证附件") + private List cardFiles; + + @ApiModelProperty(value = "聘任证书附件") + private List engageFiles; + + @ApiModelProperty(value = "职称证书附件") + private List jobTitleFiles; + + @ApiModelProperty(value = "学历证书附件") + private List educationFiles; + + @ApiModelProperty(value = "审批资料附件") + private List auditFiles; +} diff --git a/src/main/java/com/ydool/staff/entity/Alteration.java b/src/main/java/com/ydool/staff/entity/Alteration.java new file mode 100644 index 0000000..db3cf30 --- /dev/null +++ b/src/main/java/com/ydool/staff/entity/Alteration.java @@ -0,0 +1,42 @@ +package com.ydool.staff.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ydool.common.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 变更记录表 + *

+ * + * @author msh + * @since 2023-02-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@TableName("t_lc_alteration") +@ApiModel(value="Alteration对象", description="变更记录表") +public class Alteration extends BaseEntity{ + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "关联id") + private String relevancyId; + + @ApiModelProperty(value = "变更前") + private String beforeChange; + + @ApiModelProperty(value = "变更后") + private String afterChange; + + @ApiModelProperty(value = "变更内容") + private String details; + + @ApiModelProperty(value = "变更类型") + private String type; + +} diff --git a/src/main/java/com/ydool/staff/mapper/AlterationMapper.java b/src/main/java/com/ydool/staff/mapper/AlterationMapper.java new file mode 100644 index 0000000..6d49826 --- /dev/null +++ b/src/main/java/com/ydool/staff/mapper/AlterationMapper.java @@ -0,0 +1,18 @@ +package com.ydool.staff.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import com.ydool.staff.entity.Alteration; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 变更记录表 Mapper 接口 + *

+ * + * @author msh + * @since 2023-02-06 + */ +@Mapper +public interface AlterationMapper extends MPJBaseMapper { + +} diff --git a/src/main/java/com/ydool/staff/request/ChangeRequest.java b/src/main/java/com/ydool/staff/request/ChangeRequest.java new file mode 100644 index 0000000..e356bb4 --- /dev/null +++ b/src/main/java/com/ydool/staff/request/ChangeRequest.java @@ -0,0 +1,73 @@ +package com.ydool.staff.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/1 11:53 + */ +@Data +public class ChangeRequest { + @ApiModelProperty(value = "id") + @NotBlank(message = "id不能为空") + private String id; + + @ApiModelProperty(value = "录用方式") + @NotBlank(message = "录用方式不能为空") + private String hireType; + + @ApiModelProperty(value = "执业资格") + @NotBlank(message = "执业资格不能为空") + private String qualification; + + @ApiModelProperty(value = "专业技术职称") + private String jobTitle; + + @ApiModelProperty(value = "岗位职务") + @NotBlank(message = "岗位职务不能为空") + private String position; + + @ApiModelProperty(value = "工作状态") + @NotBlank(message = "工作状态不能为空") + private String workState; + + @ApiModelProperty(value = "人员性质") + @NotBlank(message = "人员性质不能为空") + private String personnelCharacter; + + @ApiModelProperty(value = "年薪") + @NotBlank(message = "年薪不能为空") + private BigDecimal annualSalary; + + @ApiModelProperty(value = "退休时间") + @NotNull(message = "退休时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date retirementTime; + + @ApiModelProperty(value = "人员招聘单号") + private String recruitNumber; + + @ApiModelProperty(value = "身份证附件") + private List cardFiles; + + @ApiModelProperty(value = "聘任证书附件") + private List engageFiles; + + @ApiModelProperty(value = "职称证书附件") + private List jobTitleFiles; + + @ApiModelProperty(value = "学历证书附件") + private List educationFiles; + + @ApiModelProperty(value = "审批资料附件") + private List auditFiles; +} diff --git a/src/main/java/com/ydool/staff/service/IAlterationService.java b/src/main/java/com/ydool/staff/service/IAlterationService.java new file mode 100644 index 0000000..6e955d6 --- /dev/null +++ b/src/main/java/com/ydool/staff/service/IAlterationService.java @@ -0,0 +1,14 @@ +package com.ydool.staff.service; + +/** + *

+ * 变更记录表 服务类 + *

+ * + * @author msh + * @since 2023-02-06 + */ +public interface IAlterationService { + +} + diff --git a/src/main/java/com/ydool/staff/service/IAttachmentService.java b/src/main/java/com/ydool/staff/service/IAttachmentService.java index 33c2564..5c26fa3 100644 --- a/src/main/java/com/ydool/staff/service/IAttachmentService.java +++ b/src/main/java/com/ydool/staff/service/IAttachmentService.java @@ -19,7 +19,7 @@ public interface IAttachmentService { boolean deleteById(String targetType,String id); - Attachment selectFile(String path, String id); + Attachment selectByIdAndPath(String id,String path); AjaxResult fileList(Page page, String id); } diff --git a/src/main/java/com/ydool/staff/service/IPersonnelService.java b/src/main/java/com/ydool/staff/service/IPersonnelService.java index b0dc9fb..8ea70dd 100644 --- a/src/main/java/com/ydool/staff/service/IPersonnelService.java +++ b/src/main/java/com/ydool/staff/service/IPersonnelService.java @@ -2,6 +2,7 @@ package com.ydool.staff.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.request.ChangeRequest; import com.ydool.staff.request.PersonnelDeleteRequest; import com.ydool.staff.request.PersonnelRequest; import com.ydool.staff.request.PersonnelUpdateRequest; @@ -47,6 +48,11 @@ public interface IPersonnelService { AjaxResult updatePersonnel(PersonnelUpdateRequest personnelDeleteRequest); - + /** + * 人员变更 + * @param request + * @return + */ + AjaxResult updateChange(ChangeRequest request); } diff --git a/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java new file mode 100644 index 0000000..ba1996c --- /dev/null +++ b/src/main/java/com/ydool/staff/service/impl/AlterationServiceImpl.java @@ -0,0 +1,21 @@ +package com.ydool.staff.service.impl; + +import com.ydool.common.base.BaseService; +import com.ydool.staff.entity.Alteration; +import com.ydool.staff.mapper.AlterationMapper; +import com.ydool.staff.service.IAlterationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 变更记录表 服务类 + *

+ * + * @author msh + * @since 2023-02-06 + */ +@Service +public class AlterationServiceImpl extends BaseService implements IAlterationService { + +} + diff --git a/src/main/java/com/ydool/staff/service/impl/AttachmentServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AttachmentServiceImpl.java index f6b599d..4403394 100644 --- a/src/main/java/com/ydool/staff/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AttachmentServiceImpl.java @@ -6,12 +6,10 @@ import com.ydool.common.base.BaseService; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.entity.Attachment; import com.ydool.staff.mapper.AttachmentMapper; -import com.ydool.staff.request.AttachmentRequest; import com.ydool.staff.service.IAttachmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; /** *

@@ -39,8 +37,9 @@ public class AttachmentServiceImpl extends BaseService().eq(Attachment::getPath, path).eq(Attachment::getTargetId, id)); + public Attachment selectByIdAndPath(String id, String path) { + Attachment one = getOne(new LambdaQueryWrapper().eq(Attachment::getPath, path).eq(Attachment::getTargetId, id)); + return one; } @Override diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java index 3a5c7a9..75a2b4e 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -1,28 +1,42 @@ package com.ydool.staff.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ydool.common.base.BaseService; import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.AttachmentDto; import com.ydool.staff.dto.PersonnelByExchangeDto; import com.ydool.staff.dto.PersonnelDto; +import com.ydool.staff.dto.PersonnelUpdateDto; +import com.ydool.staff.entity.Alteration; import com.ydool.staff.entity.Attachment; +import com.ydool.staff.entity.Organization; import com.ydool.staff.entity.Personnel; +import com.ydool.staff.mapper.AlterationMapper; +import com.ydool.staff.mapper.OrganizationMapper; import com.ydool.staff.mapper.PersonnelMapper; import com.ydool.staff.request.AttachmentRequest; +import com.ydool.staff.request.ChangeRequest; import com.ydool.staff.request.PersonnelDeleteRequest; import com.ydool.staff.request.PersonnelRequest; import com.ydool.staff.request.PersonnelUpdateRequest; import com.ydool.staff.service.IAttachmentService; import com.ydool.staff.service.IPersonnelService; +import com.ydool.system.entity.Dept; +import com.ydool.system.mapper.DeptMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.thymeleaf.util.StringUtils; import javax.annotation.Resource; +import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -38,6 +52,15 @@ import java.util.stream.Collectors; public class PersonnelServiceImpl extends BaseService implements IPersonnelService { @Resource private IAttachmentService attachmentService; + @Resource + private PersonnelMapper personnelMapper; + @Resource + private AlterationMapper alterationMapper; + @Resource + private OrganizationMapper organizationMapper; + @Resource + private DeptMapper deptMapper; + /** * 人员列表 @@ -46,12 +69,23 @@ public class PersonnelServiceImpl extends BaseService()); List list = personnelPage.getRecords(); personnelPage.setRecords(list.stream().map(e->{ PersonnelDto dto = BeanUtil.copyProperties(e, PersonnelDto.class); + Organization organization = organizationMapper.selectById(e.getCompanyName()); + Dept dept = deptMapper.selectById(e.getPresentDept()); + dto.setPresentDept(dept.getName()); + dto.setCompanyName(organization.getCompanyName()); dto.setCreatedAt(e.getCreatedAt()); return dto; }).collect(Collectors.toList())); @@ -107,6 +141,7 @@ public class PersonnelServiceImpl extends BaseService cardFile = updateRequest.getCardFile(); List educationFile = updateRequest.getEducationFile(); @@ -115,12 +150,68 @@ public class PersonnelServiceImpl extends BaseService cardFiles = request.getCardFiles(); + List jobTitleFiles = request.getJobTitleFiles(); + List engageFiles = request.getEngageFiles(); + List educationFiles = request.getEducationFiles(); + List auditFiles = request.getAuditFiles(); + personnel.setCardFile(StringUtils.join(saveFilePath(cardFiles,Personnel.CARD_FILE,"Change",personnel.getId()),',')); + personnel.setJobTitleFile(StringUtils.join(saveFilePath(jobTitleFiles,Personnel.JOBTITLE_FILE,"Change",personnel.getId()),',')); + personnel.setEngageFile(StringUtils.join(saveFilePath(engageFiles,Personnel.ENGAGE_FILE,"Change",personnel.getId()),',')); + personnel.setEducationFile(StringUtils.join(saveFilePath(educationFiles,Personnel.EDUCATION_FILE,"Change",personnel.getId()),',')); + personnel.setAuditFile(StringUtils.join(saveFilePath(auditFiles,Personnel.AUDIT_FILE,"Change",personnel.getId()),',')); + boolean update = updateById(personnel); + String type ="Change"; + if (update){ + saveAlteration("录用方式更改",per.getHireType(),request.getHireType(),type,request.getId()); + saveAlteration("执业资格更改",per.getQualification(),request.getQualification(),type,request.getId()); + saveAlteration("专业技术职称更改",per.getJobTitle(),request.getJobTitle(),type,request.getId()); + saveAlteration("岗位职务更改",per.getPosition(),request.getPosition(),type,request.getId()); + saveAlteration("工作状态更改",per.getWorkState(),request.getWorkState(),type,request.getId()); + saveAlteration("人员性质更改",per.getPersonnelCharacter(),request.getPersonnelCharacter(),type,request.getId()); + saveAlteration("年薪更改",per.getAnnualSalary(),request.getAnnualSalary(),type,request.getId()); + saveAlteration("退休时间更改",per.getRetirementTime(),request.getRetirementTime(),type,request.getId()); + saveAlteration("人员招聘单号更改",per.getRecruitNumber(),request.getRecruitNumber(),type,request.getId()); + saveAlteration("身份证附件更改",per.getCardFile(),personnel.getCardFile(),type,request.getId()); + saveAlteration("聘任证书附件更改",per.getEngageFile(),personnel.getEngageFile(),type,request.getId()); + saveAlteration("职称证书附件更改",per.getJobTitleFile(),personnel.getJobTitleFile(),type,request.getId()); + saveAlteration("学历证书附件更改",per.getEducationFile(),personnel.getEducationFile(),type,request.getId()); + saveAlteration("审批资料附件更改",per.getAuditFile(),personnel.getAuditFile(),type,request.getId()); + + } + saveAttachment(cardFiles,Personnel.CARD_FILE,personnel.getId()); + saveAttachment(jobTitleFiles,Personnel.JOBTITLE_FILE,personnel.getId()); + saveAttachment(engageFiles,Personnel.ENGAGE_FILE,personnel.getId()); + saveAttachment(educationFiles,Personnel.EDUCATION_FILE,personnel.getId()); + saveAttachment(auditFiles,Personnel.AUDIT_FILE,personnel.getId()); + return update ? AjaxResult.ok().msg("修改成功！"):AjaxResult.fail().msg("修改失败！"); + } + /** * 保存附件 * @param file @@ -128,12 +219,15 @@ public class PersonnelServiceImpl extends BaseService file,String type, String id){ - for (AttachmentRequest request : file) { - Attachment attachment = BeanUtil.copyProperties(request, Attachment.class); - attachment.setTargetType(type); - attachment.setTargetId(id); - attachmentService.savePersonnel(attachment); + if (CollectionUtil.isNotEmpty(file)){ + for (AttachmentRequest request : file) { + Attachment attachment = BeanUtil.copyProperties(request, Attachment.class); + attachment.setTargetType(type); + attachment.setTargetId(id); + attachmentService.savePersonnel(attachment); + } } + } /** @@ -145,14 +239,48 @@ public class PersonnelServiceImpl extends BaseService saveFilePath(List file, String type, String args, String id){ - ArrayList path = new ArrayList<>(); - for (AttachmentRequest request : file) { - if ("update".equals(args)){ - attachmentService.deleteById(type,id); + if (CollectionUtil.isNotEmpty(file)){ + ArrayList path = new ArrayList<>(); + for (AttachmentRequest request : file) { + if ("update".equals(args)){ + attachmentService.deleteById(type,id); + } + path.add(request.getPath()); } - path.add(request.getPath()); + return path; } - return path; + return null; + } + + public void saveAlteration(String details,Object before ,Object after,String type, String id){ + if (ObjectUtil.isNotNull(after)){ + Alteration alteration = new Alteration(); + alteration.setDetails(details); + alteration.setType(type); + alteration.setRelevancyId(id); + alteration.setBeforeChange((String) before); + alteration.setAfterChange((String) after); + alterationMapper.insert(alteration); + } + + } + public List nameAndPath(String file,String id){ + if (StrUtil.isNotBlank(file)){ + List cardFile = Arrays.asList(file.split(",")); + ArrayList attachmentDtos = new ArrayList<>(); + AttachmentDto dto = new AttachmentDto(); + for (String s : cardFile) { + Attachment attachment = attachmentService.selectByIdAndPath(id, s); + if (ObjectUtil.isNotEmpty(attachment)){ + dto.setName(attachment.getName()); + dto.setPath(attachment.getPath()); + dto.setSize(attachment.getSize()); + attachmentDtos.add(dto); + } + } + return attachmentDtos; + } + return null; } }