feature(*): 修复bug

- 修复bug

feature(*): 修复bug
- 修复bug
张志伟
1 parent 88796c92
Showing 7 changed files with 89 additions and 20 deletions
fw-valhalla-dao/src/main/resources/mapper/PubCluePoolMapper.xml
fw-valhalla-dao/src/main/resources/mapper/PublicPoolMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/PublicPoolQueryVO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/PoolController.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/PublicPoolServiceImpl.java
@@ -42,9 +42,6 @@
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
-            <if test="condition.source != null">
-                and t6.source_type = #{condition.source}
-            </if>
             <if test="condition.userName !=null and condition.userName != ''">
                 and t1.follow_user_name like concat('%',#{condition.userName},'%')
             </if>
@@ -55,7 +52,12 @@
             <if test="condition.frameNo != null and condition.frameNo !='' ">
                 and t6.vin like concat('%', #{condition.frameNo}, '%')
             </if>
-
+            <if test="condition.source !=null">
+                and t6.source_type in
+                <foreach collection="condition.source" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
             <if test="condition.shopIds !=null">
                 and t1.follow_shop in
                 <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
@@ -122,9 +124,6 @@
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
-            <if test="condition.source != null">
-                and t6.source_type = #{condition.source}
-            </if>
             <if test="condition.userName !=null and condition.userName != ''">
                 and t1.follow_user_name like concat('%',#{condition.userName},'%')
             </if>
@@ -135,7 +134,12 @@
             <if test="condition.frameNo != null and condition.frameNo !='' ">
                 and t6.vin like concat('%', #{condition.frameNo}, '%')
             </if>
-
+            <if test="condition.source !=null">
+                and t6.source_type in
+                <foreach collection="condition.source" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
             <if test="condition.shopIds !=null">
                 and t1.follow_shop in
                 <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
@@ -51,6 +51,12 @@
             <if test="condition.type !=null">
                 and t1.type = #{condition.type}
             </if>
+            <if test="condition.createTime1 !=null">
+                and t1.create_time >= #{condition.createTime1}
+            </if>
+            <if test="condition.createTime2 !=null">
+                and t1.create_time &lt;= #{condition.createTime2}
+            </if>
             <if test="condition.shopIds !=null">
                 and t1.shop_id in
                 <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
@@ -120,6 +126,12 @@
             <if test="condition.type !=null">
                 and t1.type = #{condition.type}
             </if>
+            <if test="condition.createTime1 !=null">
+                and t1.create_time >= #{condition.createTime1}
+            </if>
+            <if test="condition.createTime2 !=null">
+                and t1.create_time &lt;= #{condition.createTime2}
+            </if>
             <if test="condition.shopIds !=null">
                 and t1.shop_id in
                 <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
@@ -51,7 +51,7 @@ public class FollowPoolQueryVO extends PoolQuery {
     /**
      * 来源[公共池线索用]
      */
-    private Integer source;
+    private String source;
     private String closeTime;
     public Integer getLoanCustomer() {
@@ -129,4 +129,12 @@ public class FollowPoolQueryVO extends PoolQuery {
         List<Integer> stateList = Stream.of(state.split(",")).filter(cn.fw.valhalla.common.utils.StringUtils::isNumber).map(Integer::valueOf).collect(Collectors.toList());
         return CollectionUtils.isEmpty(stateList) ? null : stateList;
     }
+
+    public List<Integer> getSource() {
+        if (StringUtils.isBlank(source)) {
+            return null;
+        }
+        List<Integer> sourceList = Stream.of(source.split(",")).filter(cn.fw.valhalla.common.utils.StringUtils::isNumber).map(Integer::valueOf).collect(Collectors.toList());
+        return CollectionUtils.isEmpty(sourceList) ? null : sourceList;
+    }
 }
 \ No newline at end of file
 package cn.fw.valhalla.domain.query;
+import cn.fw.valhalla.common.utils.DateUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
-import java.util.Collections;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 /**
@@ -25,4 +31,33 @@ public class PublicPoolQueryVO extends PoolQuery {
     private Boolean warrantyCard;
     private Boolean maintainCard;
     private List<Long> ignoreCustIds;
+    private String createTime;
+    private Boolean fromReport;
+
+    public Date getCreateTime1() {
+        if (StringUtils.isBlank(createTime)) {
+            return null;
+        }
+        String[] times = createTime.split(",");
+        if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
+
+    public Date getCreateTime2() {
+        if (StringUtils.isBlank(createTime)) {
+            return null;
+        }
+        String[] times = createTime.split(",");
+        if (times.length < TIME_STR_LENGTH) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[1])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
 }
@@ -91,7 +91,11 @@ public class PoolController {
         return success(poolBizService.summary(queryVO));
     }
-
+    /**
+     * @param queryVO
+     * @return
+     * @description
+     */
     @GetMapping("/public/clue/own/list")
     @ControllerMethod("查询自己的公共客户池列表")
     public Message<AppPage<PublicCluePoolVO>> ownPublicClueList(@CurrentUser LoginAuthBean currentUser, final PublicCluePoolQueryVO queryVO) {
@@ -99,6 +103,11 @@ public class PoolController {
         return success(page);
     }
+    /**
+     * @param queryVO
+     * @return
+     * @description
+     */
     @GetMapping("/public/clue/list")
     @IgnoreAuth
     @ControllerMethod("查询公共客户池列表")
@@ -93,14 +93,16 @@ public class PoolBizService {
      * @return
      */
     public AppPage<PublicPoolVO> publicList(LoginAuthBean currentUser, PublicPoolQueryVO queryVO) {
-        List<AffiliationRecord> affiliationRecordList = Optional.ofNullable(affiliationRecordService.list(Wrappers.<AffiliationRecord>lambdaQuery()
-                .eq(AffiliationRecord::getType, CustomerChangeTypeEnum.DEFEAT)
-                .eq(AffiliationRecord::getOriginUserId, currentUser.getUserId())
-                .ge(AffiliationRecord::getDefeatTime, DateUtil.getNowExpiredMonth(-6))
-        )).orElse(new ArrayList<>());
-        List<Long> custIds = affiliationRecordList.stream().map(AffiliationRecord::getCustomerId).distinct().collect(Collectors.toList());
-        if (custIds.size() > 0) {
-            queryVO.setIgnoreCustIds(custIds);
+        if (!Boolean.TRUE.equals(queryVO.getFromReport())) {
+            List<AffiliationRecord> affiliationRecordList = Optional.ofNullable(affiliationRecordService.list(Wrappers.<AffiliationRecord>lambdaQuery()
+                    .eq(AffiliationRecord::getType, CustomerChangeTypeEnum.DEFEAT)
+                    .eq(AffiliationRecord::getOriginUserId, currentUser.getUserId())
+                    .ge(AffiliationRecord::getDefeatTime, DateUtil.getNowExpiredMonth(-6))
+            )).orElse(new ArrayList<>());
+            List<Long> custIds = affiliationRecordList.stream().map(AffiliationRecord::getCustomerId).distinct().collect(Collectors.toList());
+            if (custIds.size() > 0) {
+                queryVO.setIgnoreCustIds(custIds);
+            }
         }
         AppPageVO<PublicPoolVO> page = AppPageVO.init(queryVO);
@@ -86,7 +86,6 @@ public class PublicPoolServiceImpl extends ServiceImpl&lt;PublicPoolMapper, PublicP
         if (CollectionUtils.isEmpty(shopIds)) {
             return Collections.emptyList();
         }
-        // mybatis plus 性能有问题 不使用
         return Optional.ofNullable(this.getBaseMapper().queryIdListByShops(shopIds)).orElse(Collections.emptyList());
     }