fix(征求意见流程): 80245
This commit is contained in:
+40
-3
@@ -2,7 +2,11 @@ package com.jero.modules.activiti.process.fb.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.api.dto.message.SendMessageDTO;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import com.jero.common.api.vo.SendMessageAPI;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.util.SnowflakeUtils;
|
||||
import com.jero.common.util.UUIDUtils;
|
||||
import com.jero.modules.activiti.entity.ProcessAll;
|
||||
@@ -13,9 +17,9 @@ import com.jero.modules.activiti.enums.CommitFlagEnum;
|
||||
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
||||
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
|
||||
import com.jero.modules.activiti.process.fb.common.FbCommon;
|
||||
import com.jero.modules.activiti.process.fb.common.ConsultationNodeSort;
|
||||
import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey;
|
||||
import com.jero.modules.activiti.process.fb.common.FbCommon;
|
||||
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
||||
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
||||
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
||||
@@ -32,6 +36,7 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
||||
import com.jero.modules.activiti.service.ProcessNodeService;
|
||||
import com.jero.modules.activiti.service.WorkCenterService;
|
||||
import com.jero.modules.activiti.util.SpringContextUtil;
|
||||
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
|
||||
import com.jero.modules.laws.common.util.CurrentUserUtil;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
@@ -44,8 +49,6 @@ import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
@@ -82,6 +85,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
|
||||
private ISysUserService sysUserService;
|
||||
@Resource
|
||||
private ProcessApprovalRecordService processApprovalRecordService;
|
||||
@Resource
|
||||
private SendMessageAPI sendMessageAPI;
|
||||
|
||||
public static final String EXCEPTION = "目前还未开发,请联系管理员";
|
||||
|
||||
@@ -587,6 +592,14 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
|
||||
.eq(ProcessFbStandardConsultation::getId, businessId)
|
||||
.set(ProcessFbStandardConsultation::getConsultationEndDate, date)
|
||||
.set(ProcessFbStandardConsultation::getUpdateTime, date));
|
||||
|
||||
// 发送邮件
|
||||
|
||||
try {
|
||||
sendMessage(businessId);
|
||||
} catch (Exception e) {
|
||||
log.error("邮件发送失败!" + e.getMessage());
|
||||
}
|
||||
} else {
|
||||
List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
|
||||
log.info("还剩 {} 个任务待完成", taskList.size());
|
||||
@@ -601,6 +614,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
|
||||
}
|
||||
}
|
||||
|
||||
private void sendMessage(String businessId) {
|
||||
ProcessFbStandardConsultation processFbStandardConsultation = getById(businessId);
|
||||
// 部分采纳,不采纳
|
||||
List<ProcessFbConsultationList> processFbConsultationListList = processFbConsultationListService.list(
|
||||
new LambdaQueryWrapper<ProcessFbConsultationList>()
|
||||
.eq(ProcessFbConsultationList::getBusinessId, businessId)
|
||||
.in(ProcessFbConsultationList::getIsAdopt, Arrays.asList("2", "3")));
|
||||
for (ProcessFbConsultationList processFbConsultationList : processFbConsultationListList) {
|
||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.STANDARD_CONSULTATION);
|
||||
sendMessageDTO.setToUserId(processFbConsultationList.getDesignEngineerId());
|
||||
Map<String, String> sendMap = new HashMap<>();
|
||||
sendMap.put("standardNumber", processFbStandardConsultation.getStandardNumber());
|
||||
sendMap.put("standardName", processFbStandardConsultation.getStandardName());
|
||||
sendMap.put("chapterNumber", processFbConsultationList.getChapterNumber());
|
||||
sendMap.put("chapterName", StringUtils.isNotBlank(processFbConsultationList.getChapterName()) ? processFbConsultationList.getChapterName() : "");
|
||||
sendMap.put("modificationBefore", StringUtils.isNotBlank(processFbConsultationList.getModificationBefore()) ? processFbConsultationList.getModificationBefore() : "");
|
||||
sendMap.put("modificationAfter", processFbConsultationList.getModificationAfter());
|
||||
sendMap.put("modificationReason", processFbConsultationList.getModificationReason());
|
||||
sendMessageDTO.setMap(sendMap);
|
||||
sendMessageAPI.sendMessage(sendMessageDTO);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
* @Date: 2023/11/21 15:07
|
||||
|
||||
Reference in New Issue
Block a user