设计、prehomo、验证 下发dre,判断是否发过消息。
This commit is contained in:
+4
@@ -119,4 +119,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "工程交付说明")
|
||||
private String deliveryInstructions;
|
||||
|
||||
/**是否发送过消息 对应枚举 SendMsgFlagEnum**/
|
||||
@TableField(exist = false)
|
||||
private String isSend;
|
||||
}
|
||||
|
||||
+15
-1
@@ -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<Project
|
||||
this.baseMapper.delete(deleteWrapper);
|
||||
|
||||
super.saveBatch(projectTaskInventoryDetailEOAddList);
|
||||
sendMessage(taskInventoryDetail,userIdList);
|
||||
//获取没有发送过消息的用户
|
||||
List<String> 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)){
|
||||
|
||||
|
||||
+1
-1
@@ -696,7 +696,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
||||
|
||||
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
||||
if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
|
||||
taskKey = "dreDispose";
|
||||
taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
|
||||
|
||||
msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
|
||||
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||
|
||||
+2
@@ -12,6 +12,8 @@ public enum DesignComplianceNodeEnum {
|
||||
INITIATE_PROCESS("fqlc","发起流程","Initiate process"),
|
||||
THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK("zrrclrw","责任人处理任务","The responsible person handles the task"),
|
||||
SPONSOR_REVIEW("fqrsh","发起人审核","Sponsor review"),
|
||||
|
||||
DRE_DISPOSE("dreDispose","dre处理","dreDispose"),
|
||||
;
|
||||
|
||||
String key;
|
||||
|
||||
Reference in New Issue
Block a user