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 9f324e7..6d4170c 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -188,11 +188,11 @@ public class PersonnelServiceImpl extends BaseService().eq(PersonnelMiddle::getAfterId, request.getId()).eq(PersonnelMiddle::getState,"1")); - if (ObjectUtil.isNotNull(personnelMiddle)){ - id = personnelMiddle.getBeforeId(); - }else { - id = request.getId(); - } - Personnel per = get(id); + System.out.println("request = " + request.getId()); List cardFiles = request.getCardFileList(); List jobTitleFiles = request.getJobTitleFileList(); List engageFiles = request.getEngageFileList(); List educationFiles = request.getEducationFileList(); List auditFiles = request.getAuditFileList(); + PersonnelMiddle middle = new PersonnelMiddle(); + String type = ArgsConst.CHANGE; + PersonnelMiddle personnelMiddle = personnelMiddleMapper.selectOne(new LambdaQueryWrapper().eq(PersonnelMiddle::getAfterId, request.getId()).eq(PersonnelMiddle::getState,"1")); + String id = null;String card = null;String jobTitle = null;String engage = null;String education =null;String audit = null; + System.out.println("personnelMiddle = " + personnelMiddle); + if (ObjectUtil.isNotNull(personnelMiddle)){ + id = personnelMiddle.getBeforeId(); + System.out.println("id" + id); + card = StringUtils.join(saveFilePath(cardFiles, ArgsConst.CARD_FILE, type, id), ','); + jobTitle = StringUtils.join(saveFilePath(jobTitleFiles, ArgsConst.JOBTITLE_FILE, type, id), ','); + engage = StringUtils.join(saveFilePath(engageFiles, ArgsConst.ENGAGE_FILE, type,id), ','); + education = StringUtils.join(saveFilePath(educationFiles, ArgsConst.EDUCATION_FILE, type, id), ','); + audit = StringUtils.join(saveFilePath(auditFiles, ArgsConst.AUDIT_FILE, type, id), ','); + saveAttachment(cardFiles, ArgsConst.CARD_FILE, id, ArgsConst.UPDATE); + saveAttachment(jobTitleFiles, ArgsConst.JOBTITLE_FILE, id, ArgsConst.UPDATE); + saveAttachment(engageFiles, ArgsConst.ENGAGE_FILE, id, ArgsConst.UPDATE); + saveAttachment(educationFiles, ArgsConst.EDUCATION_FILE, id, ArgsConst.UPDATE); + saveAttachment(auditFiles, ArgsConst.AUDIT_FILE, id, ArgsConst.UPDATE); + }else { + id = request.getId(); + card = StringUtils.join(saveFilePath(cardFiles, ArgsConst.CARD_FILE, type, id), ','); + jobTitle = StringUtils.join(saveFilePath(jobTitleFiles, ArgsConst.JOBTITLE_FILE, type, id), ','); + engage = StringUtils.join(saveFilePath(engageFiles, ArgsConst.ENGAGE_FILE, type,id), ','); + education = StringUtils.join(saveFilePath(educationFiles, ArgsConst.EDUCATION_FILE, type, id), ','); + audit = StringUtils.join(saveFilePath(auditFiles, ArgsConst.AUDIT_FILE, type, id), ','); + saveAttachment(cardFiles, ArgsConst.CARD_FILE, id, ArgsConst.UPDATE); + saveAttachment(jobTitleFiles, ArgsConst.JOBTITLE_FILE, id, ArgsConst.UPDATE); + saveAttachment(engageFiles, ArgsConst.ENGAGE_FILE, id, ArgsConst.UPDATE); + saveAttachment(educationFiles, ArgsConst.EDUCATION_FILE, id, ArgsConst.UPDATE); + saveAttachment(auditFiles, ArgsConst.AUDIT_FILE, id, ArgsConst.UPDATE); + } + Personnel per = get(id); if (per.getChangeAuditState()==2) { return AjaxResult.fail().msg("待领导审批,不能变更数据"); } - - String type = ArgsConst.CHANGE; - String card = StringUtils.join(saveFilePath(cardFiles, ArgsConst.CARD_FILE, type, request.getId()), ','); - String jobTitle = StringUtils.join(saveFilePath(jobTitleFiles, ArgsConst.JOBTITLE_FILE, type, request.getId()), ','); - String engage = StringUtils.join(saveFilePath(engageFiles, ArgsConst.ENGAGE_FILE, type, request.getId()), ','); - String education = StringUtils.join(saveFilePath(educationFiles, ArgsConst.EDUCATION_FILE, type, request.getId()), ','); - String audit = StringUtils.join(saveFilePath(auditFiles, ArgsConst.AUDIT_FILE, type, request.getId()), ','); per.setChangeAlterationSign("1"); boolean update = updateById(per); middle.setBeforeId(per.getId()); @@ -424,11 +441,6 @@ public class PersonnelServiceImpl extends BaseService saveFilePath(List file, String type, String args, String id) { + System.out.println("file = " + id); if (CollectionUtil.isNotEmpty(file)) { ArrayList path = new ArrayList<>(); for (AttachmentRequest request : file) { if (ArgsConst.UPDATE.equals(args)) { attachmentService.deleteById(type, id); + } if (ArgsConst.CHANGE.equals(args)) { + attachmentService.deleteById(type, id); } path.add(request.getPath()); } @@ -533,8 +548,8 @@ public class PersonnelServiceImpl extends BaseService