diff --git a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java index 36f9731..c6cf533 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java @@ -56,6 +56,7 @@ public class ProjectTaskAddExe { private final DomainDepartmentRepository domainDepartmentRepository; private final TodoListEventPusherUtil todoListEventPusherUtil; private final DomainGroupRepository domainGroupRepository; + private final CorpInfoRepository corpInfoRepository; @DubboReference private MessageFacade messageFacade; @Transactional(rollbackFor = Exception.class) @@ -127,41 +128,67 @@ public class ProjectTaskAddExe { } else if (CollUtil.isNotEmpty(projectTaskGroupUserAddCmdList) && CollUtil.isEmpty(projectTaskScoreInfoAddCmdList)) { // 只有group user列表不为空,等待评分设置 projectTaskE.setExecuteStatus(ProjectTaskExecuteStatusEnum.SCORE_WAIT_SET.getCode()); + //通知department + String domainDepartmentId = projectTaskE.getDomainDepartmentId(); + DomainDepartmentDO infoByUUID = domainDepartmentRepository.getInfoByUUID(domainDepartmentId); + messageNotice(infoByUUID.getMasterUserId(),"MS000105",projectTaskE.getId(),null); + //股份端主账号 + List gufen = corpInfoRepository.getGufen(); + gufen.forEach(info -> { + messageNotice(info.getId(),"MS000105",projectTaskE.getId(),null); + }); + } else if (CollUtil.isEmpty(projectTaskGroupUserAddCmdList) && CollUtil.isNotEmpty(projectTaskScoreInfoAddCmdList)) { // 只有score info列表不为空,等待项目组设置 + //通知group projectTaskE.setExecuteStatus(ProjectTaskExecuteStatusEnum.PROJECT_GROUP_WAIT_SET.getCode()); + String domainGroupId = projectTaskE.getDomainGroupId(); + DomainGroupDO info = domainGroupRepository.getInfoByGroupId(domainGroupId); + DomainDepartmentDO infoByUUID = domainDepartmentRepository.getInfoByUUID(projectTaskE.getDomainDepartmentId()); + + Map sendParams = new HashMap(); + sendParams.put("DomainDepartment", infoByUUID.getMasterDepartmentName()); + messageNotice(info.getTeamUserId(),"MS000108",projectTaskE.getId(),sendParams); + messageNotice(info.getCorpinfoId(),"MS000108",projectTaskE.getId(),sendParams); } projectTaskGateway.update(projectTaskE); + + return true; + + } +// Map sendParams = new HashMap(); +// +// sendParams.put("SpecialTaskForceName", infoByGroupId.getDomainGroupName()); +// sendParams.put("ResearchTask", infoByTaskId.getProjectName()); +// sendParams.put("AverageScore", averageScore); +// messageSendCmd.setParams(sendParams); + private void messageNotice(Long userId,String sourceCode,Long foreignKey,Map sendParams) { //消息通知 try{ - String domainDepartmentId = projectTaskE.getDomainDepartmentId(); - DomainDepartmentDO infoByUUID = domainDepartmentRepository.getInfoByUUID(domainDepartmentId); MessageSendCmd messageSendCmd = new MessageSendCmd(); messageSendCmd.setBusinessId(UuidUtil.get32UUID()); MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); - messageTargetCmd.setUserId(infoByUUID.getMasterUserId()); + messageTargetCmd.setUserId(userId); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000105"); + messageSendCmd.setSourceCode(sourceCode); messageSendCmd.setNeedTokenEnum(false); - Map sendParams = new HashMap(); messageSendCmd.setParams(sendParams); log.info("评分完成消息提醒发送消息参数:messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); SingleResponse d = messageFacade.send(messageSendCmd); log.info("评分完成消息提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); - // 发送待办 TodoListAddEvent event = new TodoListAddEvent(); event.setTitle("您有一条【专项领域】待处理"); event.setContent("待开始"); - event.setForeignKey(projectTaskE.getId()); // 业务表ID -申请 - event.setForeignSubsidiaryKey(projectTaskE.getId()); // 业务附表ID 没有附表时为foreignKey的值 - event.setReceiveUser(infoByUUID.getMasterUserId());// user表ID + event.setForeignKey(foreignKey); // 业务表ID -申请 + event.setForeignSubsidiaryKey(foreignKey); // 业务附表ID 没有附表时为foreignKey的值 + event.setReceiveUser(userId);// user表ID event.setPcFlag(1); // 是否PC端待办 1是 0否 event.setAppFlag(0); // 是否APP端待办 1是 0否 event.setOtherParams(new JSONObject()); @@ -170,8 +197,6 @@ public class ProjectTaskAddExe { }catch (Exception e) { log.error("评分完成消息提醒发送消息异常:", e); } - return true; - } } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/mapper/DomainDepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/mapper/DomainDepartmentMapper.java index df1b1fa..a9c9c47 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/mapper/DomainDepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/mapper/DomainDepartmentMapper.java @@ -27,5 +27,7 @@ public interface DomainDepartmentMapper extends BaseMapper { IPage listPage(IPage iPage, Map params, String menuPerms); List listAll(Map params); + + DomainDepartmentDO getInfoByUUID(String domainDepartmentId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/CorpInfoRepository.java index b630c96..6fd953c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/CorpInfoRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.domain.persistence.dataobject.CorpInfoDO; +import java.util.List; import java.util.Map; /** @@ -22,5 +23,7 @@ public interface CorpInfoRepository extends BaseRepository { boolean isSupper(); Boolean checkCorp(); + + List getGufen(); } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainGroupRepository.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainGroupRepository.java index f1d3b17..cd9254d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainGroupRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainGroupRepository.java @@ -25,5 +25,6 @@ public interface DomainGroupRepository extends BaseRepository { List getListByCorpinfoId(@NotNull(message = "主责企业不能为空") Long corpinfoId); DomainGroupDO getInfoByGroupId(String domainGroupId); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/CorpInfoRepositoryImpl.java index 4f6b9ed..ee4601a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -16,6 +16,7 @@ import com.zcloud.gbscommon.utils.Query; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -68,5 +69,13 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl getGufen() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("type", 2); + List corpInfoDOS = corpInfoMapper.selectList(queryWrapper); + return corpInfoDOS; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java index 028deeb..2a8e6b3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java @@ -65,9 +65,7 @@ public class DomainDepartmentRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("domain_department_id", domainDepartmentId); - DomainDepartmentDO domainDepartmentDO = getOne(queryWrapper); + DomainDepartmentDO domainDepartmentDO = domainDepartmentMapper.getInfoByUUID(domainDepartmentId); return domainDepartmentDO; } } diff --git a/web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml index e80e1c7..e91d42b 100644 --- a/web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml @@ -44,5 +44,14 @@ group by dd.id order by dd.create_time desc + +