diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java index 0824989..594f48e 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java @@ -13,7 +13,7 @@ public class TransferApplyDto { /** * 主键ID */ - private Integer id; + private String id; private String parentId; /** @@ -50,6 +50,7 @@ public class TransferApplyDto { */ private String auditUser; private String auditUserName; + private String transfertTime; /** * 申请时间 diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java index 96ee21f..0d32c68 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java @@ -41,7 +41,9 @@ public interface TransferApplyMapper { List getTransferApplyFilesContents(TransferApplyDto dto); - List getTransferApplyFiles(String content); + List getTransferApplyFiles(TransferApplyDto content); List getTransferRecordFiles(TransferFileDto dto); + + String getProNameById(TransferApplyDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java index 9ceeedd..cf70900 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.web.service.TransferApplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.ArrayList; import java.util.List; @@ -38,15 +39,18 @@ public class TransferApplyServiceImpl implements TransferApplyService { dto.setCreateUserName(getLoginUser().getUsername()); dto.setUpdateUserId(getLoginUser().getUserId().intValue()); dto.setUpdateUserName(getLoginUser().getUsername()); + String proName = transferApplyMapper.getProNameById(dto); + dto.setProName(proName); Integer i = transferApplyMapper.insert(dto); List transferFileDtos = dto.getTransferFileDtos(); for (TransferFileDto transferFileDto : transferFileDtos) { - transferFileDto.setTransferApplyId(dto.getId()); + transferFileDto.setTransferApplyId(Integer.parseInt(dto.getId())); transferApplyMapper.insertTransferFile(transferFileDto); } return i > 0 ? AjaxResult.success("保存成功") : AjaxResult.error("保存失败"); } catch (Exception e) { - return AjaxResult.error("接口异常"); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("保存失败: " + e.getMessage()); } } @@ -68,7 +72,7 @@ public class TransferApplyServiceImpl implements TransferApplyService { Integer i = transferApplyMapper.delTransferFiles(dto); List transferFileDtos = dto.getTransferFileDtos(); for (TransferFileDto transferFileDto : transferFileDtos) { - transferFileDto.setTransferApplyId(dto.getId()); + transferFileDto.setTransferApplyId(Integer.parseInt(dto.getId())); transferApplyMapper.insertTransferFile(transferFileDto); } return i > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败"); @@ -119,7 +123,7 @@ public class TransferApplyServiceImpl implements TransferApplyService { List list = new ArrayList<>(); for (String content : contents) { dto.setParentId(content); - List dtos = transferApplyMapper.getTransferApplyFiles(content); + List dtos = transferApplyMapper.getTransferApplyFiles(dto); list.addAll(dtos); } return list; diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 1356efe..9ef40ff 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -405,7 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY id +