1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardHolderInfoService.java

@@ -25,7 +25,7 @@ public interface ICardHolderInfoService{
 	@HttpMethod(description = "列表",  permissionName = "名片夹管理")
 	public Page<CardHolderInfo> list(
 								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,
-							@HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片id") String cardId,
+							@HttpParam(name = "searchContent", type = HttpParamType.COMMON, description = "搜索内容") String searchContent,
 										@HttpParam(name = "classify", type = HttpParamType.COMMON, description = "客户分类") String classify,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardExchangeInfoServiceImpl.java

@@ -54,35 +54,6 @@ public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
 
     @Override
     public Page<CardExchangeInfo> list(Long sendId, Long receiveId, Long sendCardId, Long receiveCardId, String circleName, String status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
-        Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
-        if (!StringUtils.isEmpty(sendId)) {
-            wrapper.eq("send_id", sendId);
-        }
-        if (!StringUtils.isEmpty(receiveId)) {
-            wrapper.eq("receive_id", receiveId);
-        }
-        if (!StringUtils.isEmpty(sendCardId)) {
-            wrapper.eq("send_card_id", sendCardId);
-        }
-        if (!StringUtils.isEmpty(receiveCardId)) {
-            wrapper.eq("receive_card_id", receiveCardId);
-        }
-        if (!StringUtils.isEmpty(circleName)) {
-            wrapper.eq("circle_name", circleName);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        wrapper.eq("delete_flag", 0);
         Integer count = cardExchangeInfoMapper.getCardExchangeCount(status,(page - 1) * limit, limit, receiveId);
         List<CardExchangeInfo> list = cardExchangeInfoMapper.getCardExchangeInfoPage(status,(page - 1) * limit, limit, receiveId);
         if (!CollectionUtils.isEmpty(list)){

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java

@@ -2,9 +2,7 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
-import com.iotechn.unimall.data.domain.CardManagementInfo;
-import com.iotechn.unimall.data.domain.CommonUserInfo;
-import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
+import com.iotechn.unimall.data.domain.*;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
@@ -18,7 +16,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
 import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
-import com.iotechn.unimall.data.domain.CardHolderInfo;
 import com.iotechn.unimall.admin.api.card.ICardHolderInfoService;
 import com.iotechn.unimall.data.model.Page;
 
@@ -59,42 +56,9 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
     }
 
     @Override
-    public Page<CardHolderInfo> list(Long commonId, String cardId, String classify, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
-        Wrapper<CardHolderInfo> wrapper = new EntityWrapper<CardHolderInfo>();
-        if (!StringUtils.isEmpty(commonId)) {
-            wrapper.eq("common_id", commonId);
-        }
-        if (!StringUtils.isEmpty(cardId)) {
-            wrapper.eq("card_id", cardId);
-        }
-        if (!StringUtils.isEmpty(classify)) {
-            wrapper.eq("classify", classify);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<CardHolderInfo> list = cardHolderInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        if (!CollectionUtils.isEmpty(list)) {
-            for (CardHolderInfo cardHolderInfo : list) {
-                CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardHolderInfo.getCardId());
-                if (cardManagementInfo != null) {
-                    cardHolderInfo.setCardManagementInfo(cardManagementInfo);
-                    //查看是否允许分享
-                    CommonUserInfo commonUserInfo = commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
-                    if (commonUserInfo != null) {
-                        cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
-                    }
-                }
-            }
-        }
-        Integer count = cardHolderInfoMapper.selectCount(wrapper);
+    public Page<CardHolderInfo> list(Long commonId, String searchContent, String classify, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+        List<CardHolderInfo> list = cardHolderInfoMapper.getCardHolderInfoPage(searchContent,classify,(page - 1) * limit, limit, commonId);
+        Integer count = cardHolderInfoMapper.getCardHolderCount(searchContent,classify,(page - 1) * limit, limit, commonId);
         return new Page<CardHolderInfo>(list, page, limit, count);
     }
 

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -73,6 +73,44 @@ public class CardHolderInfo extends SuperDO {
     /** 我的名片id */
     @TableField(exist = false)
     private String myCardId;
+    /** 搜索内容 */
+    @TableField(exist = false)
+    private String searchContent;
+
+    /** 他人分享二维码 */
+    @TableField(exist = false)
+    private String qrCode;
+    /** 姓名 */
+    @TableField(exist = false)
+    private String name;
+    /** 职务 */
+    @TableField(exist = false)
+    private String post;
+    /** 公司名 */
+    @TableField(exist = false)
+    private String companyName;
+    /** 定位 */
+    @TableField(exist = false)
+    private String location;
+    /** 省 */
+    @TableField(exist = false)
+    private String province;
+    /** 市 */
+    @TableField(exist = false)
+    private String city;
+    /** 区 */
+    @TableField(exist = false)
+    private String area;
+    /** 详细地址 */
+    @TableField(exist = false)
+    private String detailedAddress;
+    /** 联系电话 */
+    @TableField(exist = false)
+    private String phone;
+    /** 主页id */
+    @TableField(exist = false)
+    private Long personalHomeId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.java

@@ -2,6 +2,9 @@ package com.iotechn.unimall.data.mapper;
 
 import com.iotechn.unimall.data.domain.CardHolderInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+import java.util.List;
+
 /**
  * 名片夹Mapper接口
  * 
@@ -10,4 +13,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface CardHolderInfoMapper extends BaseMapper<CardHolderInfo>{
 
+    List<CardHolderInfo> getCardHolderInfoPage(String searchContent,String classify, int i, Integer limit, Long commonId);
+
+    Integer getCardHolderCount(String searchContent, String classify, int i, Integer limit, Long commonId);
 }

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.xml

@@ -3,7 +3,68 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.CardHolderInfoMapper">
-    
 
 
+    <select id="getCardHolderInfoPage" resultType="com.iotechn.unimall.data.domain.CardHolderInfo">
+        SELECT
+        chi.id,
+        chi.common_id AS commonId,
+        chi.remark,
+        chi.classify,
+        cmi.common_id as cardCommonId,
+        cmi.name AS name,
+        cmi.post AS post,
+        cmi.company_name as companyName,
+        cmi.location AS location,
+        cmi.province AS province,
+        cmi.city AS city,
+        cmi.area AS area,
+        cmi.detailed_address AS detailedAddress,
+        cmi.phone AS phone,
+        cmi.qr_code as qrCode,
+        phi.id as personalHomeId,
+        cui.share_card as shareCard,
+        chi.gmt_update AS gmtUpdate,
+        chi.gmt_create AS gmtCreate
+        FROM
+        card_holder_info chi
+        LEFT JOIN card_management_info cmi on cmi.id=chi.card_id and cmi.delete_flag=0
+        LEFT JOIN common_user_info cui on cui.id=cmi.common_id
+        LEFT JOIN personal_homepage_info phi on phi.common_id=cmi.common_id
+        WHERE
+        chi.common_id = #{commonId}
+        and chi.delete_flag=0
+        <if test="searchContent != null">
+            AND (lower(cmi.name) like lower(CONCAT('%',#{searchContent},'%'))
+            OR lower( cmi.company_name) like lower(CONCAT('%',#{searchContent},'%'))
+            OR lower( chi.remark) like lower(CONCAT('%',#{searchContent},'%')))
+        </if>
+        <if test="classify != null">
+            chi.classify= #{classify}
+        </if>
+        GROUP BY chi.id
+        ORDER BY  chi.gmt_update DESC
+    </select>
+    <select id="getCardHolderCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from( SELECT
+        count(1)
+        FROM
+        card_holder_info chi
+        LEFT JOIN card_management_info cmi on cmi.id=chi.card_id and cmi.delete_flag=0
+        LEFT JOIN common_user_info cui on cui.id=cmi.common_id
+        WHERE
+        chi.common_id = #{commonId}
+        and chi.delete_flag=0
+        <if test="searchContent != null">
+            AND (lower(cmi.name) like lower(CONCAT('%',#{searchContent},'%'))
+            OR lower( cmi.company_name) like lower(CONCAT('%',#{searchContent},'%'))
+            OR lower( chi.remark) like lower(CONCAT('%',#{searchContent},'%')))
+        </if>
+        <if test="classify != null">
+            chi.classify= #{classify}
+        </if>
+        GROUP BY chi.id) tt
+    </select>
 </mapper>