From 182a19e5c596d9ab2fb3ef06a249728a1197624b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 17 Sep 2021 11:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupController.java | 19 +++++++++++++++++++
 .../service/IPayWorkingGroupService.java      |  9 +++++++++
 ...ingGroupDistributionRecordServiceImpl.java | 12 ++++++------
 .../impl/PayWorkingGroupServiceImpl.java      |  5 +++++
 4 files changed, 39 insertions(+), 6 deletions(-)

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<PayWorkingGroup, I
 			}
 		});
 	}
+
+	 /**
+	  *   复制
+	  *
+	  * @param payWorkingGroup 工作组项目
+	  * @return
+	  */
+	 @ApiOperation(value="工作组项目-复制", notes="工作组项目-复制")
+	 @PostMapping(value = "/copy")
+	 public Result<?> 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<PayWorkingGroup> {
     List<PayWorkingGroupStatistics>  queryPageListForStatisticsExcel();
 
     List<String> 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<Pa
             throw new JeroBootException("没有找到文件!");
         }
         OSSFile byId = iossFileService.getById(payWorkingGroupDataFile.getFileId());
-        // 文件名称
-        String fileName = byId.getFileName();
         String path = env.getProperty("jero.path.upload") + File.separator;
         List<String> listFile = new ArrayList<>();
-        listFile.add(path + fileName);
+        // 文件路径
+        String url = byId.getUrl();
+        listFile.add(path + url);
         List<String> list = new ArrayList<>();
         String msg = "";
         if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
@@ -158,9 +158,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         List<String> 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<String> 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<PayWorkingGroupMappe
         return payWorkingGroupMapper.getGroupList();
     }
 
+    @Override
+    public void copy(PayWorkingGroup payWorkingGroup) {
+
+    }
+
     /**
     * @Description 校验是存在关联合同的项目
     * @Author  lqt