提示信息明细物理删除

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -13,6 +13,7 @@ import com.diagbot.vo.IntroduceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 
@@ -50,10 +51,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         //明细信息不更新，每次都删除重新插入
         //删除已有明细，物理删除
         if (!(introduceInfo.getId() == null)) {
-            UpdateWrapper<IntroduceDetail> detailUpdateWrapper = new UpdateWrapper<>();
-            detailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                    eq("introduce_id", introduceInfo.getId());
-            introduceDetailFacade.remove(detailUpdateWrapper);
+            QueryWrapper<IntroduceDetail> detailQueryWrapper = new QueryWrapper<>();
+            detailQueryWrapper.eq("introduce_id", introduceInfo.getId());
+            introduceDetailFacade.remove(detailQueryWrapper);
         }
         //新增明细，清空id
         for (IntroduceDetail detail : introduceVO.getDetailList()) {
@@ -68,53 +68,32 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     }
 
     /**
-     * 单条删除提示信息
+     * 单条删除提示信息 物理删除
      *
      * @param id
      * @return
      */
     public Boolean deleteRecord(Long id) {
         //删除明细
-        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
-        introduceDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", id).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
-
-        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
-        introduceInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("id", id).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("introduce_id", id);
+        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        this.removeById(id);
         return true;
     }
 
     /**
-     * 批量删除提示信息
+     * 批量删除提示信息 物理删除
      *
      * @param ids
      * @return
      */
     public Boolean deleteRecords(Long[] ids) {
         //删除明细
-        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
-        introduceDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("introduce_id", ids).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
-        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
-        introduceInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("id", ids).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("gmt_modified", new Date()).
-                set("modifier", UserUtils.getCurrentPrincipleID());
-        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.in("introduce_id", ids);
+        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        this.removeByIds(Arrays.asList(ids));
         return true;
     }