搜索记录

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SearchRecordsInfoController.java

@@ -49,7 +49,7 @@ public class SearchRecordsInfoController {
      */
     @PostMapping("/api/deleteSearchRecordsInfo")
     public void deleteSearchRecordsInfo (@RequestBody SearchRecordsInfo searchRecordsInfo){
-        searchRecordsInfoService.deleteSearchRecordsInfo(searchRecordsInfo.getCommonId());
+        searchRecordsInfoService.deleteSearchRecordsInfo(searchRecordsInfo);
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SearchRecordsInfo.java

@@ -46,6 +46,10 @@ public class SearchRecordsInfo extends BaseModel<SearchRecordsInfo> {
      * 搜索次数
      */
     private Long searchCount;
+    /**
+     * 功能类型
+     */
+    private String functionType;
 
 
     @Override
@@ -59,6 +63,8 @@ public class SearchRecordsInfo extends BaseModel<SearchRecordsInfo> {
 
         public static final String DELETE_FLAG = "delete_flag";
 
+        public static final String FUNCTION_TYPE = "function_type";
+
     }
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISearchRecordsInfoService.java

@@ -29,9 +29,9 @@ public interface ISearchRecordsInfoService extends IService<SearchRecordsInfo> {
 
     /**
      *删除搜索记录
-     * @param commonId
+     * @param searchRecordsInfo
      */
-    void deleteSearchRecordsInfo(String commonId);
+    void deleteSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo);
 
     /**
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SearchRecordsInfoServiceImpl.java

@@ -32,21 +32,22 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
     /**
      * 删除搜索记录
      *
-     * @param commonId
+     * @param searchRecordsInfo
      */
     @Override
-    public void deleteSearchRecordsInfo(String commonId) {
+    public void deleteSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
         //查询搜索记录
         //判断记录是否存在
         List<SearchRecordsInfo> searchRecordsInfos =
                 this.selectList(new EntityWrapper<SearchRecordsInfo>()
-                        .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, commonId)
+                        .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
+                        .eq(SearchRecordsInfo.QueryFiles.FUNCTION_TYPE, searchRecordsInfo.getFunctionType())
                         .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //已存在
         if (searchRecordsInfos.size()>0) {
             //删除搜索记录
-            for (SearchRecordsInfo searchRecordsInfo : searchRecordsInfos) {
-                searchRecordsInfoService.deleteById(searchRecordsInfo.getId());
+            for (SearchRecordsInfo searchRecordsInfo1 : searchRecordsInfos) {
+                searchRecordsInfoService.deleteById(searchRecordsInfo1.getId());
             }
         }
 
@@ -65,6 +66,7 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
                 this.selectOne(new EntityWrapper<SearchRecordsInfo>()
                         .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
                         .eq("search_content", searchRecordsInfo.getSearchContent())
+                        .eq(SearchRecordsInfo.QueryFiles.FUNCTION_TYPE, searchRecordsInfo.getFunctionType())
                         .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //已存在，次数加1
         if (searchRecordsInfo1 != null) {
@@ -94,6 +96,7 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
         Page<SearchRecordsInfo> searchRecordsInfoPage = this.selectPage(searchRecordsInfo.getQueryPage(), new EntityWrapper<SearchRecordsInfo>()
                 .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
                 .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(SearchRecordsInfo.QueryFiles.FUNCTION_TYPE, searchRecordsInfo.getFunctionType())
                 .orderBy("update_date", false));
         return searchRecordsInfoPage;
     }
@@ -109,6 +112,7 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
                 .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
                 .gt("search_count", "5")
                 .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(SearchRecordsInfo.QueryFiles.FUNCTION_TYPE, searchRecordsInfo.getFunctionType())
                 .orderBy("update_date", false));
         return recommendedSearchRecordsInfoPage;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -123,10 +123,10 @@
     <!-- 获得总数 -->
     <select id="getCountByMyCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
-        COUNT(id)
-        FROM settled_company_info a
+        COUNT(*)
+        FROM  collection_company b
         left join
-        collection_company b
+        settled_company_info a
         on a.id = b.info_id
         WHERE a.delete_flag = '0'
         <if test="loginPhone != null and loginPhone != ''">
@@ -157,15 +157,15 @@
         a.status_flag as statusFlag,
         a.show_flag as showFlag,
         a.update_date as updateDate
-        FROM settled_company_info a
+        FROM  collection_company b
         left join
-        collection_company b
+        settled_company_info a
         on a.id = b.info_id
         WHERE a.delete_flag = '0'
         <if test="loginPhone != null and loginPhone != ''">
             AND b.phone = #{loginPhone}
         </if>
-        ORDER BY status_flag asc , update_date DESC
+        ORDER BY status_flag asc , b.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>