名片访问记录查询条件

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/vo/BussinesscardRecordVo.java

@@ -39,4 +39,11 @@ public class BussinesscardRecordVo extends BaseEntityLong {
      * 单位名称
      */
     private String companyName;
+    /** 开始 最后浏览时间 */
+    private String viewTimeStart;
+    /** 结束 最后浏览时间 */
+    private String viewTimeEnd;
+    /** 查看人id列表 */
+    private List <Long> viewIdList;
+    private String query;
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardRecordServiceImpl.java

 package com.mortals.xhx.module.bussinesscard.service.impl;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
@@ -9,10 +10,7 @@ import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -25,7 +23,6 @@ import com.mortals.xhx.module.bussinesscard.dao.BussinesscardRecordDao;
 import com.mortals.xhx.module.bussinesscard.model.BussinesscardRecordEntity;
 import com.mortals.xhx.module.bussinesscard.service.BussinesscardRecordService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
 
 /**
 * BussinesscardRecordService
@@ -41,6 +38,28 @@ public class BussinesscardRecordServiceImpl extends AbstractCRUDServiceImpl<Buss
     @Autowired
     private UserService userService;
 
+    @Override
+    protected BussinesscardRecordEntity findBefore(BussinesscardRecordEntity params, PageInfo pageInfo, Context context) throws AppException {
+        if(StringUtils.isNotEmpty(params.getQuery())){
+            List<UserQuery> orConditionList = new ArrayList<>();
+            UserQuery phone = new UserQuery();
+            phone.setPhone(params.getQuery());
+            orConditionList.add(phone);
+            UserQuery realName = new UserQuery();
+            realName.setRealName(params.getQuery());
+            orConditionList.add(realName);
+            UserQuery query = new UserQuery();
+            query.setOrConditionList(orConditionList);
+            UserEntity userEntity = userService.selectOne(query);
+            if(userEntity!=null){
+                params.setViewId(userEntity.getId());
+            }else {
+                params.setViewId(-1L);
+            }
+        }
+        return params;
+    }
+
     @Override
     public void saveRecord(BussinesscardEntity bussinesscardEntity, Context context) {
         if(context!=null&&context.getUser()!=null) {
@@ -85,8 +104,10 @@ public class BussinesscardRecordServiceImpl extends AbstractCRUDServiceImpl<Buss
                 if(userEntity!=null) {
                     item.setNickName(userEntity.getNickName());
                     item.setRealName(userEntity.getRealName());
-                    item.setMobile(userEntity.getMobile());
+                    item.setMobile(userEntity.getPhone());
+                    if(StringUtils.isEmpty(item.getEmail())) {
                         item.setEmail(userEntity.getEmail());
+                    }
                     item.setCompanyName(userEntity.getCompanyAdress());
                 }
             });

enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -47,12 +47,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
                 entity.setPhotoPath(userEntity.getPhotoPath());
                 entity.setFeedbackName(userEntity.getRealName());
                 entity.setCompanyName(userEntity.getCompanyAdress());
-                if(StringUtils.isEmpty(entity.getContactInfo())){
-                    entity.setContactInfo(userEntity.getMobile());
                 if(StringUtils.isEmpty(entity.getContactInfo())){
                     entity.setContactInfo(userEntity.getPhone());
                 }
-                }
                 if(StringUtils.isEmpty(entity.getEmail())){
                     entity.setEmail(userEntity.getEmail());
                 }
@@ -84,14 +81,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
                     item.setPhotoPath(userEntity.getPhotoPath());
                     item.setFeedbackName(userEntity.getRealName());
                     item.setCompanyName(userEntity.getCompanyAdress());
-                    if(StringUtils.isEmpty(item.getContactInfo())){
-                        item.setContactInfo(userEntity.getMobile());
-                    }
                     if(StringUtils.isEmpty(item.getEmail())){
                         item.setEmail(userEntity.getEmail());
                     }
-                    if(StringUtils.isEmpty(item.getContactInfo())){
-                        item.setContactInfo(userEntity.getMobile());
                     if(StringUtils.isEmpty(item.getContactInfo())){
                         item.setContactInfo(userEntity.getPhone());
                     }
@@ -99,5 +91,4 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             }
         }
     }
-    }
 }
\ No newline at end of file