Commit 39e9ce3d682d6af239335938d6fd0fe4ef3b523c

Authored by 张志伟
2 parents 6ed0c436 5b0b8a14

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

fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
@@ -180,6 +180,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy { @@ -180,6 +180,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy {
180 public FollowDetailVO followPoolDetail(FollowTask task) { 180 public FollowDetailVO followPoolDetail(FollowTask task) {
181 ACDetailVO vo = assemble(task.getCustomerId()); 181 ACDetailVO vo = assemble(task.getCustomerId());
182 vo.setTaskId(task.getId()); 182 vo.setTaskId(task.getId());
  183 + queryTimes(task.getClueId(), vo);
183 return vo; 184 return vo;
184 } 185 }
185 186
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java
@@ -147,6 +147,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy { @@ -147,6 +147,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
147 FMDetailVO vo = assemble(task.getCustomerId()); 147 FMDetailVO vo = assemble(task.getCustomerId());
148 vo.setTaskId(task.getId()); 148 vo.setTaskId(task.getId());
149 vo.setFMExpiration(task.getDeadline()); 149 vo.setFMExpiration(task.getDeadline());
  150 + queryTimes(task.getClueId(), vo);
150 return vo; 151 return vo;
151 } 152 }
152 153
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
@@ -275,6 +275,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy { @@ -275,6 +275,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
275 public FollowDetailVO followPoolDetail(FollowTask task) { 275 public FollowDetailVO followPoolDetail(FollowTask task) {
276 IRDetailVO vo = assemble(task.getCustomerId()); 276 IRDetailVO vo = assemble(task.getCustomerId());
277 vo.setTaskId(task.getId()); 277 vo.setTaskId(task.getId());
  278 + queryTimes(task.getClueId(), vo);
278 return vo; 279 return vo;
279 } 280 }
280 281
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java
@@ -201,6 +201,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy { @@ -201,6 +201,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
201 public FollowDetailVO followPoolDetail(FollowTask task) { 201 public FollowDetailVO followPoolDetail(FollowTask task) {
202 RMDetailVO vo = assemble(task.getCustomerId()); 202 RMDetailVO vo = assemble(task.getCustomerId());
203 vo.setTaskId(task.getId()); 203 vo.setTaskId(task.getId());
  204 + queryTimes(task.getClueId(), vo);
204 return vo; 205 return vo;
205 } 206 }
206 207