采购合同新增附件

sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseDto.java

@@ -1,5 +1,6 @@
 package com.sd.business.entity.purchase.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.sd.business.entity.purchase.po.Purchase;
 import com.sd.business.entity.purchase.po.PurchaseBom;
 import lombok.Getter;
@@ -22,4 +23,9 @@ public class PurchaseDto extends Purchase {
      */
     private List<PurchaseBom> purchaseBomList;
 
+    /**
+     * 附件列表
+     */
+    private List<ObsFile> fileList;
+
 }

sd-business/src/main/java/com/sd/business/service/purchase/impl/PurchaseServiceImpl.java

@@ -2,8 +2,10 @@ package com.sd.business.service.purchase.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
@@ -26,7 +28,6 @@ import com.sd.business.service.purchase.PurchaseService;
 import com.sd.business.util.CodeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -113,7 +114,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void add(PurchaseDto purchaseDto) {
 
@@ -157,9 +158,11 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
         // 更新申购明细
         ArrayList<ApplyBuyBom> applyBuyBomList = new ArrayList<>(applyBuyBomMap.values());
         applyBuyBomService.updateBatchById(applyBuyBomList);
+
+        ObsFileUtil.saveFile(purchaseDto.getFileList(), purchaseDto.getId());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void edit(PurchaseDto purchaseDto) {
 
@@ -204,9 +207,11 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
 
         });
         purchaseBomService.editLinked(purchaseBomList, PurchaseBom::getPurchaseId, purchaseDto.getId());
+
+        ObsFileUtil.editFile(purchaseDto.getFileList(), purchaseDto.getId());
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void delete(Long id) {
         this.removeById(id);
@@ -226,6 +231,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
         applyBuyBomService.updateBatchById(applyBuyBomList);
 
         purchaseBomService.remove(q -> q.eq(PurchaseBom::getPurchaseId, id));
+
+        ObsFileUtil.removeFile(id);
     }
 
     @Override