添加sop

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignServiceImpl.java

@@ -42,6 +42,8 @@ public class MarketingCampaignServiceImpl
     @Resource
     private SopDetailService sopDetailService;
     @Resource
+    private SopService sopService;
+    @Resource
     private MarketingCampaignSopDetailService marketingCampaignSopDetailService;
     @Resource
     private MarketEmailsService marketEmailsService;
@@ -129,9 +131,9 @@ public class MarketingCampaignServiceImpl
         Long sopId = campaign.getSopId();
         if (sopId != null) {
             // 1.2 查询SOP详情
-            SopDetailEntity sopDetail = sopDetailService.getById(sopId);
-            if (sopDetail != null && sopDetail.getIsDelete() == 0) {
-                detailVO.setSopDetail(sopDetail);
+            SopEntity sopEntity = sopService.getById(sopId);
+            if (sopEntity != null && sopEntity.getIsDelete() == 0) {
+                detailVO.setSopEntity(sopEntity);
             }
         }
 

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketingCampaignDetailVO.java

@@ -1,9 +1,6 @@
 package com.storlead.trade.vo;
 
-import com.storlead.trade.entity.CustomerEntity;
-import com.storlead.trade.entity.MarketingCampaignEntity;
-import com.storlead.trade.entity.MarketingCampaignSopDetailEntity;
-import com.storlead.trade.entity.SopDetailEntity;
+import com.storlead.trade.entity.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,5 +21,5 @@ public class MarketingCampaignDetailVO {
     private List<CustomerEntity> customerList;
 
     @ApiModelProperty(value = "关联的sop详情")
-    private SopDetailEntity sopDetail;
+    private SopEntity sopEntity;
 }