diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java index d1b24903c..38be4e214 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java @@ -119,4 +119,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable { @ApiModelProperty(value = "工程交付说明") private String deliveryInstructions; + + /**是否发送过消息 对应枚举 SendMsgFlagEnum**/ + @TableField(exist = false) + private String isSend; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 64f7b3868..87566e6cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; +import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; @@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 项目库-任务清单明细表 @@ -150,7 +152,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> { + boolean flag = true; + if(StringUtils.isNotEmpty(e.getIsSend())){ + if(StringUtils.equals(e.getIsSend(), SendMsgFlagEnum.FALSE.getValue())){ + flag = false; + } + } + return flag; + }).map(ProjectTaskInventoryDetailEO::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(sendUserIdList)){ + sendMessage(taskInventoryDetail,sendUserIdList); + } } if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOUpdateList)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 399267b15..5322c1377 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -696,7 +696,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl