feature(*): 修复bug

- 修复bug

feature(*): 修复bug
- 修复bug
张志伟
1 parent ccee7886
Showing 7 changed files with 16 additions and 8 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/follow/ClueTask.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/FollowPoolListVO.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/PubFollowStrategy.java
@@ -29,6 +29,7 @@
         t1.close_time close_time,
         t1.reason initiative,
         t1.group_id group_id
+        t1.`version` `version`
         FROM clue_task t1
         left join follow_clue t6 on t1.clue_id=t6.id
         left join customer t3 on t6.vin = t3.frame_no and t6.group_id = t3.group_id and t3.yn=1
@@ -163,14 +164,14 @@
             </if>
             <if test="condition.closeTime1 !=null or condition.closeTime2 !=null">
                 and ( t1.close_time is null or (
-                    <trim prefixOverrides="and">
-                        <if test="condition.closeTime1 !=null">
-                            and t1.close_time >= #{condition.closeTime1}
-                        </if>
-                        <if test="condition.closeTime2 !=null">
-                            and t1.close_time &lt;= #{condition.closeTime2}
-                        </if>
-                    </trim>
+                <trim prefixOverrides="and">
+                    <if test="condition.closeTime1 !=null">
+                        and t1.close_time >= #{condition.closeTime1}
+                    </if>
+                    <if test="condition.closeTime2 !=null">
+                        and t1.close_time &lt;= #{condition.closeTime2}
+                    </if>
+                </trim>
                 ))
             </if>
             <if test="condition.redistribution !=null">
@@ -79,4 +79,5 @@ public class ClueTask extends BaseAuditableTimeEntity&lt;ClueTask, Long&gt; {
      * 已跟进次数
      */
     private Integer times;
+    private Integer version;
 }
@@ -103,4 +103,5 @@ public class FollowPoolDTO {
      * 集团id
      */
     private Long groupId;
+    private Integer version;
 }
@@ -99,6 +99,7 @@ public class FollowPoolListVO {
      * 集团id
      */
     private Long groupId;
+    private Integer version;
  
     public String getRemaining() {
         if (Objects.isNull(remaining) || state != 1) {
@@ -666,6 +666,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         }
         clueTask.setFollowShop(shopId);
         clueTask.setFollowUser(userId);
+        clueTask.setVersion(2);
         return clueTask;
     }
  
@@ -735,6 +736,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         }
         redistributionTask.setGroupId(clue.getGroupId());
         redistributionTask.setRpcSuccess(Boolean.FALSE);
+        redistributionTask.setVersion(2);
         clueTaskService.save(redistributionTask);
         FollowInitDTO followInitDTO = creteRedistributionFollowInitDTO(clue, redistributionTask);
         shirasawaRpcService.changeFollowData(followInitDTO, redistributionTask.getBeginTime().toLocalDate());
@@ -264,6 +264,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
         }
         clueTask.setFollowShop(shopId);
         clueTask.setFollowUser(userId);
+        clueTask.setVersion(2);
         return clueTask;
     }
  
@@ -121,6 +121,7 @@ public class PubFollowStrategy implements FollowStrategy {
         clueTask.setFollowShop(pubClue.getShopId());
         clueTask.setFollowUser(pubClue.getAdviserId());
         clueTask.setFollowUserName(pubClue.getAdviserName());
+        clueTask.setVersion(2);
         clueTaskService.save(clueTask);
         final FollowInitDTO followInitDTO = creteFollowInitDTO(pubClue, clueTask);
         shirasawaRpcService.createFollowData(followInitDTO);