diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 13337154..fcbffa04 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -214,6 +214,25 @@ public class PayWorkingGroupController extends JeroController copy(@RequestBody PayWorkingGroup payWorkingGroup) { + if(StringUtils.isBlank(payWorkingGroup.getId())){ + return Result.error("工作组id不能为空!"); + } + payWorkingGroupService.copy(payWorkingGroup); + + setPayWorkingGroup(payWorkingGroup); + payWorkingGroupService.save(payWorkingGroup); + return Result.OK("添加成功!"); + } /** * 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 4507b99d..c2d4f8cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -83,5 +83,14 @@ public interface IPayWorkingGroupService extends IService { List queryPageListForStatisticsExcel(); List getGroupList(); + /** + * @Description 复制 + * @Author lqt + * @Date 2021/9/17 + * @Param + * @Return + * @Exception + */ + void copy(PayWorkingGroup payWorkingGroup); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 9befce3b..8c457eb4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -82,11 +82,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listFile = new ArrayList<>(); - listFile.add(path + fileName); + // 文件路径 + String url = byId.getUrl(); + listFile.add(path + url); List list = new ArrayList<>(); String msg = ""; if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ @@ -158,9 +158,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listFile = new ArrayList<>(); listPayWorkingGroupDataFile.forEach(p->{ OSSFile byId = iossFileService.getById(p.getFileId()); - // 文件名称 - String fileName = byId.getFileName(); - listFile.add(path + fileName); + // 文件路径 + String url = byId.getUrl(); + listFile.add(path + url); }); String msg = ""; List list = new ArrayList<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index d7761eae..c2c3fab2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -99,6 +99,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl