合同驳回推送消息

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -81,7 +81,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -2147,7 +2146,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcInsId(commonContract.getProcInstId());
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
@@ -2249,15 +2249,18 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo, messageFlowVo);
                 String procId = commonContract.getProcInstId();
-                ufVo.setProcInsId(procId);
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(commonContract.getProcDefId());
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
                 messageFlowableQuery.setModuleName("合同审核申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
+                if ("销售专员申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");