bug53596虚拟清单撤回修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -1084,12 +1084,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //拼接维护清单的消息
                     contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
-
-                }else{//撤回的消息
-                    content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
-                    contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
-                    contentInfoTemp = contentInfo;
-                }
                     //封装消息的实体类
                     SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1100,6 +1094,22 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     } catch (IOException e) {
                         log.error("飞书消息推送失败");
                     }
+                }else{//撤回的消息
+                    content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
+                    contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
+
+                    //封装消息的实体类
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+                    bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
+                    //飞书
+                    try {
+                        iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), null);
+                    } catch (IOException e) {
+                        log.error("飞书消息推送失败");
+                    }
+                }
+
             }
         }
     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.enums.*;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -79,6 +80,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
 
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+
 	/**
 	 * 保存
 	 *