Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents fe06a379 869ec3d1
Showing 1 changed file with 16 additions and 1 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java
@@ -214,7 +214,22 @@ public class FollowBizService {
             param.put("recordId", recordId.toString());
             param.put("type", task.getType().getValue().toString());
             flowDto.setParam(param);
-            List<String> list = Collections.singletonList("跟进类型: " + task.getType().getName());
+            String name = "";
+            String plate = "";
+            FollowStrategy strategy = followMap.get(task.getType());
+            Assert.notNull(strategy, "strategy cannot be null");
+            FollowDetailVO vo = strategy.followPoolDetail(task);
+            if (Objects.nonNull(vo)) {
+                name = vo.getName();
+                plate = vo.getPlateNo();
+            }
+            List<String> list = Arrays.asList(
+                    "申请人: " + currentUser.getUserName(),
+                    "客户: " + name,
+                    "车辆: " + plate,
+                    "跟进类型: " + task.getType().getName(),
+                    "战败原因: " + reason
+            );
             flowDto.setBriefContentList(list);
             String orderNo = flowApproveRpc.initiate(flowDto);
             ApproveRecord approveRecord = new ApproveRecord();