feat: 活码作废 关联详情状态改为作废不删除

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/WelcomeRelationQO.java

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.pojo.qo;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 
+import java.util.List;
+
 /**
  * @Author MUSI
  * @Date 2022/7/4 10:54 AM
@@ -17,6 +19,8 @@ public class WelcomeRelationQO extends BasePageInfo {
 
     private String searchContent;
 
+    private List<Integer> statusList;
+
     public String getWelcomeId() {
         return welcomeId;
     }
@@ -40,4 +44,12 @@ public class WelcomeRelationQO extends BasePageInfo {
     public void setSearchContent(String searchContent) {
         this.searchContent = searchContent;
     }
+
+    public List<Integer> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<Integer> statusList) {
+        this.statusList = statusList;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmWelcomeRelationApiServiceImpl.java

@@ -14,6 +14,8 @@ import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+
 /**
  * @Author MUSI
  * @Date 2022/7/4 10:52 AM
@@ -39,7 +41,7 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
         }
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
         welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
-        welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
+        welcomeRelationQo.setStatusList(Arrays.asList(WelcomeRelationStatusEnum.ENABLE.getCode(), WelcomeRelationStatusEnum.DEPRECATED.getCode()));
         welcomeRelationQo.setSearchContent(queryWelcomeRelationQdto.getSearchContent());
         welcomeRelationQo.setPageNum(queryWelcomeRelationQdto.getPageNum());
         welcomeRelationQo.setPageSize(queryWelcomeRelationQdto.getPageSize());

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeTemplateRelationMapper.xml

@@ -180,6 +180,12 @@
             <if test="searchContent != null and searchContent != ''">
                 and (refer_code = #{searchContent} or refer_name like CONCAT('%', #{searchContent}, '%') )
             </if>
+            <if test="statusList != null and statusList.size > 0">
+                and `status` in
+                <foreach collection="statusList" item="status" open="(" close=")" separator=",">
+                    #{status}
+                </foreach>
+            </if>
         </where>
     </select>