新增查询档案数量接口

张志伟
1 parent 1f07ac69
Showing 7 changed files with 130 additions and 7 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/CustomerMapper.java
fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/CustomerQueryReq.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/erp/CustomerController.java → fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/erp/ERPCommonController.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/CustomerService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/CustomerServiceImpl.java
@@ -46,4 +46,11 @@ public interface CustomerMapper extends BaseMapper&lt;Customer&gt; {
      * @return
      */
     List<CustomerDetailDto> queryCustomList(@Param("condition") CustomCustomerQuery query);
+    /**
+     * 查询自定义参数的档案数量
+     *
+     * @param query
+     * @return
+     */
+    Long queryCustomCount(@Param("condition") CustomCustomerQuery query);
 }
@@ -226,4 +226,95 @@
             )
         </if>
     </select>
+
+    <select
+            id="queryCustomCount"
+            resultType="java.lang.Long"
+            parameterType="cn.fw.valhalla.domain.query.CustomCustomerQuery"
+    >
+        select count(1)
+        from customer t1 inner join customer_base_info t2 on t1.base_id = t2.id
+        left join follow_task t3 on t1.id=t3.customer_id and t3.state=1 and t3.type=2
+        left join follow_task t4 on t1.id=t4.customer_id and t4.state=1 and t4.type=4
+        where t1.yn = 1 and t1.group_id = #{condition.groupId}
+        <if test="condition.shopList !=null and condition.shopList.size() != 0">
+            and t1.shop_id in
+            <foreach collection="condition.shopList" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="condition.excludeCustomerIds !=null and condition.excludeCustomerIds.size() != 0">
+            and t1.id not in
+            <foreach collection="condition.excludeCustomerIds" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="condition.followType !=null and condition.followType==2">
+            and t3.id is not null
+        </if>
+        <if test="condition.followType !=null and condition.followType==4">
+            and t4.id is not null
+        </if>
+        <if test="condition.frameNo !=null">
+            and t1.frame_no = #{condition.frameNo}
+        </if>
+        <if test="condition.andCondition==true">
+            and (
+            t1.adviser_id is not null
+            <if test="condition.minMileage !=null and condition.maxMileage !=null">
+                <if test="condition.minMileage !=null">
+                    and t1.current_mileage >= #{condition.minMileage}
+                </if>
+                <if test="condition.maxMileage !=null">
+                    and t1.current_mileage &lt;= #{condition.maxMileage}
+                </if>
+            </if>
+            <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
+                <if test="condition.minBuyDate !=null">
+                    and t1.buy_date >= #{condition.minBuyDate}
+                </if>
+                <if test="condition.maxBuyDate !=null">
+                    and t1.buy_date &lt;= #{condition.maxBuyDate}
+                </if>
+            </if>
+
+            <if test="condition.level !=null">
+                and t1.cus_level = #{condition.level}
+            </if>
+            )
+        </if>
+
+        <if test="condition.andCondition==false">
+            and (
+            t1.adviser_id is not null
+            <if test="condition.minMileage !=null and condition.maxMileage !=null">
+                or (
+                t1.current_mileage is not null
+                <if test="condition.minMileage !=null">
+                    and t1.current_mileage >= #{condition.minMileage}
+                </if>
+                <if test="condition.maxMileage !=null">
+                    and t1.current_mileage &lt;= #{condition.maxMileage}
+                </if>
+                )
+            </if>
+
+            <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
+                or (
+                t1.buy_date is not null
+                <if test="condition.minBuyDate !=null">
+                    and t1.buy_date >= #{condition.minBuyDate}
+                </if>
+                <if test="condition.maxBuyDate !=null">
+                    and t1.buy_date &lt;= #{condition.maxBuyDate}
+                </if>
+                )
+            </if>
+
+            <if test="condition.level !=null">
+                or t1.cus_level = #{condition.level}
+            </if>
+            )
+        </if>
+    </select>
 </mapper>
@@ -89,6 +89,10 @@ public class CustomerQueryReq implements Serializable {
         this.followType = followType;
     }
  
+    public void setType(Integer type) {
+        this.followType = CustomerFollowTypeEnum.ofValue(type);
+    }
+
     public Integer[] getArrivalMileage() {
         return arrivalMileage;
     }
@@ -3,6 +3,7 @@ package cn.fw.valhalla.controller.erp;
 import cn.fw.common.web.annotation.ControllerMethod;
 import cn.fw.data.base.domain.common.Message;
 import cn.fw.security.auth.client.annotation.Authorization;
+import cn.fw.security.auth.client.annotation.IgnoreAuth;
 import cn.fw.security.auth.client.annotation.IgnoreUserToken;
 import cn.fw.security.auth.client.enums.AuthType;
 import cn.fw.valhalla.domain.dto.CustomerDetailDto;
@@ -33,15 +34,14 @@ import static cn.fw.common.web.util.ResultBuilder.success;
 @Authorization(AuthType.ERP)
 @RequiredArgsConstructor
 @RequestMapping("/erp/customer")
-public class CustomerController {
+public class ERPCommonController {
     private final CustomerBizService customerBizService;
  
  
     @GetMapping("/condition/count")
-    @IgnoreUserToken
+    @IgnoreAuth
     @ControllerMethod("查询满足条件的档案数量")
-    public Message<Number> conditionCustomerCount(@Valid @RequestBody CustomerQueryReq customerQueryReq) {
-        List<CustomerDetailDto> list = customerBizService.queryCustomList(customerQueryReq);
-        return success(list.size());
+    public Message<Number> conditionCustomerCount(@Valid CustomerQueryReq customerQueryReq) {
+        return success(customerBizService.queryCustomCount(customerQueryReq));
     }
 }
@@ -358,13 +358,22 @@ public class CustomerBizService extends AbstractCustomerService {
      * @return
      */
     public List<CustomerDetailDto> queryCustomList(final CustomerQueryReq queryReq) {
-
         CustomCustomerQuery query = fillParams(queryReq);
-
         return customerService.queryCustomList(query);
     }
  
     /**
+     * 根据自定义条件查询保有客档案数量
+     *
+     * @param queryReq
+     * @return
+     */
+    public Long queryCustomCount(final CustomerQueryReq queryReq) {
+        CustomCustomerQuery query = fillParams(queryReq);
+        return customerService.queryCustomListCount(query);
+    }
+
+    /**
      * 根据手机号查询所有档案
      *
      * @param mobile
@@ -120,4 +120,11 @@ public interface CustomerService extends IService&lt;Customer&gt; {
      * @return
      */
     List<CustomerDetailDto> queryCustomList(CustomCustomerQuery query);
+
+    /**
+     * 查询自定义参数的档案数量
+     * @param query
+     * @return
+     */
+    Long queryCustomListCount(CustomCustomerQuery query);
 }
@@ -125,4 +125,9 @@ public class CustomerServiceImpl extends ServiceImpl&lt;CustomerMapper, Customer&gt; i
     public List<CustomerDetailDto> queryCustomList(CustomCustomerQuery query) {
         return Optional.ofNullable(getBaseMapper().queryCustomList(query)).orElse(new ArrayList<>());
     }
+
+    @Override
+    public Long queryCustomListCount(CustomCustomerQuery query) {
+        return Optional.ofNullable(getBaseMapper().queryCustomCount(query)).orElse(0L);
+    }
 }