浏览代码

服务合同增加附件

caozj 1 年之前
父节点
当前提交
c4afcd0dc3

+ 5 - 1
hx-sale/src/main/java/com/fjhx/sale/entity/serviceContract/dto/ServiceContractDto.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.entity.serviceContract.dto;
 
 import com.fjhx.area.service.SetCustomizeAreaId;
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractPay;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractProduct;
@@ -55,5 +56,8 @@ public class ServiceContractDto extends ServiceContract  implements SetCustomize
      */
     private Long countryId;
 
-
+    /**
+     * 文件列表
+     */
+    private List<ObsFile> fileList;
 }

+ 10 - 0
hx-sale/src/main/java/com/fjhx/sale/flow/ServiceContractFlow.java

@@ -11,6 +11,7 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
@@ -162,6 +163,15 @@ public class ServiceContractFlow extends FlowDelegate {
             serviceContractPayList.forEach(contractPay -> contractPay.setServiceContractId(contract.getId()));
             serviceContractPayService.saveOrUpdateBatch(serviceContractPayList);
         }
+        if (opType == 1) {
+            //重新发起编辑
+            // 交接单附件列表
+            ObsFileUtil.editFile(contract.getFileList(), contract.getId(), 1);
+        } else {
+            //普通提交新增
+            // 交接单附件列表
+            ObsFileUtil.saveFile(contract.getFileList(), contract.getId(), 1);
+        }
 
         return contract;
     }