创新 保养检修任务 批量指派后删除消息提醒子表

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquMaintenanceTaskDao.java

@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Update;
 public interface EquMaintenanceTaskDao extends BaseMapper<EquMaintenanceTaskDo> {
     @Update(" UPDATE sys_notify_announce SET DELETED='1',MODIFYDATE=NOW() WHERE NOTIFYTYPE = #{notifytype} AND ROPTION = #{roption} AND DELETED='0'")
     int deleteNotice(@Param("notifytype") String notifytype, @Param("roption") String roption);
+
+    @Update(" UPDATE sys_notify_announce_user SET DELETED='1',MODIFYDATE=NOW() WHERE  ANNOUNCEID = #{announceid} AND DELETED='0'")
+    int deleteNoticeDetail( @Param("announceid")  String announceid);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquMaintenanceTaskService.java

@@ -22,4 +22,6 @@ public interface EquMaintenanceTaskService extends IService<EquMaintenanceTaskDo
     List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month,boolean stride);
 
     int deleteNotice(String notifytype, String roption);
+
+    int deleteNoticeDetail(String id);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceTaskServiceImpl.java

@@ -92,4 +92,14 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
 
         return maintenanceTaskDao.deleteNotice(notifytype,roption);
     }
+
+    /**
+     * 删除对应的消息提醒人员记录
+     * @param announceid
+     * @return
+     */
+    @Override
+    public int deleteNoticeDetail(String announceid) {
+        return maintenanceTaskDao.deleteNoticeDetail(announceid);
+    }
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -133,6 +133,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
             // 删除提醒
        //     CXCommonUtils.deleteSendNotify("maintain", id);
             maintenanceTaskService.deleteNotice("maintain", id);
+            maintenanceTaskService.deleteNoticeDetail(id);
 
             // 发送提醒
             CXCommonUtils.sendNotify(title, context, null, userId.stream().distinct().collect(Collectors.toList()),